diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..781ca3b7b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. Moto G5]
+ - OS: [e.g. Android 9]
+ - App Version: [e.g. 2.2]
+ - Habitica Username: 
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..63b82974a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'Type: Feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 32c620f3e..a36793af0 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MainAppTheme"
         tools:replace="android:name"
         android:fullBackupContent="@xml/backup_descriptor"
         android:configChanges="orientation"
@@ -34,7 +34,7 @@
         <activity
             android:name=".ui.activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/MainAppTheme"
+            android:theme="@style/LaunchAppTheme"
             android:windowSoftInputMode="stateHidden|adjustResize">
             <nav-graph android:value="@navigation/navigation" />
             <intent-filter>
@@ -80,12 +80,10 @@
         <activity
             android:name=".ui.activities.LoginActivity"
             android:label="@string/LoginActivityName"
-            android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize">
         </activity>
         <activity
             android:name=".ui.activities.IntroActivity"
-            android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize">
         </activity>
         <activity
@@ -114,8 +112,7 @@
                 android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
                 android:value="false"/>
         <activity
-            android:name=".ui.activities.AboutActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"/>
+            android:name=".ui.activities.AboutActivity" />
         <activity
             android:name=".ui.activities.TaskFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
@@ -127,7 +124,6 @@
         </activity>
         <activity
             android:name=".ui.activities.GroupFormActivity"
-            android:theme="@style/AppTheme.NoActionBar"
             android:parentActivityName=".ui.activities.MainActivity"
             tools:ignore="UnusedAttribute">
             <meta-data
@@ -145,12 +141,10 @@
         </activity>
         <activity
             android:name=".ui.activities.GroupInviteActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
             tools:ignore="UnusedAttribute">
         </activity>
         <activity
             android:name=".ui.activities.FullProfileActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
             android:parentActivityName=".ui.activities.MainActivity"
             tools:ignore="UnusedAttribute">
             <meta-data
@@ -167,7 +161,6 @@
         </activity>
         <activity
             android:name=".ui.activities.ChallengeFormActivity"
-            android:theme="@style/AppTheme.ActionBar"
             android:parentActivityName=".ui.activities.MainActivity"
             android:launchMode="singleTask"
             tools:ignore="UnusedAttribute">
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 1926512e8..b1f00546f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.29.0'
+        classpath 'io.fabric.tools:gradle:1.31.0'
         classpath('com.noveogroup.android:check:1.2.5') {
             exclude module: 'checkstyle'
             exclude module: 'pmd-java'
@@ -55,7 +55,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
     //Crash Logging
-    releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.10.0@aar') {
+    releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true
     }
     //Dependency Injection
@@ -63,7 +63,7 @@ dependencies {
     kapt 'com.google.dagger:dagger-compiler:2.22.1'
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     //App Compatibility and Material Design
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
@@ -113,33 +113,32 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     //Push Notifications
-    implementation 'com.google.firebase:firebase-core:17.0.0'
-    implementation 'com.google.firebase:firebase-messaging:19.0.1'
-    implementation 'com.google.firebase:firebase-config:18.0.0'
-    implementation 'com.google.firebase:firebase-perf:18.0.1'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
+    implementation 'com.google.firebase:firebase-config:19.0.1'
+    implementation 'com.google.firebase:firebase-perf:19.0.0'
     implementation 'com.google.android.gms:play-services-auth:17.0.0'
     implementation 'io.realm:android-adapters:3.1.0'
-    implementation(project(':seeds-sdk')) {
-        exclude group: 'com.google.android.gms'
-        exclude group: 'com.android.support', module: 'multidex'
-    }
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.nex3z:flow-layout:1.2.2'
 
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
-    kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
+    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation "androidx.lifecycle:lifecycle-extensions:2.1.0"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
     implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0'
     implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0'
+    implementation "androidx.paging:paging-runtime-ktx:2.1.0"
     implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
 
     implementation project(':shared')
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 21
@@ -148,9 +147,10 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
+        resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2169
-        versionName "2.0"
+        versionCode 2244
+        versionName "2.1.1"
     }
 
     lintOptions {
diff --git a/Habitica/ic_launcher-web.png b/Habitica/ic_launcher-web.png
deleted file mode 100644
index 9a1451d65..000000000
Binary files a/Habitica/ic_launcher-web.png and /dev/null differ
diff --git a/Habitica/ic_launcher-web.webp b/Habitica/ic_launcher-web.webp
new file mode 100644
index 000000000..c1d05bb39
Binary files /dev/null and b/Habitica/ic_launcher-web.webp differ
diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro
index 001931548..038acf3b3 100644
--- a/Habitica/proguard-rules.pro
+++ b/Habitica/proguard-rules.pro
@@ -153,9 +153,6 @@
 #checkout
 -keep class com.android.vending.billing.**
 
-#seeds sdk
--keep class com.playseeds.** { *; }
-
 -assumenosideeffects class org.solovyev.android.checkout.Billing {
     public static void debug(...);
     public static void warning(...);
diff --git a/Habitica/res/anim/button_state_list_animator.xml b/Habitica/res/anim/button_state_list_animator.xml
deleted file mode 100644
index 50ed16c7d..000000000
--- a/Habitica/res/anim/button_state_list_animator.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:state_enabled="true">
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="100"
-                android:valueTo="4dp"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="2dp"
-                android:valueType="floatType"/>
-        </set>
-    </item>
-    <!-- base state -->
-    <item android:state_enabled="true">
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="100"
-                android:valueTo="0"
-                android:startDelay="100"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="2dp"
-                android:valueType="floatType" />
-        </set>
-    </item>
-    <item>
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="0"
-                android:valueTo="0"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="0"
-                android:valueType="floatType"/>
-        </set>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/anim/clockwise_rotate.xml b/Habitica/res/anim/clockwise_rotate.xml
deleted file mode 100644
index 84c5476dc..000000000
--- a/Habitica/res/anim/clockwise_rotate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="360"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:duration="1000"
-    android:interpolator="@android:anim/linear_interpolator" />
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_in.xml b/Habitica/res/anim/fab_slide_in.xml
deleted file mode 100644
index bac34df5b..000000000
--- a/Habitica/res/anim/fab_slide_in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="200">
-	<translate
-		android:fromYDelta="100%"
-		android:toYDelta="0%"/>
-</set>
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_out.xml b/Habitica/res/anim/fab_slide_out.xml
deleted file mode 100644
index 6d97fbbe2..000000000
--- a/Habitica/res/anim/fab_slide_out.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="200">
-	<translate android:fromYDelta="0%"
-		android:toYDelta="100%"
-		/>
-</set>
\ No newline at end of file
diff --git a/Habitica/res/anim/rotate_45_degrees.xml b/Habitica/res/anim/rotate_45_degrees.xml
deleted file mode 100644
index b2cf69b8f..000000000
--- a/Habitica/res/anim/rotate_45_degrees.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="45"
-    android:pivotX="50%"
-    android:pivotY="50%" />
\ No newline at end of file
diff --git a/Habitica/res/drawable-hdpi/avatar_border.png b/Habitica/res/drawable-hdpi/avatar_border.png
deleted file mode 100644
index ec93c25a1..000000000
Binary files a/Habitica/res/drawable-hdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/avatar_border.webp b/Habitica/res/drawable-hdpi/avatar_border.webp
new file mode 100644
index 000000000..19eed25f6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.png b/Habitica/res/drawable-hdpi/back_arrow_disabled.png
deleted file mode 100644
index 6c91d2bbb..000000000
Binary files a/Habitica/res/drawable-hdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.webp b/Habitica/res/drawable-hdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..e2797bce7
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.png b/Habitica/res/drawable-hdpi/back_arrow_enabled.png
deleted file mode 100644
index 2566cd2e6..000000000
Binary files a/Habitica/res/drawable-hdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.webp b/Habitica/res/drawable-hdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..8683cdb94
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png b/Habitica/res/drawable-hdpi/bottom_navigation_inset.png
deleted file mode 100644
index 860db0a48..000000000
Binary files a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..06c441fe5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-hdpi/cloud_1.png b/Habitica/res/drawable-hdpi/cloud_1.png
deleted file mode 100644
index a096e3496..000000000
Binary files a/Habitica/res/drawable-hdpi/cloud_1.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/cloud_1.webp b/Habitica/res/drawable-hdpi/cloud_1.webp
new file mode 100644
index 000000000..bc72361bb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_1.webp differ
diff --git a/Habitica/res/drawable-hdpi/cloud_2.png b/Habitica/res/drawable-hdpi/cloud_2.png
deleted file mode 100644
index 33521c0bd..000000000
Binary files a/Habitica/res/drawable-hdpi/cloud_2.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/cloud_2.webp b/Habitica/res/drawable-hdpi/cloud_2.webp
new file mode 100644
index 000000000..3c43b8feb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_2.webp differ
diff --git a/Habitica/res/drawable-hdpi/drag_grip.png b/Habitica/res/drawable-hdpi/drag_grip.png
deleted file mode 100644
index 11d0b490b..000000000
Binary files a/Habitica/res/drawable-hdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/drag_grip.webp b/Habitica/res/drawable-hdpi/drag_grip.webp
new file mode 100644
index 000000000..1fdeb9d81
Binary files /dev/null and b/Habitica/res/drawable-hdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_background.png b/Habitica/res/drawable-hdpi/fab_background.png
deleted file mode 100644
index ecb2de088..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_background.webp b/Habitica/res/drawable-hdpi/fab_background.webp
new file mode 100644
index 000000000..fdcf4bbb0
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_plus.png b/Habitica/res/drawable-hdpi/fab_plus.png
deleted file mode 100644
index 994b31f3a..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_plus.webp b/Habitica/res/drawable-hdpi/fab_plus.webp
new file mode 100644
index 000000000..b2978d858
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_submenu_background.png b/Habitica/res/drawable-hdpi/fab_submenu_background.png
deleted file mode 100644
index 2dca2398a..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_submenu_background.webp b/Habitica/res/drawable-hdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..f85fd1fa3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png
deleted file mode 100644
index b8c758525..000000000
Binary files a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..e2b047749
Binary files /dev/null and b/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/gold_multiple.png b/Habitica/res/drawable-hdpi/gold_multiple.png
deleted file mode 100644
index 783b313f4..000000000
Binary files a/Habitica/res/drawable-hdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/gold_multiple.webp b/Habitica/res/drawable-hdpi/gold_multiple.webp
new file mode 100644
index 000000000..fd3ac70c3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.webp b/Habitica/res/drawable-hdpi/ic_filters_active.webp
index 3a693b1b1..60a7dbc82 100644
Binary files a/Habitica/res/drawable-hdpi/ic_filters_active.webp and b/Habitica/res/drawable-hdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-hdpi/presents1.png b/Habitica/res/drawable-hdpi/presents1.png
deleted file mode 100644
index 45c5c1987..000000000
Binary files a/Habitica/res/drawable-hdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents1.webp b/Habitica/res/drawable-hdpi/presents1.webp
new file mode 100644
index 000000000..bfcd09963
Binary files /dev/null and b/Habitica/res/drawable-hdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-hdpi/presents2.png b/Habitica/res/drawable-hdpi/presents2.png
deleted file mode 100644
index 4b1da394c..000000000
Binary files a/Habitica/res/drawable-hdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents2.webp b/Habitica/res/drawable-hdpi/presents2.webp
new file mode 100644
index 000000000..e0190737e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-hdpi/sparkles_left.png b/Habitica/res/drawable-hdpi/sparkles_left.png
new file mode 100644
index 000000000..e6df451fa
Binary files /dev/null and b/Habitica/res/drawable-hdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-hdpi/sparkles_right.png b/Habitica/res/drawable-hdpi/sparkles_right.png
new file mode 100644
index 000000000..61c2be720
Binary files /dev/null and b/Habitica/res/drawable-hdpi/sparkles_right.png differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_gem_cap.png b/Habitica/res/drawable-hdpi/subscriber_gem_cap.png
deleted file mode 100644
index 6dc845457..000000000
Binary files a/Habitica/res/drawable-hdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..b76c15beb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-mdpi/avatar_border.png b/Habitica/res/drawable-mdpi/avatar_border.png
deleted file mode 100644
index a93bb2302..000000000
Binary files a/Habitica/res/drawable-mdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/avatar_border.webp b/Habitica/res/drawable-mdpi/avatar_border.webp
new file mode 100644
index 000000000..5cc3f7c90
Binary files /dev/null and b/Habitica/res/drawable-mdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.png b/Habitica/res/drawable-mdpi/back_arrow_disabled.png
deleted file mode 100644
index 20dba418b..000000000
Binary files a/Habitica/res/drawable-mdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.webp b/Habitica/res/drawable-mdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..1d8699204
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.png b/Habitica/res/drawable-mdpi/back_arrow_enabled.png
deleted file mode 100644
index 9155c3aa4..000000000
Binary files a/Habitica/res/drawable-mdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.webp b/Habitica/res/drawable-mdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..339e69ab9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png b/Habitica/res/drawable-mdpi/bottom_navigation_inset.png
deleted file mode 100644
index 2e127891d..000000000
Binary files a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..11ec94df9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-mdpi/drag_grip.png b/Habitica/res/drawable-mdpi/drag_grip.png
deleted file mode 100644
index 277066847..000000000
Binary files a/Habitica/res/drawable-mdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/drag_grip.webp b/Habitica/res/drawable-mdpi/drag_grip.webp
new file mode 100644
index 000000000..a88fa43d7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_background.png b/Habitica/res/drawable-mdpi/fab_background.png
deleted file mode 100644
index d13cf484c..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_background.webp b/Habitica/res/drawable-mdpi/fab_background.webp
new file mode 100644
index 000000000..097960343
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_plus.png b/Habitica/res/drawable-mdpi/fab_plus.png
deleted file mode 100644
index 69965cefe..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_plus.webp b/Habitica/res/drawable-mdpi/fab_plus.webp
new file mode 100644
index 000000000..2f36033c1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_submenu_background.png b/Habitica/res/drawable-mdpi/fab_submenu_background.png
deleted file mode 100644
index a751eaa30..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_submenu_background.webp b/Habitica/res/drawable-mdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..8a3ac3817
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png
deleted file mode 100644
index 587d25c99..000000000
Binary files a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..1c1a26fbe
Binary files /dev/null and b/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/gold_multiple.png b/Habitica/res/drawable-mdpi/gold_multiple.png
deleted file mode 100644
index aef3e16cd..000000000
Binary files a/Habitica/res/drawable-mdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/gold_multiple.webp b/Habitica/res/drawable-mdpi/gold_multiple.webp
new file mode 100644
index 000000000..fe8f4d4e2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.webp b/Habitica/res/drawable-mdpi/ic_filters_active.webp
index c9d245b16..35ab117a2 100644
Binary files a/Habitica/res/drawable-mdpi/ic_filters_active.webp and b/Habitica/res/drawable-mdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-mdpi/presents1.png b/Habitica/res/drawable-mdpi/presents1.png
deleted file mode 100644
index 5842e946e..000000000
Binary files a/Habitica/res/drawable-mdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents1.webp b/Habitica/res/drawable-mdpi/presents1.webp
new file mode 100644
index 000000000..05ff45bd9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-mdpi/presents2.png b/Habitica/res/drawable-mdpi/presents2.png
deleted file mode 100644
index b6adc46c8..000000000
Binary files a/Habitica/res/drawable-mdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents2.webp b/Habitica/res/drawable-mdpi/presents2.webp
new file mode 100644
index 000000000..6ee21edbc
Binary files /dev/null and b/Habitica/res/drawable-mdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-mdpi/sparkles_left.png b/Habitica/res/drawable-mdpi/sparkles_left.png
new file mode 100644
index 000000000..f0380f7ad
Binary files /dev/null and b/Habitica/res/drawable-mdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-mdpi/sparkles_right.png b/Habitica/res/drawable-mdpi/sparkles_right.png
new file mode 100644
index 000000000..f8c0c275d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/sparkles_right.png differ
diff --git a/Habitica/res/drawable-mdpi/subscriber_gem_cap.png b/Habitica/res/drawable-mdpi/subscriber_gem_cap.png
deleted file mode 100644
index f371535d2..000000000
Binary files a/Habitica/res/drawable-mdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..d4a354072
Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xhdpi/avatar_border.png b/Habitica/res/drawable-xhdpi/avatar_border.png
deleted file mode 100644
index 6859d0aef..000000000
Binary files a/Habitica/res/drawable-xhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/avatar_border.webp b/Habitica/res/drawable-xhdpi/avatar_border.webp
new file mode 100644
index 000000000..1ff981575
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png
deleted file mode 100644
index d58cfb160..000000000
Binary files a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp b/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..f6e6b7fad
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png
deleted file mode 100644
index 9648c24b7..000000000
Binary files a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp b/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..bce256195
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png
deleted file mode 100644
index 4e51dfca6..000000000
Binary files a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..ceea923c9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_1.png b/Habitica/res/drawable-xhdpi/cloud_1.png
deleted file mode 100644
index 8f34b7d26..000000000
Binary files a/Habitica/res/drawable-xhdpi/cloud_1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_1.webp b/Habitica/res/drawable-xhdpi/cloud_1.webp
new file mode 100644
index 000000000..0ef6f6384
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_1.webp differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_2.png b/Habitica/res/drawable-xhdpi/cloud_2.png
deleted file mode 100644
index 10a197c37..000000000
Binary files a/Habitica/res/drawable-xhdpi/cloud_2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_2.webp b/Habitica/res/drawable-xhdpi/cloud_2.webp
new file mode 100644
index 000000000..68f68a874
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_2.webp differ
diff --git a/Habitica/res/drawable-xhdpi/drag_grip.png b/Habitica/res/drawable-xhdpi/drag_grip.png
deleted file mode 100644
index 0f676f410..000000000
Binary files a/Habitica/res/drawable-xhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/drag_grip.webp b/Habitica/res/drawable-xhdpi/drag_grip.webp
new file mode 100644
index 000000000..b62c1b243
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_background.png b/Habitica/res/drawable-xhdpi/fab_background.png
deleted file mode 100644
index 913c83f7f..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_background.webp b/Habitica/res/drawable-xhdpi/fab_background.webp
new file mode 100644
index 000000000..9e1fc3eea
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_plus.png b/Habitica/res/drawable-xhdpi/fab_plus.png
deleted file mode 100644
index 37645eed0..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_plus.webp b/Habitica/res/drawable-xhdpi/fab_plus.webp
new file mode 100644
index 000000000..703293855
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_submenu_background.png b/Habitica/res/drawable-xhdpi/fab_submenu_background.png
deleted file mode 100644
index 0215b96bb..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..5620a5c07
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png
deleted file mode 100644
index bb333b164..000000000
Binary files a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..b1c6f1c45
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/gold_multiple.png b/Habitica/res/drawable-xhdpi/gold_multiple.png
deleted file mode 100644
index 51b423a7c..000000000
Binary files a/Habitica/res/drawable-xhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/gold_multiple.webp b/Habitica/res/drawable-xhdpi/gold_multiple.webp
new file mode 100644
index 000000000..f662a4389
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.webp b/Habitica/res/drawable-xhdpi/ic_filters_active.webp
index 81154be70..9f27c18ad 100644
Binary files a/Habitica/res/drawable-xhdpi/ic_filters_active.webp and b/Habitica/res/drawable-xhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xhdpi/presents1.png b/Habitica/res/drawable-xhdpi/presents1.png
deleted file mode 100644
index dccdef92c..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents1.webp b/Habitica/res/drawable-xhdpi/presents1.webp
new file mode 100644
index 000000000..547541544
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-xhdpi/presents2.png b/Habitica/res/drawable-xhdpi/presents2.png
deleted file mode 100644
index 5f0ea3b81..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents2.webp b/Habitica/res/drawable-xhdpi/presents2.webp
new file mode 100644
index 000000000..e7d87f7f8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-xhdpi/sparkles_left.png b/Habitica/res/drawable-xhdpi/sparkles_left.png
new file mode 100644
index 000000000..b00f163d5
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/sparkles_right.png b/Habitica/res/drawable-xhdpi/sparkles_right.png
new file mode 100644
index 000000000..b121a8b9f
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sparkles_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png
deleted file mode 100644
index 46001072a..000000000
Binary files a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..9e492e563
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/avatar_border.png b/Habitica/res/drawable-xxhdpi/avatar_border.png
deleted file mode 100644
index 7c87ea264..000000000
Binary files a/Habitica/res/drawable-xxhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/avatar_border.webp b/Habitica/res/drawable-xxhdpi/avatar_border.webp
new file mode 100644
index 000000000..c264700ce
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png
deleted file mode 100644
index 6639e24ed..000000000
Binary files a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..472415e8d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png
deleted file mode 100644
index 1ea24a005..000000000
Binary files a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..4af814d23
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png
deleted file mode 100644
index 809c54194..000000000
Binary files a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..ba92f790d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/drag_grip.png b/Habitica/res/drawable-xxhdpi/drag_grip.png
deleted file mode 100644
index 22538fa68..000000000
Binary files a/Habitica/res/drawable-xxhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/drag_grip.webp b/Habitica/res/drawable-xxhdpi/drag_grip.webp
new file mode 100644
index 000000000..ad593b1c9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_background.png b/Habitica/res/drawable-xxhdpi/fab_background.png
deleted file mode 100644
index 05e7eb474..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_background.webp b/Habitica/res/drawable-xxhdpi/fab_background.webp
new file mode 100644
index 000000000..7dcdc3b4a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_plus.png b/Habitica/res/drawable-xxhdpi/fab_plus.png
deleted file mode 100644
index 402a7f2d5..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_plus.webp b/Habitica/res/drawable-xxhdpi/fab_plus.webp
new file mode 100644
index 000000000..5f5a6a66d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_submenu_background.png b/Habitica/res/drawable-xxhdpi/fab_submenu_background.png
deleted file mode 100644
index e77a6846c..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..48c216ce4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png
deleted file mode 100644
index fb48245b3..000000000
Binary files a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..13cc8ab9d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_multiple.png b/Habitica/res/drawable-xxhdpi/gold_multiple.png
deleted file mode 100644
index 391bf301d..000000000
Binary files a/Habitica/res/drawable-xxhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_multiple.webp b/Habitica/res/drawable-xxhdpi/gold_multiple.webp
new file mode 100644
index 000000000..dfe678881
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.webp b/Habitica/res/drawable-xxhdpi/ic_filters_active.webp
index 4a041c142..34994560b 100644
Binary files a/Habitica/res/drawable-xxhdpi/ic_filters_active.webp and b/Habitica/res/drawable-xxhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/presents1.png b/Habitica/res/drawable-xxhdpi/presents1.png
deleted file mode 100644
index 7fd7cbddb..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents1.webp b/Habitica/res/drawable-xxhdpi/presents1.webp
new file mode 100644
index 000000000..1c7fe9c92
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/presents2.png b/Habitica/res/drawable-xxhdpi/presents2.png
deleted file mode 100644
index 59afbf5a7..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents2.webp b/Habitica/res/drawable-xxhdpi/presents2.webp
new file mode 100644
index 000000000..395d996df
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/sparkles_left.png b/Habitica/res/drawable-xxhdpi/sparkles_left.png
new file mode 100644
index 000000000..fc77fc14d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sparkles_right.png b/Habitica/res/drawable-xxhdpi/sparkles_right.png
new file mode 100644
index 000000000..ca8894569
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sparkles_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png
deleted file mode 100644
index db1ad8110..000000000
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..b402124df
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/avatar_border.png b/Habitica/res/drawable-xxxhdpi/avatar_border.png
deleted file mode 100644
index 5879226a5..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/avatar_border.webp b/Habitica/res/drawable-xxxhdpi/avatar_border.webp
new file mode 100644
index 000000000..9dfe00da2
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png
deleted file mode 100644
index fbcfe8429..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..2d2447d9c
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/drag_grip.png b/Habitica/res/drawable-xxxhdpi/drag_grip.png
deleted file mode 100644
index c3137d973..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/drag_grip.webp b/Habitica/res/drawable-xxxhdpi/drag_grip.webp
new file mode 100644
index 000000000..c672b5869
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_background.png b/Habitica/res/drawable-xxxhdpi/fab_background.png
deleted file mode 100644
index 18cf2b0f2..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_background.webp b/Habitica/res/drawable-xxxhdpi/fab_background.webp
new file mode 100644
index 000000000..b78d39f8f
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_plus.png b/Habitica/res/drawable-xxxhdpi/fab_plus.png
deleted file mode 100644
index 0dc5a9224..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_plus.webp b/Habitica/res/drawable-xxxhdpi/fab_plus.webp
new file mode 100644
index 000000000..b05654e61
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png
deleted file mode 100644
index 3eb560ac5..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..7cfebd638
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/gold_multiple.png b/Habitica/res/drawable-xxxhdpi/gold_multiple.png
deleted file mode 100644
index cd274bdf4..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/gold_multiple.webp b/Habitica/res/drawable-xxxhdpi/gold_multiple.webp
new file mode 100644
index 000000000..ac48fa1ae
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png
deleted file mode 100644
index 3a15191cc..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp
new file mode 100644
index 000000000..0c0720ae9
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp b/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp
new file mode 100644
index 000000000..f147bbc7d
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/sparkles_left.png b/Habitica/res/drawable-xxxhdpi/sparkles_left.png
new file mode 100644
index 000000000..879ffa418
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/sparkles_right.png b/Habitica/res/drawable-xxxhdpi/sparkles_right.png
new file mode 100644
index 000000000..ae8eefb2b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/sparkles_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png
deleted file mode 100644
index 9f5338f03..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..aa3574cc2
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml
index 300ee34d1..2f30bb800 100644
--- a/Habitica/res/drawable/avatar_customization_category_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_category_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
     <shape android:shape="rectangle">
-        <solid android:color="@color/brand_200" />
+        <solid android:color="?colorPrimaryOffset" />
     </shape>
 </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
index 4c115a7e4..3be259e51 100644
--- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
+++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/brand_100" />
+            <solid android:color="?colorPrimary" />
         </shape>
     </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
diff --git a/Habitica/res/drawable/badge_bg.xml b/Habitica/res/drawable/badge_bg.xml
index c6f2317f4..0213c8e97 100644
--- a/Habitica/res/drawable/badge_bg.xml
+++ b/Habitica/res/drawable/badge_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="3dp" />
-    <solid android:color="@color/brand_400" />
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/badge_circle.xml b/Habitica/res/drawable/badge_circle.xml
index 618daf35c..7e70e56da 100644
--- a/Habitica/res/drawable/badge_circle.xml
+++ b/Habitica/res/drawable/badge_circle.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners
-        android:radius="10dip"/>
-    <solid
-        android:color="@color/brand_400" />
+    <corners android:radius="10dip"/>
+    <solid android:color="?colorAccent" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/button_background_primary.xml b/Habitica/res/drawable/button_background_primary.xml
index 609b534a1..ea1e79105 100644
--- a/Habitica/res/drawable/button_background_primary.xml
+++ b/Habitica/res/drawable/button_background_primary.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/brand_400" />
+    <solid android:color="?colorAccent" />
     <corners android:radius="8dp"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
     <stroke android:width="1dp" android:color="#19000000" />
diff --git a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
index 1c28c6c3d..3d41b91b5 100644
--- a/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
+++ b/Habitica/res/drawable/challenge_gem_add_button_enabled.xml
@@ -3,6 +3,6 @@
     <item >
         <bitmap
             android:src="@drawable/ic_add_white_18dp"
-            android:tint="@color/brand_400" />
+            android:tint="?colorAccent" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
index 7bbf3519b..cd660f431 100644
--- a/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
+++ b/Habitica/res/drawable/challenge_gem_remove_button_enabled.xml
@@ -3,6 +3,6 @@
     <item >
         <bitmap
             android:src="@drawable/minus"
-            android:tint="@color/brand_400" />
+            android:tint="?colorAccent" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/checklist_checked.xml b/Habitica/res/drawable/checklist_checked.xml
index 7ab67c248..70d16bd6e 100644
--- a/Habitica/res/drawable/checklist_checked.xml
+++ b/Habitica/res/drawable/checklist_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checklist_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/drawable/daily_checked.xml b/Habitica/res/drawable/daily_checked.xml
index 7ca5b679b..40e7e1787 100644
--- a/Habitica/res/drawable/daily_checked.xml
+++ b/Habitica/res/drawable/daily_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checked_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/drawable/ic_more_horiz_black_18dp.xml b/Habitica/res/drawable/ic_more_horiz_black_18dp.xml
new file mode 100644
index 000000000..773ff13ff
--- /dev/null
+++ b/Habitica/res/drawable/ic_more_horiz_black_18dp.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="18dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp">
+    <path android:fillColor="#000000" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/Habitica/res/drawable/ic_search.xml b/Habitica/res/drawable/ic_search.xml
new file mode 100644
index 000000000..6ba0de078
--- /dev/null
+++ b/Habitica/res/drawable/ic_search.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="#FFFFFF" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml b/Habitica/res/drawable/layout_rounded_bg_brand_100.xml
deleted file mode 100644
index cf946dc8e..000000000
--- a/Habitica/res/drawable/layout_rounded_bg_brand_100.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="@dimen/bar_radius"/>
-    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml
index 709a1af70..0f4955173 100644
--- a/Habitica/res/drawable/nav_item_color_state.xml
+++ b/Habitica/res/drawable/nav_item_color_state.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/white" android:state_enabled="true" />
-    <item android:color="@color/brand_200" android:state_enabled="false" />
+    <item android:color="?colorPrimaryOffset" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_purple.xml b/Habitica/res/drawable/pill_bg_purple.xml
index 9dea0a7a0..7a466382f 100644
--- a/Habitica/res/drawable/pill_bg_purple.xml
+++ b/Habitica/res/drawable/pill_bg_purple.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/brand_100"/>
+    <solid android:color="?colorPrimary"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_radio_selected.xml b/Habitica/res/drawable/pill_bg_radio_selected.xml
index 6d8163ecf..7160d31ed 100644
--- a/Habitica/res/drawable/pill_bg_radio_selected.xml
+++ b/Habitica/res/drawable/pill_bg_radio_selected.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/brand_400"/>
+    <solid android:color="?colorAccent"/>
     <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/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml
index 829c7542d..3f9430413 100644
--- a/Habitica/res/drawable/purchase_button_background.xml
+++ b/Habitica/res/drawable/purchase_button_background.xml
@@ -5,7 +5,7 @@
     <item android:state_pressed="true" >
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_500" >
+                android:color="?colorPrimaryDistinct" >
             </solid>
             <corners
                 android:radius="8dp">
@@ -16,7 +16,7 @@
     <item android:state_focused="true" >
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_400">
+                android:color="?colorAccent">
             </solid>
             <corners
                 android:radius="8dp">
@@ -36,7 +36,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid
-                android:color="@color/brand_300">
+                android:color="?colorPrimaryOffset">
             </solid>
             <corners
                 android:radius="8dp">
diff --git a/Habitica/res/drawable/selection_highlight.xml b/Habitica/res/drawable/selection_highlight.xml
index a87b69181..040e50f34 100644
--- a/Habitica/res/drawable/selection_highlight.xml
+++ b/Habitica/res/drawable/selection_highlight.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#33000000" />
-        </shape>
-    </item>
-    <item android:state_focused="true">
-        <shape android:shape="rectangle">
-            <solid android:color="#33000000" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#00000000" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorPrimaryDistinct">
+    <item android:id="@android:id/mask"
+        android:drawable="?colorPrimary" />
+</ripple>
\ No newline at end of file
diff --git a/Habitica/res/drawable-v21/selection_highlight.xml b/Habitica/res/drawable/selection_highlight_brand.xml
similarity index 64%
rename from Habitica/res/drawable-v21/selection_highlight.xml
rename to Habitica/res/drawable/selection_highlight_brand.xml
index 1a8620380..67c4053e3 100644
--- a/Habitica/res/drawable-v21/selection_highlight.xml
+++ b/Habitica/res/drawable/selection_highlight_brand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/brand_500">
+    android:color="@color/brand_500">
     <item android:id="@android:id/mask"
-          android:drawable="@color/brand" />
+        android:drawable="@color/brand" />
 </ripple>
\ No newline at end of file
diff --git a/Habitica/res/drawable/subscription_unselected.xml b/Habitica/res/drawable/subscription_unselected.xml
index c290a3fdd..ce7b3e2bf 100644
--- a/Habitica/res/drawable/subscription_unselected.xml
+++ b/Habitica/res/drawable/subscription_unselected.xml
@@ -2,7 +2,7 @@
 
 <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" />
+    <stroke android:color="?colorPrimary" 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/drawable/todo_checked.xml b/Habitica/res/drawable/todo_checked.xml
index 415d4ba29..dba88c0e9 100644
--- a/Habitica/res/drawable/todo_checked.xml
+++ b/Habitica/res/drawable/todo_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+        <shape android:shape="oval">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checked_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/fab_background.png b/Habitica/res/fab_background.png
deleted file mode 100644
index 939ff7e20..000000000
Binary files a/Habitica/res/fab_background.png and /dev/null differ
diff --git a/Habitica/res/fab_background.webp b/Habitica/res/fab_background.webp
new file mode 100644
index 000000000..df84eecec
Binary files /dev/null and b/Habitica/res/fab_background.webp differ
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index def7138ec..4da888628 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginRight="@dimen/spacing_large">
+        android:layout_marginEnd="@dimen/spacing_large">
         <TextView
             android:id="@+id/achievement_title"
             android:layout_width="match_parent"
@@ -50,5 +50,5 @@
             android:layout_height="wrap_content"
             style="@style/Caption3"
             android:textColor="@color/gray_100"/>
-    </LinearLayout>r
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml
index 42a3d25ee..0329f6e21 100644
--- a/Habitica/res/layout/activity_about.xml
+++ b/Habitica/res/layout/activity_about.xml
@@ -1,25 +1,47 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activities.AboutActivity">
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
+    android:orientation="vertical"
+    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
+    android:background="@color/white">
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:layout_height="wrap_content">
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            android:background="@color/brand_300"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/tab_layout"
-        android:background="@color/white"
-        />
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.AboutActivity">
 
-</RelativeLayout>
\ No newline at end of file
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
+            android:elevation="6dp"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_below="@id/tab_layout"
+            android:background="@color/white"
+            />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
deleted file mode 100644
index 6917d816c..000000000
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/overlayFrameLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.activities.MainActivity">
-
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-                android:gravity="center">
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/main_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:elevation="0dp"
-            tools:context=".ui.activities.MainActivity">
-
-            <FrameLayout
-                android:id="@+id/fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fitsSystemWindows="false">
-
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:fitsSystemWindows="false"
-                    app:contentScrim="?attr/colorPrimary"
-                    app:expandedTitleMarginEnd="?attr/actionBarSize"
-                    app:expandedTitleMarginStart="0dp"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                    app:titleEnabled="false">
-
-                    <LinearLayout
-                        android:id="@+id/challenge_header"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginBottom="15dp"
-
-                        android:layout_marginTop="?attr/actionBarSize"
-                        android:adjustViewBounds="true"
-                                                android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:orientation="vertical"
-                        app:layout_collapseMode="parallax">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="23dp"
-                            android:layout_marginLeft="26dp"
-                            android:layout_marginRight="23dp"
-                            android:layout_marginStart="26dp"
-                            android:orientation="vertical">
-
-                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                                android:id="@+id/challenge_name"
-                                style="@style/Headline"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:maxLines="2"
-                                android:textColor="@color/textColorDark" />
-
-                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                                android:id="@+id/challenge_description"
-                                style="@style/Body2"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:maxLines="4"
-                                android:textColor="@color/textColorDark" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-
-                            android:layout_marginEnd="23dp"
-                            android:layout_marginRight="23dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginLeft="16dp"
-                            android:layout_marginTop="10dp"
-                            android:orientation="horizontal"
-                            android:weightSum="2"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="36dp"
-                                android:layout_weight="1">
-
-                                <Button
-                                    android:id="@+id/btn_show_more"
-                                    style="@style/Body1_Button"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="left|center"
-                                    android:paddingTop="3dp"
-                                    android:paddingBottom="3dp"
-                                    android:text="Show more"
-                                    android:textAllCaps="false"
-                                    android:textColor="#d0c1ff" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="right"
-                                android:orientation="horizontal">
-
-                                    <TextView
-                                        android:id="@+id/gem_amount"
-                                        style="@style/Body1"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="@color/textColorDark"
-                                        tools:text="15"
-                                        android:layout_gravity="center"/>
-
-                                    <TextView
-                                        android:layout_marginLeft="17dp"
-                                        android:layout_marginStart="17dp"
-                                        android:id="@+id/challenge_member_count"
-                                        style="@style/Body1"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="@color/textColorDark"
-                                        tools:text="15"
-                                        android:drawableLeft="@drawable/participants_light"
-                                        android:gravity="center"/>
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="?attr/actionBarSize"
-                        android:theme="@style/Toolbar"
-
-                        app:layout_collapseMode="pin"
-                        app:popupTheme="@style/Theme.AppCompat.Light" />
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-                <com.google.android.material.tabs.TabLayout
-                    android:id="@+id/detail_tabs"
-                    android:layout_width="match_parent"
-                    android:layout_height="54dp"
-                    android:layout_gravity="bottom"
-                    android:background="@color/brand_200"
-                    android:elevation="0dp"
-                    android:fillViewport="false"
-
-                    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                    app:layout_anchor="@+id/collapsing_toolbar"
-                    app:layout_anchorGravity="bottom"
-
-                    app:layout_collapseMode="pin"
-                    app:tabGravity="fill"
-                    app:tabIndicatorColor="@android:color/white"
-                    app:tabMode="fixed" />
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <FrameLayout
-                android:id="@+id/snackbar_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:layout_gravity="bottom|right"
-                android:layout_marginBottom="16dp"
-                android:layout_marginRight="8dp"
-                app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior" />
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-    </androidx.drawerlayout.widget.DrawerLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index bd6838361..c27526a99 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
-                android:layout_marginRight="48dp">
+                android:layout_marginEnd="48dp">
                 <com.habitrpg.android.habitica.ui.AvatarView
                     android:id="@+id/healerAvatarView"
                     android:layout_width="75dp"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
-                android:layout_marginRight="48dp">
+                android:layout_marginEnd="48dp">
                 <com.habitrpg.android.habitica.ui.AvatarView
                     android:id="@+id/rogueAvatarView"
                     android:layout_width="75dp"
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 3fc64b936..4c749fed6 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -2,7 +2,6 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_create_challenge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -18,7 +17,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/brand_200"
+            android:background="?colorPrimaryOffset"
             android:orientation="vertical"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
@@ -28,7 +27,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="@color/brand_500"
+                android:textColorHint="?textColorPrimaryDark"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat"
                 android:id="@+id/create_challenge_title_input_layout">
 
@@ -39,8 +38,8 @@
                     android:hint="@string/new_challenge_title"
                     android:id="@+id/create_challenge_title"
                     android:textColor="@color/white"
-                    android:textColorHighlight="@color/brand_500"
-                    android:textColorHint="@color/brand_500"
+                    android:textColorHighlight="?textColorPrimaryDark"
+                    android:textColorHint="?textColorPrimaryDark"
 
                     tools:text="Get in shape"
                     android:inputType="text" />
@@ -49,9 +48,8 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColorHint="@color/brand_500"
+                android:textColorHint="?textColorPrimaryDark"
 
-                android:id="@+id/create_challenge_description_input_layout"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
                 <EditText
@@ -64,17 +62,12 @@
                     android:maxLines="5"
                     android:minLines="3"
                     android:textColor="@color/white"
-                    android:textColorHighlight="@color/brand_500"
-                    android:textColorHint="@color/brand_500" />
+                    android:textColorHighlight="?textColorPrimaryDark"
+                    android:textColorHint="?textColorPrimaryDark" />
             </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@color/brand_700" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -117,7 +110,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableLeft="@drawable/challenge_gem_add_button"/>
+                    android:drawableStart="@drawable/challenge_gem_add_button"/>
 
                 <ImageView
                     android:id="@+id/gem_icon"
@@ -143,7 +136,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableRight="@drawable/challenge_gem_remove_button"/>
+                    android:drawableEnd="@drawable/challenge_gem_remove_button"/>
 
             </LinearLayout>
 
@@ -169,8 +162,7 @@
                 android:layout_height="20dp"
                 android:layout_marginTop="39dp"
                 android:drawablePadding="12dp"
-                android:drawableRight="@drawable/ic_info_outline_black_24dp"
-                android:drawableTint="@color/brand_300"
+                android:drawableEnd="@drawable/ic_info_outline_black_24dp"
                 android:gravity="center"
                 android:text="@string/short_name"
                 android:textColor="#cc000000" />
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index aed1c692f..359ce75ee 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -28,7 +28,6 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
                     <TextView
-                        android:id="@+id/textView5"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/outer_inset"
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 01fb72434..976e8e60b 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -1,449 +1,469 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fullprofile_scrollview"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
+    android:background="@color/white">
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            android:background="@color/brand_300"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
-            <LinearLayout
-                style="@style/CardContent"
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/fullprofile_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
                 <LinearLayout
-                    android:id="@+id/avatar_with_bars"
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
                     android:orientation="vertical">
 
                     <LinearLayout
+                        android:id="@+id/avatar_with_bars"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.habitrpg.android.habitica.ui.AvatarView
-                            android:id="@+id/avatarView"
-                            android:layout_width="@dimen/avatar_header_width"
-                            android:layout_height="@dimen/avatar_header_height"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginRight="16dp"
-                            app:showBackground="true"
-                            app:showMount="true"
-                            app:showPet="true" />
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:adjustViewBounds="true"
+                        android:background="@color/transparent"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:id="@+id/LL_header"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
+                            android:layout_height="wrap_content">
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/hpBar"
-                                layout="@layout/value_bar"
+                            <com.habitrpg.android.habitica.ui.AvatarView
+                                android:id="@+id/avatarView"
+                                android:layout_width="@dimen/avatar_header_width"
+                                android:layout_height="@dimen/avatar_header_height"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginEnd="16dp"
+                                app:showBackground="true"
+                                app:showMount="true"
+                                app:showPet="true" />
+
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="@dimen/header_bar_spacing"
-                                app:barForegroundColor="@color/hpColor"
-                                app:lightBackground="true"
-                                app:description="@string/HP_default" />
+                                android:orientation="vertical">
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/xpBar"
-                                layout="@layout/value_bar"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="@dimen/header_bar_spacing"
-                                app:barForegroundColor="@color/xpColor"
-                                app:lightBackground="true"
-                                app:description="@string/XP_default"  />
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/hpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginBottom="@dimen/header_bar_spacing"
+                                    app:barForegroundColor="@color/hpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/HP_default" />
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/mpBar"
-                                layout="@layout/value_bar"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                app:barForegroundColor="@color/mpColor"
-                                app:lightBackground="true"
-                                app:description="@string/MP_default" />
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/xpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginBottom="@dimen/header_bar_spacing"
+                                    app:barForegroundColor="@color/xpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/XP_default"  />
 
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/mpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    app:barForegroundColor="@color/mpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/MP_default" />
+
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/lvl_tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="36dp"
+                                android:drawablePadding="6dp"
+                                android:gravity="center"
+                                android:textSize="14sp" />
+
+                            <View
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_weight="1" />
+
+                            <com.habitrpg.android.habitica.ui.views.CurrencyViews
+                                android:id="@+id/currencyView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
                         </LinearLayout>
                     </LinearLayout>
 
+
+                    <TextView
+                        android:id="@+id/profile_blurb"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textIsSelectable="true"
+                        android:text="Blurb" />
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:id="@+id/profile_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="5dp"
+                        android:minHeight="200dp"
+                        fresco:actualImageScaleType="fitCenter" />
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="@dimen/spacing_medium"
+                        android:layout_marginBottom="@dimen/spacing_medium">
                         <TextView
-                            android:id="@+id/lvl_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="36dp"
-                            android:drawablePadding="6dp"
-                            android:gravity="center"
-                            android:textSize="14sp" />
-
-                        <View
                             android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_weight="1" />
-
-                        <com.habitrpg.android.habitica.ui.views.CurrencyViews
-                            android:id="@+id/currencyView"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/joined"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/joined_view"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content"
+                            tools:text="today"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="@dimen/spacing_medium">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/last_login"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/last_login_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:text="today"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/total_checkins"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/total_checkins_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:text="100"/>
                     </LinearLayout>
                 </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-
-                <TextView
-                    android:id="@+id/profile_blurb"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
-                    android:text="Blurb" />
-
-                <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/profile_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="5dp"
-                    android:minHeight="200dp"
-                    fresco:actualImageScaleType="fitCenter" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/spacing_medium"
-                    android:layout_marginBottom="@dimen/spacing_medium">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/joined"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/joined_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="today"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginBottom="@dimen/spacing_medium">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/last_login"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/last_login_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="today"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/total_checkins"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/total_checkins_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="100"/>
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
                 <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/username"
-                    android:textStyle="bold" />
-                    <TextView
-                        android:layout_width="wrap_content"
+                    android:orientation="vertical">
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text=""
-                        android:id="@+id/username"
-                        android:layout_gravity="right"/>
-                </LinearLayout>
+                        android:orientation="horizontal">
 
-                <Button
+                        <TextView
+                            style="@style/CardTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/username"
+                            android:textStyle="bold" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=""
+                            android:id="@+id/username"
+                            android:layout_gravity="end"/>
+                    </LinearLayout>
+
+                    <Button
                         android:text="@string/copy"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
                         android:id="@+id/copy_username" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/battle_gear"
-                    android:textStyle="bold" />
-                <TableLayout
-                    android:id="@+id/equipment_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:shrinkColumns="1"
-                    android:stretchColumns="0" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:orientation="vertical">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_costume_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/battle_gear"
+                        android:textStyle="bold" />
+                    <TableLayout
+                        android:id="@+id/equipment_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:shrinkColumns="1"
+                        android:stretchColumns="0" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_costume_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/costume"
-                    android:textStyle="bold" />
-                <TableLayout
-                    android:id="@+id/costume_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:shrinkColumns="1"
-                    android:stretchColumns="0" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:orientation="vertical">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_attributes_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:foreground="?android:attr/selectableItemBackground">
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/costume"
+                        android:textStyle="bold" />
+                    <TableLayout
+                        android:id="@+id/costume_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:shrinkColumns="1"
+                        android:stretchColumns="0" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_attributes_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:weightSum="1">
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground">
 
-                <TableLayout
-                    android:id="@+id/attributes_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:stretchColumns="0,1,2,3,4">
+                    android:orientation="vertical"
+                    android:weightSum="1">
 
-                    <TableRow android:layout_height="wrap_content">
-                        <!-- Headers -->
+                    <TableLayout
+                        android:id="@+id/attributes_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:stretchColumns="0,1,2,3,4">
 
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                        <TableRow android:layout_height="wrap_content">
+                            <!-- Headers -->
 
-                            <TextView
-                                style="@style/CardTitle"
+                            <LinearLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/attributes"
-                                android:textStyle="bold" />
+                                android:layout_height="wrap_content">
 
-                            <androidx.appcompat.widget.AppCompatImageView
+                                <TextView
+                                    style="@style/CardTitle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/attributes"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatImageView
                                     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>
+                            </LinearLayout>
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="STR" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="STR" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="INT" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="INT" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="CON" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="CON" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="PER" />
-                    </TableRow>
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="PER" />
+                        </TableRow>
 
-                </TableLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    </TableLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:weightSum="1">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile_pets_and_mounts"
-                    android:textStyle="bold" />
-
-                <TableLayout
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:stretchColumns="0,1">
+                    android:orientation="vertical"
+                    android:weightSum="1">
 
-                    <TableRow
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                        android:text="@string/profile_pets_and_mounts"
+                        android:textStyle="bold" />
 
-                        <TextView
-                            android:layout_width="match_parent"
+                    <TableLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:stretchColumns="0,1">
+
+                        <TableRow
                             android:layout_height="wrap_content"
-                            android:text="@string/profile_pets_found" />
+                            android:gravity="center_vertical">
 
-                        <TextView
-                            android:id="@+id/profile_pets_found_count"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            tools:text="#" />
-                        <com.facebook.drawee.view.SimpleDraweeView
-                            android:id="@+id/current_pet_drawee"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            fresco:actualImageScaleType="centerCrop"/>>
-                    </TableRow>
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/profile_pets_found" />
 
-                    <TableRow android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                            <TextView
+                                android:id="@+id/profile_pets_found_count"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                tools:text="#" />
+                            <com.facebook.drawee.view.SimpleDraweeView
+                                android:id="@+id/current_pet_drawee"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                fresco:actualImageScaleType="centerCrop"/>
+                        </TableRow>
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/profile_mounts_tamed" />
+                        <TableRow android:layout_height="wrap_content"
+                            android:gravity="center_vertical">
 
-                        <TextView
-                            android:id="@+id/profile_mounts_tamed_count"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            tools:text="#" />
-                        <com.facebook.drawee.view.SimpleDraweeView
-                            android:id="@+id/current_mount_drawee"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            fresco:actualImageScaleType="centerCrop"/>
-                    </TableRow>
-                </TableLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/profile_mounts_tamed" />
+
+                            <TextView
+                                android:id="@+id/profile_mounts_tamed_count"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                tools:text="#" />
+                            <com.facebook.drawee.view.SimpleDraweeView
+                                android:id="@+id/current_mount_drawee"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                fresco:actualImageScaleType="centerCrop"/>
+                        </TableRow>
+                    </TableLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_achievements_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_achievements_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile_achievements"
-                    android:textStyle="bold" />
-
-                <ProgressBar
-                    android:id="@+id/avatar_achievements_progress"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true" />
-
-                <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-                    android:id="@+id/recyclerView"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scrollbarSize="3dp"
-                    android:scrollbarThumbVertical="@color/scrollbarThumb"
-                    android:scrollbars="vertical" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
-    </LinearLayout>
-</ScrollView>
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile_achievements"
+                        android:textStyle="bold" />
+
+                    <ProgressBar
+                        android:id="@+id/avatar_achievements_progress"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true" />
+
+                    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scrollbarSize="3dp"
+                        android:scrollbarThumbVertical="@color/scrollbarThumb"
+                        android:scrollbars="vertical" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index 83b64c701..08a891c88 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -12,8 +12,7 @@
                         android:gravity="center">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
-                android:id="@+id/main_content"
-                android:layout_width="match_parent"
+            android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:elevation="0dp"
                 tools:context=".ui.activities.MainActivity">
@@ -43,8 +42,7 @@
                         app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                     <ImageView
-                            android:id="@+id/headerImage"
-                            android:layout_width="match_parent"
+                        android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="?attr/actionBarSize"
                             app:layout_collapseMode="parallax"
@@ -67,7 +65,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="54dp"
                         android:layout_gravity="bottom"
-                        android:background="@color/brand_200"
+                        android:background="?colorPrimaryOffset"
                         android:elevation="0dp"
                         android:fillViewport="false"
 
diff --git a/Habitica/res/layout/activity_gift_iap.xml b/Habitica/res/layout/activity_gift_iap.xml
index b43818df9..6a1cea61e 100644
--- a/Habitica/res/layout/activity_gift_iap.xml
+++ b/Habitica/res/layout/activity_gift_iap.xml
@@ -21,8 +21,7 @@
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.core.widget.NestedScrollView
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -78,7 +77,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/one_month"
-                    app:gemCapText="@string/subscribe1month.gemcap"
+                    app:gemCapText="@string/subscribe1month_gemcap"
                     app:isNonRecurring="true"/>
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -86,7 +85,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/three_months"
-                    app:gemCapText="@string/subscribe3month.gemcap"
+                    app:gemCapText="@string/subscribe3month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="1" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -94,7 +93,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/six_months"
-                    app:gemCapText="@string/subscribe6month.gemcap"
+                    app:gemCapText="@string/subscribe6month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="2" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
@@ -102,7 +101,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/twelve_months"
-                    app:gemCapText="@string/subscribe12month.gemcap"
+                    app:gemCapText="@string/subscribe12month_gemcap"
                     app:isNonRecurring="true"
                     app:hourGlassCount="4" >
 
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index b5975816f..9096e6b16 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/create"
                 style="@style/HabiticaButton.Borderless"
-                android:textColor="@color/brand_400"
+                android:textColor="?colorAccent"
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingStart="@dimen/spacing_large"
                 android:minWidth="20dp"/>
diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml
index b6f1245c7..5edb6fbb4 100644
--- a/Habitica/res/layout/activity_guidelines.xml
+++ b/Habitica/res/layout/activity_guidelines.xml
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activities.PrefsActivity"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
 <WebView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/webview"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</WebView>
\ No newline at end of file
+</WebView>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 6cf2232cb..f11fe1000 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -24,9 +24,7 @@
             android:text="@string/skip_button"
             android:id="@+id/skipButton"
             android:layout_alignParentBottom="false"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="6dp"
             android:layout_marginEnd="6dp"
             android:layout_alignParentTop="true"
             android:layout_marginTop="6dp"
@@ -39,9 +37,7 @@
             android:text="@string/intro_finish_button"
             android:id="@+id/finishButton"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="12dp"
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="6dp"
             android:background="@color/transparent"
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 775bc476d..27cdec1ed 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -19,7 +19,7 @@
             android:background="@drawable/login_gradient"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:layout_marginRight="-2dp"
+            android:layout_marginEnd="-2dp"
             >
             <ImageView
                 android:id="@+id/city_view"
@@ -74,7 +74,6 @@
             android:paddingTop="@dimen/spacing_large"
             android:paddingLeft="@dimen/spacing_large"
             android:paddingRight="@dimen/spacing_large"
-            android:id="@+id/login_intro_view"
             android:orientation="vertical"
             android:background="@color/transparent"
                         >
@@ -235,9 +234,9 @@
             android:id="@+id/back_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_arrow_back_white_36dp"
+            android:drawableStart="@drawable/ic_arrow_back_white_36dp"
             android:background="@color/transparent"
-            android:paddingLeft="12dp"
+            android:paddingStart="12dp"
             android:alpha="0" />
     </FrameLayout>
 
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 41fae3801..0c5eec65f 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -12,7 +12,6 @@
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->
         <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:context=".ui.activities.MainActivity">
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index fbd294525..5671d72f2 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -30,8 +30,7 @@
         android:layout_gravity="top|center"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/notifications_refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index ef03ecd2c..fc8f3e4b6 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -4,11 +4,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
-<LinearLayout 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"
-    android:orientation="vertical">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.PrefsActivity"
+        android:orientation="vertical"
+        android:background="@color/white">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="@style/Toolbar"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+        </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index 4eafee561..b67106b28 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -48,14 +48,14 @@
                         android:layout_height="wrap_content"
                         android:src="@drawable/ic_close_grey_800_24dp"
                         android:background="@color/transparent"
-                        android:paddingLeft="@dimen/spacing_small"/>
+                        android:paddingEnd="@dimen/spacing_small"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/report_violation"
                         android:textSize="20sp"
                         android:textColor="@color/gray_50"
-                        android:layout_marginLeft="36dp"
+                        android:layout_marginEnd="36dp"
                         android:id="@+id/toolbar_title" />
                     <Button
                         android:id="@+id/report_button"
@@ -133,7 +133,7 @@
                     tools:text="@string/report_explanation"
                     android:textColor="@color/gray_200"
                     style="@style/Caption3"
-                    android:textColorLink="@color/brand_400"
+                    android:textColorLink="?colorAccent"
                     />
             </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
index 66091e5ff..85325ea9b 100644
--- a/Habitica/res/layout/activity_skill_members.xml
+++ b/Habitica/res/layout/activity_skill_members.xml
@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    tools:context=".ui.activities.PrefsActivity"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index 703069afb..a55bc2bcf 100644
--- a/Habitica/res/layout/activity_skill_tasks.xml
+++ b/Habitica/res/layout/activity_skill_tasks.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    tools:context=".ui.activities.PrefsActivity"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 3208082fa..861aed5a5 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -27,7 +27,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/brand_200"
+                    android:textColor="?colorPrimaryOffset"
                     android:text="@string/usernamePromptTitle"
                     android:gravity="center"
                     android:textSize="16sp"
diff --git a/Habitica/res/layout/avatar_category.xml b/Habitica/res/layout/avatar_category.xml
index d610d4b8d..838f1fd71 100644
--- a/Habitica/res/layout/avatar_category.xml
+++ b/Habitica/res/layout/avatar_category.xml
@@ -10,5 +10,5 @@
     android:layout_width="70dp"
     android:layout_height="70dp"
     android:gravity="center"
-    tools:background="@color/brand_200"
+    tools:background="?colorPrimaryOffset"
     tools:drawableTop="@drawable/icon_body" />
diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml
index 17c206b01..449b68542 100644
--- a/Habitica/res/layout/avatar_setup_drawer.xml
+++ b/Habitica/res/layout/avatar_setup_drawer.xml
@@ -17,7 +17,7 @@
                 android:id="@+id/subcategory_tabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:tabIndicatorColor="@color/brand_400"
+                app:tabIndicatorColor="?colorAccent"
                 app:tabIndicatorHeight="2dp"
                 app:tabTextColor="@color/white_50_alpha"
                 app:tabSelectedTextColor="@color/white"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 95806bf5d..319bc1941 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/avatar_with_bars_layout"
-              android:layout_width="match_parent"
+    android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_centerHorizontal="true"
               android:adjustViewBounds="true"
@@ -32,8 +31,7 @@
                 app:showPet="true"/>
 
         <LinearLayout
-                android:id="@+id/LL_header"
-                android:layout_width="match_parent"
+            android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
diff --git a/Habitica/res/layout/bottom_navigation_item.xml b/Habitica/res/layout/bottom_navigation_item.xml
index ab9e92b15..c486a0e2c 100644
--- a/Habitica/res/layout/bottom_navigation_item.xml
+++ b/Habitica/res/layout/bottom_navigation_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.RelativeLayout"
-    tools:background="@color/brand_100">
+    tools:background="?colorPrimary">
         <ImageView
             android:id="@+id/icon_view"
             android:layout_width="wrap_content"
@@ -18,7 +18,7 @@
             android:id="@+id/title_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/brand_500"
+            android:textColor="?textColorPrimaryDark"
             tools:text="@string/habits"
             android:layout_gravity="center"
             android:textSize="12sp"
@@ -28,6 +28,7 @@
             android:paddingEnd="@dimen/spacing_small"
             android:layout_centerHorizontal="true"
             android:layout_below="@id/icon_view"
+            android:gravity="center"
             />
         <TextView
             android:id="@+id/selected_title_view"
@@ -43,6 +44,7 @@
             android:paddingEnd="@dimen/spacing_small"
             android:layout_centerHorizontal="true"
             android:layout_below="@id/icon_view"
+            android:gravity="center"
             />
     <TextView
         android:id="@+id/badge"
diff --git a/Habitica/res/layout/challenge_add_task_item.xml b/Habitica/res/layout/challenge_add_task_item.xml
index 5df449e54..9a7a08479 100644
--- a/Habitica/res/layout/challenge_add_task_item.xml
+++ b/Habitica/res/layout/challenge_add_task_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="24dp"
         android:textAllCaps="false"
         style="@style/Subheader2"
-        android:textColor="@color/brand_400"
+        android:textColor="?colorAccent"
         android:background="#f9f9f9"
         android:id="@+id/btn_add_task"
         tools:text="Add habit">
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 3ca151d4a..12dd4f1fa 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -10,7 +10,6 @@
     android:background="#fff"
     android:orientation="horizontal"
     android:baselineAligned="false"
-    android:paddingRight="16dp"
     android:paddingEnd="16dp">
 
     <LinearLayout
@@ -69,7 +68,6 @@
             android:layout_marginBottom="@dimen/spacing_small"/>
 
         <LinearLayout
-            android:id="@+id/leaderParticipantLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
diff --git a/Habitica/res/layout/checklist_item.xml b/Habitica/res/layout/checklist_item.xml
deleted file mode 100644
index 69401b3a6..000000000
--- a/Habitica/res/layout/checklist_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/item"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    android:orientation="horizontal"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-
-    <Button
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/delete_item_button"
-        android:text="x" />
-
-    <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:id="@+id/item_edittext"
-        android:layout_weight="1"
-        android:layout_marginLeft="4dp"
-        android:inputType="textCapSentences" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index afa37008e..feed149c2 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -24,11 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="5dp"
-            android:paddingLeft="16dp"
+            android:paddingStart="16dp"
             android:layout_gravity="center_vertical"/>
     </LinearLayout>
     <View
-        android:id="@+id/bottomBorderView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/hairline_height"
         android:background="@color/cell_separator"/>
diff --git a/Habitica/res/layout/custom_date_time_dialogue.xml b/Habitica/res/layout/custom_date_time_dialogue.xml
deleted file mode 100644
index a1462ab64..000000000
--- a/Habitica/res/layout/custom_date_time_dialogue.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical" android:layout_width="match_parent"
-            android:layout_height="match_parent">
-    <LinearLayout
-            android:orientation="vertical" android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <DatePicker
-                android:id="@+id/datePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-        </DatePicker>
-
-        <TimePicker
-                android:id="@+id/timePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-        </TimePicker>
-
-        <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/confirm"
-                android:id="@+id/customDialogConfirmButton"
-                />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/custom_list_preference_row.xml b/Habitica/res/layout/custom_list_preference_row.xml
deleted file mode 100644
index aa8b81791..000000000
--- a/Habitica/res/layout/custom_list_preference_row.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="8dip"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:paddingTop="8dip">
-
-    <EditText
-        android:id="@+id/ET_prefs_customText"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:hint="@string/SP_address_hint"
-        android:inputType="textUri" />
-
-    <RadioButton
-        android:id="@+id/custom_list_view_row_radio_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="false" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 3f7ab165e..56101009b 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -76,7 +76,7 @@
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:text="@string/expand_notes"
                     android:padding="0dp"
-                    android:textColor="@color/brand_400"/>
+                    android:textColor="?colorAccent"/>
                 <TextView
                         android:id="@+id/approvalRequiredTextField"
                         android:layout_width="match_parent"
@@ -90,7 +90,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/task_icon_space"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
 
                     <TextView
                         android:id="@+id/specialTaskText"
@@ -135,6 +136,12 @@
                         android:layout_marginLeft="@dimen/task_icon_space"
                         android:contentDescription="@string/has_reminder"
                         app:srcCompat="@drawable/task_icon_reminder" />
+                    <TextView
+                        android:id="@+id/reminder_textview"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/task_secondary_text"
+                        style="@style/Caption3" />
 
                     <ImageView
                         android:id="@+id/iconviewTag"
@@ -206,7 +213,6 @@
     </FrameLayout>
 
     <View
-        android:id="@+id/checklistSeparator"
         android:layout_width="match_parent"
         android:layout_height="@dimen/hairline_height"
         android:background="@color/cell_separator" />
diff --git a/Habitica/res/layout/dialog_achievement_detail.xml b/Habitica/res/layout/dialog_achievement_detail.xml
index bb6805767..0da174650 100644
--- a/Habitica/res/layout/dialog_achievement_detail.xml
+++ b/Habitica/res/layout/dialog_achievement_detail.xml
@@ -3,12 +3,36 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal">
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/icon_view"
-        android:layout_width="48dp"
-        android:layout_height="52dp"
-        android:scaleType="center"
-        android:layout_marginBottom="@dimen/spacing_large"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_marginBottom="@dimen/spacing_small">
+        <ImageView
+            android:layout_width="41dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/sparkles_left" />
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/icon_view"
+            android:layout_width="48dp"
+            android:layout_height="52dp"
+            android:scaleType="center"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large" />
+        <ImageView
+            android:layout_width="41dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/sparkles_right" />
+    </LinearLayout>
+    <TextView
+        android:id="@+id/title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/SectionTitle"
+        android:gravity="center_horizontal"
+        android:visibility="gone"
+        android:layout_marginBottom="@dimen/spacing_medium"/>
     <TextView
         android:id="@+id/description_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/dialog_achievement_details.xml b/Habitica/res/layout/dialog_achievement_details.xml
index 1c76e4892..6769dfc17 100644
--- a/Habitica/res/layout/dialog_achievement_details.xml
+++ b/Habitica/res/layout/dialog_achievement_details.xml
@@ -2,6 +2,7 @@
 <LinearLayout 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:orientation="vertical"
     android:paddingLeft="24dip"
     android:paddingTop="24dip"
@@ -23,14 +24,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textStyle="bold"
-            android:paddingLeft="15dip"
-            android:text="example title" />
+            android:paddingStart="15dip"
+            tools:text="example title" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/achievement_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="example text"
+        tools:text="example text"
         android:paddingTop="15dip" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail.xml b/Habitica/res/layout/dialog_challenge_detail.xml
deleted file mode 100644
index b5a2ed112..000000000
--- a/Habitica/res/layout/dialog_challenge_detail.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.android.habitica.ui.MaxHeightLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    android:orientation="vertical"
-    app:maxHeightMultiplier="0.7">
-
-    <LinearLayout
-        android:id="@+id/challenge_not_joined_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="19dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="19dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <TextView
-            style="@style/Caption3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:height="20dp"
-            android:text="@string/challenge"
-            android:textAllCaps="true" />
-
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/challenge_joined_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <Button
-            android:id="@+id/challenge_go_to_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/go_to_challenge"
-            android:textColor="#6133b4"
-            android:textSize="16sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="#1f000000" />
-    </LinearLayout>
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginEnd="19dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="19dp"
-        android:layout_marginStart="24dp"
-        android:layout_weight="8">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:scrollbarAlwaysDrawVerticalTrack="true"
-            android:scrollbars="vertical">
-
-
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                android:id="@+id/challenge_name"
-                style="@style/Title2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                tools:text="Read a book by or about a person in your field of study" />
-
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                android:id="@+id/challenge_description"
-                style="@style/Body2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="11dp"
-                android:lineSpacingExtra="4sp"
-                tools:text="There’s always more to learn! Maybe it’s a specialized topic you’re interested in, or maybe it’s the experiences of a notable contributor. Read about it and you may win 15 gems!" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="28dp"
-                android:layout_marginTop="10dp"
-                android:gravity="center_vertical">
-
-                <TextView
-                    android:id="@+id/challenge_leader"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="Leader name"
-                    android:textColor="#6133b4" />
-
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/task_group_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="13dp"
-                android:orientation="vertical">
-
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#1f000000" />
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="24dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-
-                <ImageView
-                    android:id="@+id/gem_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="36dp" />
-
-                <TextView
-                    android:id="@+id/gem_amount"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="15" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="17dp"
-                android:layout_marginStart="17dp"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="36dp"
-                    android:src="@drawable/dialogue_participants" />
-
-                <TextView
-                    android:id="@+id/challenge_member_count"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginStart="4dp"
-                    tools:text="15" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/challenge_join_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Join"
-            android:textColor="#1ca372"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/challenge_leave_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Leave"
-            android:textColor="#d70e14"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </LinearLayout>
-</com.habitrpg.android.habitica.ui.MaxHeightLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_filter_group_item.xml b/Habitica/res/layout/dialog_challenge_filter_group_item.xml
index bd497420a..44ae2a755 100644
--- a/Habitica/res/layout/dialog_challenge_filter_group_item.xml
+++ b/Habitica/res/layout/dialog_challenge_filter_group_item.xml
@@ -7,4 +7,4 @@
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
-    android:paddingLeft="8dp"/>
\ No newline at end of file
+    android:paddingStart="8dp"/>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_edittext_add_local_auth.xml b/Habitica/res/layout/dialog_edittext_add_local_auth.xml
index aa3283484..ee1b6e33d 100644
--- a/Habitica/res/layout/dialog_edittext_add_local_auth.xml
+++ b/Habitica/res/layout/dialog_edittext_add_local_auth.xml
@@ -12,7 +12,7 @@
             android:id="@+id/emailTitleTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword"
+            android:inputType="textEmailAddress"
             android:paddingBottom="16dp"
             android:paddingTop="16dp"
             android:paddingStart="@dimen/spacing_large"
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 427034a60..35db018ca 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -30,7 +30,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/textView4"
         android:text="@string/faint_subtitle"
         android:textStyle="bold"
         android:textSize="16sp" />
@@ -38,7 +37,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/faint_penalty_body"
-        android:id="@+id/textView11" />
+        android:text="@string/faint_penalty_body" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index 25ac24c58..149a1e705 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -26,12 +26,12 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:paddingBottom="@dimen/spacing_large"
-            style="@style/Headline6"
             tools:text="This is the title"
             android:visibility="gone"
             tools:visibility="visible"
             android:layout_marginStart="@dimen/alert_side_padding"
             android:layout_marginEnd="@dimen/alert_side_padding"
+            style="@style/Headline6"
             />
 
         <TextView
@@ -41,12 +41,12 @@
             android:gravity="center_horizontal"
             android:visibility="gone"
             tools:visibility="visible"
-            android:textColor="?textColorSecondary"
-            style="@style/Body2"
             tools:text="This is the message"
             android:paddingBottom="@dimen/spacing_medium"
             android:paddingStart="@dimen/alert_side_padding"
             android:paddingEnd="@dimen/alert_side_padding"
+            android:textColor="?textColorSecondary"
+            style="@style/Body2"
             />
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -99,11 +99,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/close"
-        android:textColor="@color/brand_400"
         android:background="@drawable/alert_dialog_background"
         android:layout_marginTop="@dimen/spacing_large"
         android:visibility="gone"
         tools:visibility="visible"
         android:textSize="16sp"
-        android:textAllCaps="false"/>
+        android:textAllCaps="false"
+        android:textColor="?colorAccent"
+        />
 </LinearLayout>
diff --git a/Habitica/res/layout/dialog_habitica_secondary_button.xml b/Habitica/res/layout/dialog_habitica_secondary_button.xml
index 2c27e3e7b..82aaffe5a 100644
--- a/Habitica/res/layout/dialog_habitica_secondary_button.xml
+++ b/Habitica/res/layout/dialog_habitica_secondary_button.xml
@@ -3,6 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     style="@style/HabiticaButton.Borderless"
-    android:textColor="@color/brand_400">
+    android:textColor="?colorAccent">
 
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index 4e9d03ca1..a39bdd4b6 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -22,7 +22,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/levelupDetail"
         android:text="@string/levelup_detail"
         style="@style/Body2"
         android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index 8b7f0ba11..eb5920031 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -46,26 +46,26 @@
                 android:text="@string/str_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/str_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/per_label"
                 android:text="@string/per_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/per_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
         </TableRow>
         <TableRow
@@ -77,26 +77,26 @@
                 android:text="@string/con_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/con_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/int_label"
                 android:text="@string/int_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/int_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
         </TableRow>
     </TableLayout>
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index c46019af8..540e03a6f 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -101,7 +101,6 @@
                 />
         </TableRow>
         <TableRow
-            android:id="@+id/difficulty_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/quest_difficulty_bg"
diff --git a/Habitica/res/layout/dialog_purchase_shopitem.xml b/Habitica/res/layout/dialog_purchase_shopitem.xml
deleted file mode 100644
index 83e4814f2..000000000
--- a/Habitica/res/layout/dialog_purchase_shopitem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</FrameLayout>
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 1c1a9e0db..726ac5800 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -13,7 +13,7 @@
         android:id="@+id/buy_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/reward.dialog.buy"
+        android:text="@string/reward_dialog_buy"
         android:textColor="@color/brand_300"
         style="@style/Subheader1" />
     <com.habitrpg.android.habitica.ui.views.CurrencyView
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index abc40722f..6c7dd1373 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -10,8 +10,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
         android:background="@color/gray_700">
         <Button
             android:id="@+id/pin_button"
@@ -20,7 +20,8 @@
             android:maxLines="1"
             android:text="@string/pin"
             android:background="@color/transparent"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:gravity="start|center_vertical"/>
         <androidx.legacy.widget.Space
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 7a4a20231..349e9ddeb 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -81,12 +81,12 @@
                     style="@style/Body1_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
                     android:textColor="#6133b4"
                     android:textSize="16sp"
-                    android:gravity="right|center_vertical"
-                    android:paddingRight="0dp"/>
+                    android:gravity="end|center_vertical"
+                    android:paddingEnd="0dp"/>
         </LinearLayout>
         <ScrollView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index 3acd4db2a..441353145 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -11,15 +11,16 @@
         android:id="@+id/menuHeaderView"
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="1dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="1dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <com.habitrpg.android.habitica.ui.views.RoundedCornerLayout
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:background="@drawable/rounded_avatar_bg">
             <com.habitrpg.android.habitica.ui.AvatarView
                 android:id="@+id/avatarView"
@@ -56,11 +57,11 @@
                 android:textColor="@color/white_80_alpha"/>
         </LinearLayout>
 
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/notificationsButtonWrapper"
             android:layout_width="33dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="16dp">
+            android:layout_marginStart="16dp">
             <ImageView
                 android:id="@+id/notificationsButton"
                 android:layout_width="wrap_content"
@@ -74,9 +75,9 @@
                 android:id="@+id/notificationsBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/notificationsButton"
+                android:layout_alignStart="@id/notificationsButton"
                 android:layout_alignTop="@id/notificationsButton"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-13dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
@@ -88,11 +89,11 @@
                 tools:text="1"
                 tools:visibility="visible" />
         </RelativeLayout>
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/messagesButtonWrapper"
             android:layout_width="33dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="8dp">
+            android:layout_marginStart="8dp">
             <ImageView
                 android:id="@+id/messagesButton"
                 android:layout_width="wrap_content"
@@ -106,9 +107,9 @@
                 android:id="@+id/messagesBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/messagesButton"
+                android:layout_alignStart="@id/messagesButton"
                 android:layout_alignTop="@id/messagesButton"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-12dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
@@ -120,11 +121,11 @@
                 tools:text="1"
                 tools:visibility="visible" />
         </RelativeLayout>
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/settingsButtonWrapper"
             android:layout_width="43dp"
             android:layout_height="match_parent"
-            android:paddingLeft="8dp">
+            android:paddingStart="8dp">
             <ImageView
                 android:id="@+id/settingsButton"
                 android:layout_width="wrap_content"
@@ -137,10 +138,10 @@
                 android:id="@+id/settingsBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/settingsButton"
+                android:layout_alignStart="@id/settingsButton"
                 android:layout_alignTop="@id/settingsButton"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-12dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
diff --git a/Habitica/res/layout/drawer_main_item.xml b/Habitica/res/layout/drawer_main_item.xml
index 55f4b487a..b93f50008 100644
--- a/Habitica/res/layout/drawer_main_item.xml
+++ b/Habitica/res/layout/drawer_main_item.xml
@@ -37,4 +37,12 @@
         tools:visibility="visible"
         tools:text="Test"
         android:visibility="gone"/>
+    <View
+        android:id="@+id/bubble_view"
+        style="@style/Pill.Selected"
+        android:background="@drawable/pill_bg_purple_200"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        tools:visibility="visible"
+        android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/drawer_main_section_header.xml b/Habitica/res/layout/drawer_main_section_header.xml
index e9f3ba3b0..cfcd03d51 100644
--- a/Habitica/res/layout/drawer_main_section_header.xml
+++ b/Habitica/res/layout/drawer_main_section_header.xml
@@ -3,7 +3,7 @@
           android:layout_width="match_parent"
           android:layout_height="22dp"
           xmlns:tools="http://schemas.android.com/tools"
-          android:background="@color/brand_100"
+          android:background="?colorPrimary"
           tools:text="Social"
     style="@style/Body1"
     android:textSize="12sp"
diff --git a/Habitica/res/layout/empty_view_timetravelers.xml b/Habitica/res/layout/empty_view_timetravelers.xml
index d8b011541..5c190cc3d 100644
--- a/Habitica/res/layout/empty_view_timetravelers.xml
+++ b/Habitica/res/layout/empty_view_timetravelers.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="38dp"
         android:text="@string/want_to_subscribe"
-        android:textColor="@color/brand_400"
+        android:textColor="?colorAccent"
         android:background="@drawable/layout_rounded_bg_lighter_gray"
         android:layout_marginTop="18dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/filter_menu_item.xml b/Habitica/res/layout/filter_menu_item.xml
index f4c6346e1..2456ec557 100644
--- a/Habitica/res/layout/filter_menu_item.xml
+++ b/Habitica/res/layout/filter_menu_item.xml
@@ -4,7 +4,7 @@
                 android:layout_height="48dp"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_gravity="right|end"
-        tools:background="@color/brand_100"
+        tools:background="?colorPrimary"
                 android:clickable="true">
 
     <ImageView
diff --git a/Habitica/res/layout/fixvalues_edittext.xml b/Habitica/res/layout/fixvalues_edittext.xml
index f593f8e74..9a96a3015 100644
--- a/Habitica/res/layout/fixvalues_edittext.xml
+++ b/Habitica/res/layout/fixvalues_edittext.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
        android:orientation="horizontal"
        android:layout_width="match_parent"
@@ -12,7 +11,7 @@
         android:id="@+id/iconBackgroundView"
         android:layout_width="80dp"
         android:layout_height="match_parent"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:background="@color/red_500"/>
     <LinearLayout
         android:layout_height="match_parent"
@@ -24,7 +23,7 @@
             android:layout_weight="1"
             android:background="@drawable/layout_rounded_bg_gray_700"
             android:paddingTop="8dp"
-            android:paddingLeft="16dp">
+            android:paddingStart="16dp">
             <EditText
                 android:id="@+id/editText"
                 android:layout_width="match_parent"
@@ -43,5 +42,5 @@
         android:layout_height="2dp"
         android:layout_gravity="bottom"
         android:background="@color/gray_500"
-        android:layout_marginRight="56dp"/>
+        android:layout_marginEnd="56dp"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index 3ed993968..f7d922441 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:textSize="@dimen/abc_text_size_small_material"
+            android:textSize="@dimen/card_small_text"
             tools:text="Version 1.0 (1)"/>
 
         <LinearLayout
@@ -57,7 +57,7 @@
             <TextView
                 android:layout_width="250dp"
                 android:layout_height="wrap_content"
-                android:text="See what's new"
+                android:text="@string/see_what_s_new"
                 android:gravity="center"
                 android:textColor="@color/brand_300"
                 />
@@ -71,40 +71,37 @@
             android:layout_marginTop="20sp"
             android:autoLink="web"
             android:text="\@habitica"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
-            android:id="@+id/webSite"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:autoLink="web"
             android:text="www.habitica.com"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
-            android:id="@+id/wiki"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:autoLink="web"
             android:text="http://habitica.wikia.com/"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/googlePlayStoreButton"
             android:layout_width="250dp"
             android:layout_height="35dp"
             android:layout_gravity="center_horizontal"
-
             android:layout_marginTop="35sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.rate_our_app"
+            android:text="@string/about_rate_our_app"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/reportBug"
@@ -112,12 +109,11 @@
             android:layout_height="35dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
-
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.bugreport"
+            android:text="@string/about_bugreport"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/sendFeedback"
@@ -126,10 +122,10 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="20sp"
             android:background="@drawable/rounded_purple_square"
-            android:text="@string/about.give_us_feedback"
+            android:text="@string/about_give_us_feedback"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
             android:id="@+id/sourceCodeLink"
@@ -137,8 +133,8 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="20sp"
-            android:text="@string/about.habitica_open_source"
-            android:textSize="@dimen/abc_text_size_small_material" />
+            android:text="@string/about_habitica_open_source"
+            android:textSize="@dimen/card_small_text" />
 
         <Button
             android:id="@+id/sourceCodeButton"
@@ -147,12 +143,9 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:background="@drawable/rounded_purple_square"
-
-            android:text="@string/about.source_code"
+            android:text="@string/about_source_code"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
-
-
+            android:textSize="@dimen/card_medium_text" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 0ff93622b..a7fc72751 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -39,7 +39,6 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:id="@+id/textView3"
                         android:layout_marginStart="8dp"
                         android:layout_marginLeft="8dp"
                         android:layout_marginEnd="8dp"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 92f71f053..3df8e873e 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -164,7 +164,6 @@
                     android:textSize="12sp"/>
             </LinearLayout>
             <ImageButton
-                android:id="@+id/creator_message_button"
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 style="@style/Base.Widget.AppCompat.Button.Borderless"/>
diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index 704695557..a7c4f0ff2 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -19,6 +19,21 @@
             style="@style/SectionTitle"
             android:text="@string/battle_gear"
             android:textAppearance="?android:attr/textAppearanceMedium" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/row_padding">
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/equip_automatically"/>
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/autoEquipSwitch"/>
+
+        </LinearLayout>
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_fading_viewpager.xml b/Habitica/res/layout/fragment_fading_viewpager.xml
deleted file mode 100644
index 27ff6fb25..000000000
--- a/Habitica/res/layout/fragment_fading_viewpager.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.android.habitica.ui.views.FadingViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-                                   android:layout_width="match_parent"
-                                   android:layout_height="match_parent"
-                                   android:id="@+id/viewPager" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index d8dded035..351f006d7 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -6,8 +6,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout 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">
@@ -18,14 +17,13 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:paddingBottom="20dp"
-            android:text="@string/gem.purchase.title"
+            android:text="@string/gem_purchase_title"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:textColor="@color/blue_10"
             android:textSize="14sp"
             android:lineSpacingExtra="4dp" />
         <TextView
-            android:id="@+id/notAvailableTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/no_billing_gems"
@@ -33,7 +31,6 @@
             android:paddingBottom="10dp"
             android:visibility="gone" />
         <Button
-            android:id="@+id/notAvailableButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -42,7 +39,6 @@
             style="@style/HabiticaButton.Purple"
             android:visibility="gone" />
         <LinearLayout
-            android:id="@+id/gemPurchaseOptions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -91,42 +87,41 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     app:gemAmount="84"
-                    app:gemDrawable="@drawable/gems_84"
-                    app:showSeedsPromo="true" />
+                    app:gemDrawable="@drawable/gems_84" />
             </LinearLayout>
         </LinearLayout>
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/gem.purchase.subtitle"
+            android:text="@string/gem_purchase_subtitle"
             android:gravity="center"
             android:textStyle="normal|bold"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             android:textSize="16sp"
             android:lineSpacingExtra="4dp"
             android:layout_marginTop="23dp"
             android:layout_marginBottom="12dp"/>
 
         <TextView
-            android:text="@string/gem.purchase.listitem1"
+            android:text="@string/gem_purchase_listitem1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem2"
+            android:text="@string/gem_purchase_listitem2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem3"
+            android:text="@string/gem_purchase_listitem3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
             />
         <TextView
-            android:text="@string/gem.purchase.listitem4"
+            android:text="@string/gem_purchase_listitem4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/GemPurchaseListItem"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index dcbac3ba1..1adfa9d01 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -41,7 +41,7 @@
                             android:id="@+id/buttonPartyInviteAccept"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             android:textColor="@color/btn_success"
                             style="?android:buttonBarButtonStyle" />
 
@@ -49,7 +49,7 @@
                             android:id="@+id/buttonPartyInviteReject"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             android:textColor="@color/btn_danger"
                             style="?android:buttonBarButtonStyle" />
                     </LinearLayout>
@@ -141,7 +141,7 @@
                         android:id="@+id/username_textview"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/brand_400"
+                        android:textColor="?colorAccent"
                         style="@style/HabiticaButton.Gray.600"
                         android:background="@drawable/layout_rounded_bg_gray_700"
                         android:layout_marginTop="@dimen/spacing_large"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index dc5bf99f0..bed3ad46a 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -28,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="@dimen/spacing_large"
                 android:paddingEnd="@dimen/spacing_large"
-                android:paddingBottom="@dimen/spacing_medium">
+                android:paddingBottom="@dimen/spacing_medium"
+                android:baselineAligned="false">
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_weight="1"
@@ -141,7 +142,8 @@
                     android:layout_height="65dp"
                     android:gravity="center_vertical"
                     android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingEnd="16dp"
+                    android:baselineAligned="false">
                     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                         android:layout_width="40dp"
                         android:layout_height="40dp"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 35fc181d4..1a694a4ea 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         style="@style/FragmentDialogTitle"
         android:id="@+id/titleTextView"
-        android:background="@color/brand_100"
+        android:background="?colorPrimary"
         android:textColor="@android:color/white" />
     <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
         android:id="@+id/recyclerView"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index e54f27e0a..120c9461d 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -31,13 +31,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:layout_gravity="right">
+                        android:layout_gravity="end">
 
                         <Button
                             android:id="@+id/party_invite_accept_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             android:textColor="@color/btn_success"
                             style="?android:buttonBarButtonStyle" />
 
@@ -45,7 +45,7 @@
                             android:id="@+id/party_invite_reject_button"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             android:textColor="@color/btn_danger"
                             style="?android:buttonBarButtonStyle" />
                     </LinearLayout>
@@ -100,7 +100,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:orientation="vertical"
-                            android:paddingLeft="@dimen/spacing_medium">
+                            android:paddingStart="@dimen/spacing_medium">
                             <TextView
                                 android:id="@+id/quest_title_view"
                                 android:layout_width="match_parent"
@@ -152,16 +152,16 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
+                            android:text="@string/quest_accept"
                             style="@style/HabiticaButton.Green"
-                            android:layout_marginRight="16dp" />
+                            android:layout_marginEnd="16dp" />
 
                         <Button
                             android:id="@+id/quest_reject_button"
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
+                            android:text="@string/quest_reject"
                             style="@style/HabiticaButton.Red"/>
                     </LinearLayout>
                     <LinearLayout
@@ -175,16 +175,16 @@
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.begin"
+                            android:text="@string/quest_begin"
                             style="@style/HabiticaButton.Yellow"
-                            android:layout_marginRight="16dp" />
+                            android:layout_marginEnd="16dp" />
 
                         <Button
                             android:id="@+id/quest_cancel_button"
                             android:layout_width="0dp"
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
-                            android:text="@string/quest.cancel"
+                            android:text="@string/quest_cancel"
                             style="@style/HabiticaButton.Red" />
                     </LinearLayout>
                     <LinearLayout
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index c9ad0e74b..85ef37ffe 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -113,7 +113,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.accept"
+                android:text="@string/quest_accept"
                 style="@style/HabiticaButton.Green"
                 android:layout_marginRight="16dp" />
 
@@ -122,7 +122,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.reject"
+                android:text="@string/quest_reject"
                 style="@style/HabiticaButton.Red"/>
         </LinearLayout>
         <LinearLayout
@@ -137,7 +137,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.begin"
+                android:text="@string/quest_begin"
                 style="@style/HabiticaButton.Yellow"
                 android:layout_marginRight="16dp" />
 
@@ -146,14 +146,14 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.cancel"
+                android:text="@string/quest_cancel"
                 style="@style/HabiticaButton.Red" />
             <Button
                 android:id="@+id/quest_abort_button"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/quest.abort"
+                android:text="@string/quest_abort"
                 style="@style/HabiticaButton.Red" />
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index cbead274e..c7608e656 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 7f97ebea8..8ed29adba 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
     <FrameLayout
-        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/Habitica/res/layout/fragment_shop.xml b/Habitica/res/layout/fragment_shop.xml
deleted file mode 100644
index 73730b4f5..000000000
--- a/Habitica/res/layout/fragment_shop.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/FragmentDialogTitle"
-            android:id="@+id/titleTextView"
-            android:background="@color/brand_100"
-            android:textColor="@android:color/white" />
-        <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:scrollbarSize="3dp"
-            android:scrollbarThumbVertical="@color/scrollbarThumb"
-            android:scrollbars="vertical"
-            />
-
-        <FrameLayout
-            android:id="@+id/emptyView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center" />
-    </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 4a27ad0b0..78c6e7936 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -79,7 +79,7 @@
                 android:text="@string/subscribe_prompt"
                 android:gravity="center"
                 android:textStyle="normal|bold"
-                android:textColor="@color/brand_100"
+                android:textColor="?colorPrimary"
                 android:textSize="16sp"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="8dp"
@@ -94,7 +94,7 @@
                 style="@style/subscriptionBox">
 
                 <TextView
-                    android:text="@string/subscribe.listitem1"
+                    android:text="@string/subscribe_listitem1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -111,7 +111,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem1.description"
-                android:text="@string/subscribe.listitem1.description"
+                android:text="@string/subscribe_listitem1_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -123,7 +123,7 @@
                 android:layout_height="wrap_content"
                 style="@style/subscriptionBox">
                 <TextView
-                    android:text="@string/subscribe.listitem2"
+                    android:text="@string/subscribe_listitem2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -139,7 +139,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem2.description"
-                android:text="@string/subscribe.listitem2.description"
+                android:text="@string/subscribe_listitem2_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -151,7 +151,7 @@
                 android:layout_height="wrap_content"
                 style="@style/subscriptionBox">
                 <TextView
-                    android:text="@string/subscribe.listitem3"
+                    android:text="@string/subscribe_listitem3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -167,7 +167,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem3.description"
-                android:text="@string/subscribe.listitem3.description"
+                android:text="@string/subscribe_listitem3_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -180,7 +180,7 @@
                 style="@style/subscriptionBox"
                 android:layout_marginBottom="8dp">
                 <TextView
-                    android:text="@string/subscribe.listitem4"
+                    android:text="@string/subscribe_listitem4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/SubscriptionListTitle"
@@ -195,7 +195,7 @@
 
             <TextView
                 android:id="@+id/subscribe.listitem4.description"
-                android:text="@string/subscribe.listitem4.description"
+                android:text="@string/subscribe_listitem4_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/SubscriptionListDescription"
@@ -209,7 +209,6 @@
 
 
             <TextView
-                android:id="@+id/notAvailableTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/no_billing_subscriptions"
@@ -217,7 +216,6 @@
                 android:paddingBottom="10dp"
                 android:visibility="gone" />
             <Button
-                android:id="@+id/notAvailableButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -239,28 +237,28 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/month"
-                    app:gemCapText="@string/subscribe1month.gemcap"/>
+                    app:gemCapText="@string/subscribe1month_gemcap"/>
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription3month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/three_months"
-                    app:gemCapText="@string/subscribe3month.gemcap"
+                    app:gemCapText="@string/subscribe3month_gemcap"
                     app:hourGlassCount="1" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription6month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/six_months"
-                    app:gemCapText="@string/subscribe6month.gemcap"
+                    app:gemCapText="@string/subscribe6month_gemcap"
                     app:hourGlassCount="2" />
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription12month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/twelve_months"
-                    app:gemCapText="@string/subscribe12month.gemcap"
+                    app:gemCapText="@string/subscribe12month_gemcap"
                     app:hourGlassCount="4" >
 
                 </com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView>
@@ -297,7 +295,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/gift_subscription"
                 android:background="@color/transparent"
-                android:textColor="@color/brand_400"
+                android:textColor="?colorAccent"
                 android:textAllCaps="false"/>
 
         </LinearLayout>
@@ -311,7 +309,7 @@
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
                 android:paddingBottom="20dp"
-                android:text="@string/subscribe.title"
+                android:text="@string/subscribe_title"
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
                 android:textColor="@color/gray_300"
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index a46a7ea21..d4b567730 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/tavern.inn.rest"
+            android:text="@string/tavern_inn_rest"
             style="@style/HabiticaButton.Yellow"/>
         <TextView
             android:layout_width="match_parent"
@@ -84,7 +84,6 @@
             android:layout_marginTop="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
-        android:id="@+id/moderatorsView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/staff_moderators"
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 4e26eb932..96d1830d5 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -9,7 +9,7 @@
 <LinearLayout
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:paddingLeft="@dimen/spacing_large"
     android:paddingRight="@dimen/spacing_large"
     android:paddingTop="32dp"
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 221de234d..5e2927df8 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/two_handed"
-            android:textColor="@color/brand_400"
+            android:textColor="?colorAccent"
             android:drawablePadding="@dimen/spacing_small"
             android:layout_marginBottom="@dimen/spacing_small"/>
         <com.nex3z.flowlayout.FlowLayout
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index a67d13b4e..99dc484bd 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -78,7 +78,7 @@
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:text="@string/expand_notes"
                 android:padding="0dp"
-                android:textColor="@color/brand_400"/>
+                android:textColor="?colorAccent"/>
             <TextView
                     android:id="@+id/approvalRequiredTextField"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index 40b8afe8c..c0374992c 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -4,7 +4,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/spacing_large">
+    android:padding="@dimen/spacing_large"
+    android:baselineAligned="false">
     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
         android:layout_width="@dimen/avatar_chat_size"
         android:layout_height="@dimen/avatar_chat_size"
diff --git a/Habitica/res/layout/main_navigation_view.xml b/Habitica/res/layout/main_navigation_view.xml
index 3d1f00701..d44ef55ce 100644
--- a/Habitica/res/layout/main_navigation_view.xml
+++ b/Habitica/res/layout/main_navigation_view.xml
@@ -10,30 +10,43 @@
     <LinearLayout
         android:id="@+id/bottom_navigation_background"
         android:layout_width="match_parent"
-        android:layout_height="62dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:gravity="center_vertical"
+        android:layout_alignTop="@id/item_wrapper"
         android:clickable="true">
         <View
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:background="@color/brand_100" />
+            android:background="?barColor" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
         <ImageView
+            android:id="@+id/cutout_background"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/bottom_navigation_inset"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?barColor" />
+    </LinearLayout>
         <View
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:background="@color/brand_100" />
+            android:background="?barColor" />
     </LinearLayout>
     <LinearLayout
+        android:id="@+id/item_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="62dp"
+        android:layout_height="wrap_content"
+        android:minHeight="62dp"
         android:layout_alignParentBottom="true"
-        android:gravity="center_vertical">
+        android:paddingTop="@dimen/spacing_small"
+        android:paddingBottom="@dimen/spacing_small">
         <com.habitrpg.android.habitica.ui.views.navigation.BottomNavigationItem
             android:id="@+id/tab_habits"
             android:layout_width="0dp"
@@ -72,8 +85,8 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_centerHorizontal="true"
-        android:layout_alignBottom="@id/bottom_navigation_background"
-        android:layout_marginBottom="21dp"
+        android:layout_alignTop="@id/bottom_navigation_background"
+        android:layout_marginTop="-39dp"
         android:background="@drawable/fab_background">
         <ImageButton
             android:id="@+id/add"
diff --git a/Habitica/res/layout/no_notifications.xml b/Habitica/res/layout/no_notifications.xml
index 56b4de376..1e14fd4cd 100644
--- a/Habitica/res/layout/no_notifications.xml
+++ b/Habitica/res/layout/no_notifications.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="@dimen/spacing_large">
+    android:padding="@dimen/spacing_large"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -15,7 +16,6 @@
         android:paddingRight="@dimen/spacing_medium">
 
         <ImageView
-            android:id="@+id/noNotifications"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/transparent"
diff --git a/Habitica/res/layout/normal_list_preference_row.xml b/Habitica/res/layout/normal_list_preference_row.xml
deleted file mode 100644
index 075f7e136..000000000
--- a/Habitica/res/layout/normal_list_preference_row.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingBottom="8dip"
-    android:paddingTop="8dip"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip">
-
-    <TableLayout
-        android:id="@+id/custom_list_view_row_table_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="0">
-
-        <TableRow
-            android:id="@+id/custom_list_view_row_table_row"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/custom_list_view_row_text_view"
-                android:textSize="22sp"
-                android:textColor="#000000"  
-                android:gravity="center_vertical"
-                android:layout_width="160dip" 
-                android:layout_height="40dip" />
-
-            <RadioButton
-                android:checked="false"
-                android:id="@+id/custom_list_view_row_radio_button"/>
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index 4af757530..89efb25f3 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -55,7 +55,6 @@
         </TableRow>
 
         <TableRow
-            android:id="@+id/difficulty_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical">
@@ -103,7 +102,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="16dp"
             android:layout_weight="1"
-            android:text="@string/quest.reject" />
+            android:text="@string/quest_reject" />
 
         <Button
             android:id="@+id/accept_button"
@@ -111,7 +110,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/quest.accept" />
+            android:text="@string/quest_accept" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index e060a4296..a03897f70 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -17,7 +17,7 @@
         android:orientation="horizontal"
         android:paddingTop="@dimen/spacing_medium">
 
-        <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        <TextView
             android:id="@android:id/title"
             style="@style/Body1"
             android:layout_width="wrap_content"
@@ -48,6 +48,6 @@
         android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:text="@string/dismiss_all"
-        android:textColor="@color/brand_400" />
+        android:textColor="?colorAccent" />
 
 </LinearLayout>
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index 402f3df06..d97072e71 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -21,12 +21,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
         <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
             android:id="@+id/display_name_textview"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_marginBottom="@dimen/spacing_small" />
-
+            <androidx.legacy.widget.Space
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content" />
+            <ImageButton
+                android:id="@+id/more_button"
+                android:src="@drawable/ic_more_horiz_black_18dp"
+                android:background="@color/transparent"
+                android:layout_width="30dp"
+                android:layout_height="20dp"
+                android:layout_gravity="right"/>
+        </LinearLayout>
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -115,5 +129,4 @@
         </TableLayout>
 
     </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/party_member_quest.xml b/Habitica/res/layout/party_member_quest.xml
deleted file mode 100644
index 62ae349a8..000000000
--- a/Habitica/res/layout/party_member_quest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_margin="5dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="5dp"
-        android:orientation="horizontal">
-
-
-        <TextView
-            android:id="@+id/username"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            tools:text="username"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/rsvpneeded"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            tools:text="response" />
-
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index 14076d1e5..924677962 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -32,7 +32,6 @@
             tools:text="Title"/>
 
         <TextView
-            android:id="@+id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@android:id/title"
@@ -41,7 +40,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/red_10" />
     </RelativeLayout>
-    <LinearLayout android:id="@+id/widget_frame"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 6ae424801..ef6bab6f1 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               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_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_margin="10dp"
               android:orientation="vertical">
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index a85c1813a..e8339f673 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -39,15 +39,4 @@
         android:background="@drawable/purchase_button_background"
         android:textColor="@color/white"
         tools:text="$ 4.99"/>
-
-    <ImageButton
-            android:id="@+id/seedsImageButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/transparent"
-            android:src="@drawable/seeds_badge_store"
-            android:scaleType="fitCenter"
-            android:layout_marginTop="4dp"
-            android:visibility="gone"
-            />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index a80db4647..224b040ef 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/priceLabel"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             android:textSize="24sp"
             android:fontFamily="@string/font_family_medium"
             tools:text="$ 21" />
@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/descriptionTextView"
-            android:textColor="@color/brand_100"
+            android:textColor="?colorPrimary"
             tools:text="recurring every month"
             />
         <LinearLayout
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
deleted file mode 100644
index 0194c200e..000000000
--- a/Habitica/res/layout/qr_code.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:id="@+id/qrLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/qr_section_title"
-        style="@style/SectionTitle"
-        android:layout_gravity="center"
-        android:layout_marginTop="40dp"
-         />
-
-    <FrameLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="300dp"
-        android:id="@+id/qrCodeWrapper">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:id="@+id/QRImageView"
-            android:layout_gravity="center" />
-
-        <RelativeLayout
-            android:orientation="vertical"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center"
-            android:background="@color/white"
-            android:clipChildren="true"
-            android:padding="1dp"
-                        android:visibility="gone"
-            >
-            <com.habitrpg.android.habitica.ui.AvatarView
-                android:id="@+id/avatarView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                />
-        </RelativeLayout>
-    </FrameLayout>
-
-    <Button
-        android:id="@+id/QRDownloadButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/download"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_margin="20dp"
-        android:layout_gravity="center_horizontal|bottom"
-        />
-
-</LinearLayout>
-
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
deleted file mode 100644
index d5e10426d..000000000
--- a/Habitica/res/layout/qr_dialogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-
-    <include
-        layout="@layout/qr_code" />
-
-    <Button
-        android:id="@+id/dialogButtonOK"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/profile_qrcode_close"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_centerHorizontal="true"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/quest_menu_view.xml b/Habitica/res/layout/quest_menu_view.xml
index a148f2ae7..597fc5bc5 100644
--- a/Habitica/res/layout/quest_menu_view.xml
+++ b/Habitica/res/layout/quest_menu_view.xml
@@ -65,7 +65,7 @@
             android:layout_height="30dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            tools:background="@color/brand_50"
+            tools:background="?colorPrimaryDark"
             android:paddingLeft="@dimen/spacing_medium"
             android:paddingRight="@dimen/spacing_large">
             <ImageView
diff --git a/Habitica/res/layout/refresh_actionview.xml b/Habitica/res/layout/refresh_actionview.xml
deleted file mode 100644
index 94905ec38..000000000
--- a/Habitica/res/layout/refresh_actionview.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/ic_refresh_white"
-    style="@style/Widget.AppCompat.ActionButton"/>
\ No newline at end of file
diff --git a/Habitica/res/layout/reminder_item.xml b/Habitica/res/layout/reminder_item.xml
deleted file mode 100644
index 98f0489e0..000000000
--- a/Habitica/res/layout/reminder_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-
-    <EditText
-        android:id="@+id/item_edittext"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        android:focusable="false"
-            android:inputType="date"/>
-
-    <Button
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/delete_item_button"
-        android:text="x" />
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 78bc1e770..1a84a1846 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -6,14 +6,12 @@
     android:background="@color/white">
 
     <LinearLayout
-        android:id="@+id/gearElementsLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
         android:orientation="horizontal">
 
         <ImageView
-            android:id="@+id/rewardImageView"
             android:layout_width="40dp"
             android:layout_height="30dp"
             android:layout_gravity="center_vertical"
@@ -22,7 +20,6 @@
             android:src="@drawable/icon_custom_reward" />
 
         <LinearLayout
-            android:id="@+id/textReward"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -55,7 +52,7 @@
                 style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:text="@string/expand_notes"
                 android:padding="0dp"
-                android:textColor="@color/brand_400"/>
+                android:textColor="?colorAccent"/>
             <TextView
                     android:id="@+id/approvalRequiredTextField"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/row_checklist.xml b/Habitica/res/layout/row_checklist.xml
deleted file mode 100644
index 081d7855a..000000000
--- a/Habitica/res/layout/row_checklist.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <CheckBox
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/checkbox"
-            android:layout_marginTop="0dp" />
-</TableRow>
\ No newline at end of file
diff --git a/Habitica/res/layout/row_number_picker.xml b/Habitica/res/layout/row_number_picker.xml
deleted file mode 100644
index 63c60ab06..000000000
--- a/Habitica/res/layout/row_number_picker.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="72dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/label"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginTop="11dp" />
-
-    <NumberPicker
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/numberPicker"
-        android:layout_toRightOf="@id/label"
-        android:layout_toEndOf="@id/label"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/setup_customization_item.xml b/Habitica/res/layout/setup_customization_item.xml
index 0c9e02535..d4a2a2be2 100644
--- a/Habitica/res/layout/setup_customization_item.xml
+++ b/Habitica/res/layout/setup_customization_item.xml
@@ -6,7 +6,7 @@
               android:gravity="center_vertical"
               android:paddingLeft="6dp"
               android:paddingRight="6dp"
-        tools:background="@color/brand_200">
+        tools:background="?colorPrimaryOffset">
     <ImageView
             android:id="@+id/imageView"
             android:layout_width="@dimen/setup_customization_size"
diff --git a/Habitica/res/layout/simple_widget.xml b/Habitica/res/layout/simple_widget.xml
deleted file mode 100644
index d772e91e7..000000000
--- a/Habitica/res/layout/simple_widget.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:id="@+id/widget_main_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    >
-    <ImageView
-        android:id="@+id/IMG_ProfilePicture"
-        android:layout_width="@dimen/avatar_width"
-        android:layout_height="@dimen/avatar_height"
-        android:layout_gravity="center"
-        android:scaleType="fitStart"
-        android:src="@mipmap/ic_launcher"
-        />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-    <LinearLayout
-        android:id="@+id/LL_header"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/avatar_height"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:paddingRight="@dimen/widget_bar_horizontal_margin"
-        >
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bar_size"
-                android:background="@drawable/border"
-                android:layout_marginBottom="@dimen/bar_padding"
-                >
-                <ProgressBar android:id="@+id/V_HPBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:progressDrawable="@drawable/progressbar_red"
-                    android:visibility="visible" />
-                <TextView
-                    android:id="@+id/TV_HP"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:gravity="center|right"
-                    android:background="@drawable/border"
-                    android:paddingRight="5dp"
-                    android:text="HP" />
-
-            </FrameLayout>
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bar_size"
-                android:background="@drawable/border"
-                >
-                <ProgressBar android:id="@+id/V_XPBar"
-                    style="?android:attr/progressBarStyleHorizontal"
-
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:progressDrawable="@drawable/progressbar_yellow"
-                    />
-                <TextView
-                    android:id="@+id/TV_XP"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:gravity="center|right"
-                    android:background="@drawable/border"
-                    android:paddingRight="5dp"
-                    android:text="XP" />
-            </FrameLayout>
-        </LinearLayout>
-        <ImageButton
-            android:id="@+id/BT_refresh"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:scaleType="fitStart"
-            android:src="@drawable/ic_menu_refresh"
-            android:layout_gravity="top|right"
-            android:layout_marginTop="5dp"
-            android:background="@color/transparent"
-            />
-    </FrameLayout>
-
-</LinearLayout>
-
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 413c473a5..dd66c4bd7 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -44,7 +44,6 @@
         </RelativeLayout>
     </LinearLayout>
     <View
-        android:id="@+id/bottomBorderView"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/cell_separator"/>
diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml
index 010339170..e7d87bc7e 100644
--- a/Habitica/res/layout/snackbar_view.xml
+++ b/Habitica/res/layout/snackbar_view.xml
@@ -22,7 +22,9 @@
             android:layout_width="@dimen/snackbar_image_size"
             android:background="@drawable/white_circle_background"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"/>
         <LinearLayout
             android:id="@+id/content_container"
             android:layout_width="0dp"
diff --git a/Habitica/res/layout/stats_view.xml b/Habitica/res/layout/stats_view.xml
index ec3141e3b..fd8cf6dd7 100644
--- a/Habitica/res/layout/stats_view.xml
+++ b/Habitica/res/layout/stats_view.xml
@@ -76,7 +76,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/sidebar.equipment"
+                android:text="@string/sidebar_equipment"
                 android:textSize="12sp"
                 android:textColor="@color/gray_300"
                 android:gravity="center_horizontal"/>
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 235bd5bd7..2ed42e21c 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -139,7 +139,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             style="@style/subscriptionBoxText.Subtitle"
-            android:text="@string/cancel_subscription_notgoogle.description"
+            android:text="@string/cancel_subscription_notgoogle_description"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"/>
         <Button
diff --git a/Habitica/res/layout/task_form_task_scheduling.xml b/Habitica/res/layout/task_form_task_scheduling.xml
index 0696fc951..f97c08c25 100644
--- a/Habitica/res/layout/task_form_task_scheduling.xml
+++ b/Habitica/res/layout/task_form_task_scheduling.xml
@@ -29,7 +29,7 @@
         <TextView
             android:id="@+id/start_date_textview"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:textSize="16sp"
             tools:text="Thu, November 2, 2017"
@@ -39,7 +39,8 @@
         android:id="@+id/repeats_every_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -52,7 +53,7 @@
             android:paddingEnd="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_medium">
+            android:layout_marginEnd="@dimen/spacing_medium">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
             android:paddingEnd="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_large"
-            android:layout_marginLeft="@dimen/spacing_medium">
+            android:layout_marginStart="@dimen/spacing_medium">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/tasks_duedate.xml b/Habitica/res/layout/tasks_duedate.xml
deleted file mode 100644
index 61d00f444..000000000
--- a/Habitica/res/layout/tasks_duedate.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/due_date"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <LinearLayout
-        android:id="@+id/task_duedate_picker_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-
-        <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/todo_has_duedate"
-            android:id="@+id/duedate_checkbox" />
-
-        <EditText
-            android:id="@+id/duedate_text_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="4dp"
-            android:hint="@string/due_date"
-            android:textColor="@android:color/black"
-            android:focusable="false" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tasks_startdate.xml b/Habitica/res/layout/tasks_startdate.xml
deleted file mode 100644
index 7423d86e6..000000000
--- a/Habitica/res/layout/tasks_startdate.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/start_date"
-        android:id="@+id/startdate_text_title"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <EditText
-        android:id="@+id/startdate_text_edittext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/start_date"
-        android:textColor="@android:color/black"
-        android:focusable="false" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index e919baead..05c31bba4 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -8,7 +8,8 @@
             android:orientation="horizontal"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_medium">
+            android:paddingRight="@dimen/spacing_medium"
+            android:baselineAligned="false">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="0dp"
diff --git a/Habitica/res/layout/tavern_daniel_item.xml b/Habitica/res/layout/tavern_daniel_item.xml
deleted file mode 100644
index 7b07d8f96..000000000
--- a/Habitica/res/layout/tavern_daniel_item.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="120dp"
-        android:src="@drawable/npc_daniel"
-        android:layout_margin="10dp"
-        android:layout_gravity="center"
-        />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center|center_horizontal"
-        android:orientation="vertical">
-
-        <Button
-            android:id="@+id/btn.toggle.inn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/tavern.inn.rest"
-            android:layout_gravity="center"
-            android:textColor="@color/white"
-            android:drawableTint="@color/white"
-            android:backgroundTint="@color/brand"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/inn_description"
-            />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index e92cea4e4..51daa288c 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -77,7 +77,7 @@
                     style="@style/Base.Widget.AppCompat.Button.Borderless"
                     android:text="@string/expand_notes"
                     android:padding="0dp"
-                    android:textColor="@color/brand_400"/>
+                    android:textColor="?colorAccent"/>
                 <TextView
                         android:id="@+id/approvalRequiredTextField"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/toolbar_search.xml b/Habitica/res/layout/toolbar_search.xml
new file mode 100644
index 000000000..ffdd8f28f
--- /dev/null
+++ b/Habitica/res/layout/toolbar_search.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.SearchView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:iconifiedByDefault="false"
+    app:searchHintIcon="@null"
+    app:searchIcon="@null"
+    android:theme="@style/SearchViewStyle"
+    app:queryHint="@string/search"
+    tools:background="@color/brand" />
\ No newline at end of file
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 17d25b0f3..cdd3d63ba 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/value_bar_layout"
-                android:layout_width="match_parent"
+    android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/bar_padding"
                 android:orientation="horizontal">
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index d24fc34a2..0b5a9d6f7 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -35,13 +35,13 @@
                 android:id="@+id/infoIconView"
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:layout_gravity="center_vertical|left"/>
+                android:layout_gravity="center_vertical|start"/>
         </FrameLayout>
         <ImageView
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="center"
-            android:paddingRight="32dp" />
+            android:paddingEnd="32dp" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/widget_avatar_stats.xml b/Habitica/res/layout/widget_avatar_stats.xml
index 29f8267fa..c7aa396ed 100644
--- a/Habitica/res/layout/widget_avatar_stats.xml
+++ b/Habitica/res/layout/widget_avatar_stats.xml
@@ -1,230 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/widget_main_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:background="@drawable/rounded_purple_square"
-        android:padding="8dp"
-        android:elevation="2dp"
-        android:orientation="vertical">
-<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/widget_main_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:background="@drawable/rounded_purple_square"
+    android:padding="8dp"
+    android:elevation="2dp"
+    android:orientation="vertical">
+    <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
-    <ImageView
+        <ImageView
             android:id="@+id/avatar_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@mipmap/ic_launcher"
-            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             android:scaleType="centerInside"
-            android:adjustViewBounds="true"/>
-    <LinearLayout
-            android:id="@+id/LL_header"
+            android:adjustViewBounds="true"
+            tools:ignore="ContentDescription" />
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_gravity="center_vertical">
             <RelativeLayout
-                    android:id="@+id/hp_wrapper"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/bar_padding"
-                            android:orientation="horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/bar_padding"
+                android:orientation="horizontal">
                 <ImageView
-                        android:id="@+id/ic_hp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/bar_icon_padding"
-                        android:layout_marginEnd="@dimen/bar_icon_padding"
-                        android:layout_alignTop="@+id/hp_bar"
-                        android:layout_alignBottom="@id/hp_bar"
-                        android:scaleType="center"
-                        android:contentDescription="@string/HP_default"/>
-                <ProgressBar
-                        android:id="@+id/hp_bar"
-                        android:layout_toRightOf="@id/ic_hp_header"
-                        android:layout_toEndOf="@id/ic_hp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/bar_size_slim"
-                        android:orientation="horizontal"
-                        android:weightSum="1"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        style="@android:style/Widget.ProgressBar.Horizontal"
-                        android:progressDrawable="@drawable/hp_progress"
-                        android:paddingTop="1dp"
-                        android:paddingBottom="1dp"/>
-
-                <LinearLayout
-                        android:layout_below="@id/hp_bar"
-                        android:layout_toRightOf="@id/ic_hp_header"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                    <TextView
-                            android:id="@+id/TV_hp_value"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
-                    <TextView
-                            android:id="@+id/TV_hp_label"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|right"
-                            android:layout_weight="1"
-                            android:text="@string/HP_default"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
-                </LinearLayout>
-            </RelativeLayout>
-
-            <RelativeLayout
-                    android:id="@+id/exp_wrapper"
-                    android:layout_width="match_parent"
+                    android:id="@+id/ic_hp_header"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                <ImageView
-                        android:id="@+id/ic_exp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/bar_icon_padding"
-                        android:layout_marginEnd="@dimen/bar_icon_padding"
-                        android:layout_alignTop="@+id/exp_bar"
-                        android:layout_alignBottom="@+id/exp_bar"
-                        android:scaleType="center"
-                        android:contentDescription="Bar Icon"/>
+                    android:layout_marginEnd="@dimen/bar_icon_padding"
+                    android:layout_alignTop="@+id/hp_bar"
+                    android:layout_alignBottom="@id/hp_bar"
+                    android:scaleType="center"
+                    android:contentDescription="@string/HP_default"/>
                 <ProgressBar
-                        android:id="@+id/exp_bar"
-                        android:layout_toRightOf="@id/ic_exp_header"
-                        android:layout_toEndOf="@id/ic_exp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/bar_size_slim"
-                        android:orientation="horizontal"
-                        android:weightSum="1"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        style="@android:style/Widget.ProgressBar.Horizontal"
-                        android:progressDrawable="@drawable/exp_progress"
-                        android:paddingTop="1dp"
-                        android:paddingBottom="1dp"/>
+                    android:id="@+id/hp_bar"
+                    android:layout_toEndOf="@id/ic_hp_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/bar_size_slim"
+                    android:orientation="horizontal"
+                    android:weightSum="1"
+                    android:layout_alignParentEnd="true"
+                    style="@android:style/Widget.ProgressBar.Horizontal"
+                    android:progressDrawable="@drawable/hp_progress"
+                    android:paddingTop="1dp"
+                    android:paddingBottom="1dp"/>
 
                 <LinearLayout
-                        android:layout_below="@id/exp_bar"
-                        android:layout_toRightOf="@id/ic_exp_header"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_below="@id/hp_bar"
+                    android:layout_toEndOf="@id/ic_hp_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
                     <TextView
-                            android:id="@+id/exp_TV_value"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
+                        android:id="@+id/TV_hp_value"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
                     <TextView
-                            android:id="@+id/exp_TV_label"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|right"
-                            android:layout_weight="1"
-                            android:text="@string/XP_default"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center|end"
+                        android:layout_weight="1"
+                        android:text="@string/HP_default"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
                 </LinearLayout>
             </RelativeLayout>
 
             <RelativeLayout
-                    android:id="@+id/mp_wrapper"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/bar_padding"
-                            android:orientation="horizontal">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
                 <ImageView
-                        android:id="@+id/ic_mp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="@dimen/bar_icon_padding"
-                        android:layout_marginEnd="@dimen/bar_icon_padding"
-                        android:layout_alignTop="@+id/mp_bar"
-                        android:layout_alignBottom="@+id/mp_bar"
-                        android:scaleType="center"
-                        android:contentDescription="Bar Icon" />
+                    android:id="@+id/ic_exp_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/bar_icon_padding"
+                    android:layout_alignTop="@+id/exp_bar"
+                    android:layout_alignBottom="@+id/exp_bar"
+                    android:scaleType="center"
+                    tools:ignore="ContentDescription"/>
                 <ProgressBar
-                        android:id="@+id/mp_bar"
-                        android:layout_toRightOf="@id/ic_mp_header"
-                        android:layout_toEndOf="@id/ic_mp_header"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/bar_size_slim"
-                        android:orientation="horizontal"
-                        android:weightSum="1"
-                        android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
-                        style="@android:style/Widget.ProgressBar.Horizontal"
-                        android:progressDrawable="@drawable/mp_progress"
-                        android:paddingTop="1dp"
-                        android:paddingBottom="1dp"/>
+                    android:id="@+id/exp_bar"
+                    android:layout_toEndOf="@id/ic_exp_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/bar_size_slim"
+                    android:orientation="horizontal"
+                    android:weightSum="1"
+                    android:layout_alignParentEnd="true"
+                    style="@android:style/Widget.ProgressBar.Horizontal"
+                    android:progressDrawable="@drawable/exp_progress"
+                    android:paddingTop="1dp"
+                    android:paddingBottom="1dp"/>
 
                 <LinearLayout
-                        android:layout_below="@id/mp_bar"
-                        android:layout_toRightOf="@id/ic_mp_header"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                    android:layout_below="@id/exp_bar"
+                    android:layout_toEndOf="@id/ic_exp_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
                     <TextView
-                            android:id="@+id/mp_TV_value"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
+                        android:id="@+id/exp_TV_value"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
                     <TextView
-                            android:id="@+id/mp_TV_label"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:gravity="center|right"
-                            android:layout_weight="1"
-                            android:text="@string/MP_default"
-                            android:textColor="@color/brand_500"
-                            android:textSize="11sp"/>
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center|end"
+                        android:layout_weight="1"
+                        android:text="@string/XP_default"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
+                </LinearLayout>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/mp_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/bar_padding"
+                android:orientation="horizontal">
+                <ImageView
+                    android:id="@+id/ic_mp_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/bar_icon_padding"
+                    android:layout_alignTop="@+id/mp_bar"
+                    android:layout_alignBottom="@+id/mp_bar"
+                    android:scaleType="center"
+                    tools:ignore="ContentDescription" />
+                <ProgressBar
+                    android:id="@+id/mp_bar"
+                    android:layout_toEndOf="@id/ic_mp_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/bar_size_slim"
+                    android:orientation="horizontal"
+                    android:weightSum="1"
+                    android:layout_alignParentEnd="true"
+                    style="@android:style/Widget.ProgressBar.Horizontal"
+                    android:progressDrawable="@drawable/mp_progress"
+                    android:paddingTop="1dp"
+                    android:paddingBottom="1dp"/>
+
+                <LinearLayout
+                    android:layout_below="@id/mp_bar"
+                    android:layout_toEndOf="@id/ic_mp_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/mp_TV_value"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center|end"
+                        android:layout_weight="1"
+                        android:text="@string/MP_default"
+                        android:textColor="@color/brand_500"
+                        android:textSize="12sp"/>
                 </LinearLayout>
             </RelativeLayout>
         </LinearLayout>
     </LinearLayout>
     <LinearLayout
-            android:id="@+id/detail_info_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/bar_padding_small"
+        android:id="@+id/detail_info_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/bar_padding_small"
         android:gravity="center_vertical">
         <TextView
-                android:id="@+id/lvl_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="14sp"
-                android:textColor="@color/textColorSecondaryDark" />
+            android:id="@+id/lvl_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="14sp"
+            android:textColor="@color/textColorSecondaryDark" />
         <TextView
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
         <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical">
-
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/hourglass_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:ignore="ContentDescription" />
             <TextView
                 android:id="@+id/hourglasses_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:textColor="@color/textColorSecondaryDark"
                 style="@style/CurrencyTextView"
                 />
@@ -232,27 +219,29 @@
             <ImageView
                 android:id="@+id/gem_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:ignore="ContentDescription" />
             <TextView
-                    android:id="@+id/gems_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
-                    android:textColor="@color/textColorSecondaryDark"
+                android:id="@+id/gems_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:textColor="@color/textColorSecondaryDark"
                 style="@style/CurrencyTextView"
-                    />
+                />
 
             <ImageView
                 android:id="@+id/gold_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                tools:ignore="ContentDescription" />
             <TextView
-                    android:id="@+id/gold_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/textColorSecondaryDark"
+                android:id="@+id/gold_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/textColorSecondaryDark"
                 style="@style/CurrencyTextView"
-                    />
+                />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/Habitica/res/layout/widget_dailies_list_row.xml b/Habitica/res/layout/widget_dailies_list_row.xml
index 41d92b94c..ddffc1a59 100644
--- a/Habitica/res/layout/widget_dailies_list_row.xml
+++ b/Habitica/res/layout/widget_dailies_list_row.xml
@@ -38,5 +38,5 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/selection_highlight" />
+        android:background="@drawable/selection_highlight_brand" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/widget_habit_button.xml b/Habitica/res/layout/widget_habit_button.xml
index 33d46d605..8bb98bf1f 100644
--- a/Habitica/res/layout/widget_habit_button.xml
+++ b/Habitica/res/layout/widget_habit_button.xml
@@ -21,11 +21,12 @@
                 android:src="@drawable/plus"
                 android:scaleType="center"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="@drawable/selection_highlight_brand" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight"
+                android:background="@drawable/selection_highlight_brand"
                 />
         </FrameLayout>
         <FrameLayout
@@ -39,11 +40,11 @@
                 android:scaleType="center"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight" />
+                android:background="@drawable/selection_highlight_brand" />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/selection_highlight"
+                android:background="@drawable/selection_highlight_brand"
                 />
         </FrameLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/widget_todo_list_row.xml b/Habitica/res/layout/widget_todo_list_row.xml
index 4c3675ce3..b2c2a0510 100644
--- a/Habitica/res/layout/widget_todo_list_row.xml
+++ b/Habitica/res/layout/widget_todo_list_row.xml
@@ -38,5 +38,5 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/selection_highlight" />
+        android:background="@drawable/selection_highlight_brand" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/world_boss_description_view.xml b/Habitica/res/layout/world_boss_description_view.xml
index cd1c4e507..202dafccb 100644
--- a/Habitica/res/layout/world_boss_description_view.xml
+++ b/Habitica/res/layout/world_boss_description_view.xml
@@ -19,7 +19,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -35,7 +35,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -51,7 +51,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -67,7 +67,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
diff --git a/Habitica/res/menu/challenge_admin.xml b/Habitica/res/menu/challenge_admin.xml
deleted file mode 100644
index 6f83b31c7..000000000
--- a/Habitica/res/menu/challenge_admin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_challenge_edit"
-        android:orderInCategory="1"
-        android:title="@string/action_edit" />
-
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/chat_message.xml b/Habitica/res/menu/chat_message.xml
deleted file mode 100644
index 1e8266daf..000000000
--- a/Habitica/res/menu/chat_message.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu.chat.copy.as.todo"
-        android:icon="@drawable/ic_launch_black_24dp"
-        android:title="@string/copy_as_todo" />
-    <item
-        android:id="@+id/menu.chat.send.pm"
-        android:icon="@drawable/ic_chat_black_24dp"
-        android:title="@string/send_pm" />
-    <group>
-        <item
-                android:id="@+id/menu.chat.copy"
-                android:icon="@drawable/ic_content_copy_black_24dp"
-                app:showAsAction="always|withText"
-                android:title="@string/copy_chat_message" />
-        <item
-            android:id="@+id/menu.chat.flag"
-            android:icon="@drawable/ic_flag_black_24dp"
-            app:showAsAction="always|withText"
-            android:title="@string/flag" />
-        <item
-            android:id="@+id/menu.chat.delete"
-            android:icon="@drawable/ic_delete_black_24dp"
-            android:title="@string/delete" />
-    </group>
-</menu>
diff --git a/Habitica/res/menu/inbox.xml b/Habitica/res/menu/inbox.xml
deleted file mode 100644
index 03e0a2762..000000000
--- a/Habitica/res/menu/inbox.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-            android:id="@+id/send_message"
-            android:title="@string/send_new_message"
-            android:icon="@drawable/ic_action_chat"
-            app:showAsAction="always"
-            />
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/login.xml b/Habitica/res/menu/login.xml
index 7411ecca0..443a5b53c 100644
--- a/Habitica/res/menu/login.xml
+++ b/Habitica/res/menu/login.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-	<item
-			android:id="@+id/action_toggleRegistering"
-			android:orderInCategory="1"
-			app:showAsAction="ifRoom"
-			android:title="@string/login_btn"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_toggleRegistering"
+        android:orderInCategory="1"
+        app:showAsAction="ifRoom"
+        android:title="@string/login_btn"/>
 
 </menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/main_menu_tasks.xml b/Habitica/res/menu/main_menu_tasks.xml
deleted file mode 100644
index 9a4f8b695..000000000
--- a/Habitica/res/menu/main_menu_tasks.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/tab_habits"
-        android:title="@string/habits"
-        android:icon="@drawable/icon_habits_selected" />
-    <item android:id="@+id/tab_dailies"
-        android:title="@string/dailies"
-        android:icon="@drawable/icon_dailies_selected" />
-    <item android:id="@+id/add"
-        android:icon="@drawable/md_transparent"
-        />
-    <item android:id="@+id/tab_todos"
-        android:title="@string/todos"
-        android:icon="@drawable/icon_todos_selected" />
-    <item android:id="@+id/tab_rewards"
-        android:title="@string/rewards"
-        android:icon="@drawable/icon_rewards_selected" />
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/menu_main_activity.xml b/Habitica/res/menu/menu_main_activity.xml
index 542721cdf..7225931c4 100644
--- a/Habitica/res/menu/menu_main_activity.xml
+++ b/Habitica/res/menu/menu_main_activity.xml
@@ -8,10 +8,14 @@
         android:icon="@drawable/ic_refresh_white"
         android:title="@string/action_refresh"
         app:showAsAction="never"
-        android:actionViewClass="android.widget.ImageButton"/>
-
-    <!-- Search, should appear as action button -->
+        app:actionViewClass="android.widget.ImageButton"/>
     <item android:id="@+id/action_search"
+        android:title="@string/search"
+        android:icon="@drawable/ic_search"
+        app:showAsAction="collapseActionView|always"
+        app:actionLayout="@layout/toolbar_search" />
+
+    <item android:id="@+id/action_filter"
           android:icon="@drawable/ic_action_filter_list"
           android:title="@string/filter"
           app:showAsAction="ifRoom" />
diff --git a/Habitica/res/menu/party_member_menu.xml b/Habitica/res/menu/party_member_menu.xml
new file mode 100644
index 000000000..1cb35b19e
--- /dev/null
+++ b/Habitica/res/menu/party_member_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/send_message"
+        android:icon="@drawable/menu_messages"
+        android:title="@string/send_message" />
+    <item android:id="@+id/transfer_ownership"
+        android:icon="@drawable/ic_arrow_drop_down_gray_48dp"
+        android:title="@string/transfer_ownership" />
+    <item android:id="@+id/remove"
+        android:icon="@drawable/ic_delete_black_24dp"
+        android:title="@string/remove_member" />
+</menu>
\ No newline at end of file
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher.png b/Habitica/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index ffe53ef51..000000000
Binary files a/Habitica/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher.webp b/Habitica/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f052bb67
Binary files /dev/null and b/Habitica/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher_round.png b/Habitica/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 01d6c3e7a..000000000
Binary files a/Habitica/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher_round.webp b/Habitica/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..066112991
Binary files /dev/null and b/Habitica/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher.png b/Habitica/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 8ed1da691..000000000
Binary files a/Habitica/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher.webp b/Habitica/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..b87d05363
Binary files /dev/null and b/Habitica/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher_round.png b/Habitica/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 2725e734f..000000000
Binary files a/Habitica/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher_round.webp b/Habitica/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..ea8d0062b
Binary files /dev/null and b/Habitica/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher.png b/Habitica/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index d5167e001..000000000
Binary files a/Habitica/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher.webp b/Habitica/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..7dddfeb13
Binary files /dev/null and b/Habitica/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 250b0d2cd..000000000
Binary files a/Habitica/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..618438ce0
Binary files /dev/null and b/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher.png b/Habitica/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 97568e957..000000000
Binary files a/Habitica/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher.webp b/Habitica/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..0debd86b5
Binary files /dev/null and b/Habitica/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 086b4bbde..000000000
Binary files a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..c56f1c90f
Binary files /dev/null and b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher.png b/Habitica/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 094734b7e..000000000
Binary files a/Habitica/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp b/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..afcc16580
Binary files /dev/null and b/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 86c9c0360..000000000
Binary files a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..0f31f5c50
Binary files /dev/null and b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index ce1223a4c..099163fdf 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -8,7 +8,7 @@
     <fragment
         android:id="@+id/equipmentOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment"
-        android:label="@string/sidebar.equipment" >
+        android:label="@string/sidebar_equipment" >
         <deepLink app:uri="habitica.com/inventory/equipment" />
         <action
             android:id="@+id/openEquipmentDetail"
@@ -17,7 +17,7 @@
     <fragment
         android:id="@+id/equipmentDetailFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment"
-        android:label="@string/sidebar.equipment" >
+        android:label="@string/sidebar_equipment" >
         <argument
             android:name="type"
             app:argType="string" />
@@ -36,7 +36,7 @@
     <fragment
         android:id="@+id/partyFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment"
-        android:label="@string/sidebar.party">
+        android:label="@string/sidebar_party">
         <deepLink app:uri="habitica.com/party" />
         <action
             android:id="@+id/openQuestDetail"
@@ -60,7 +60,7 @@
     <fragment
         android:id="@+id/skillsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment"
-        android:label="@string/sidebar.skills">
+        android:label="@string/sidebar_skills">
 
     </fragment>
     <fragment
@@ -72,13 +72,13 @@
     <fragment
         android:id="@+id/tavernFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.TavernFragment"
-        android:label="@string/sidebar.tavern">
+        android:label="@string/sidebar_tavern">
         <deepLink app:uri="habitica.com/tavern" />
     </fragment>
     <fragment
         android:id="@+id/guildsOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment"
-        android:label="@string/sidebar.guilds" >
+        android:label="@string/sidebar_guilds" >
         <deepLink app:uri="habitica.com/groups/myGuilds" />
         <action
             android:id="@+id/openGuildDetail"
@@ -90,7 +90,7 @@
     <fragment
         android:id="@+id/challengesOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment"
-        android:label="@string/sidebar.challenges" >
+        android:label="@string/sidebar_challenges" >
         <deepLink app:uri="habitica.com/challenges/myChallenges" />
         <deepLink app:uri="habitica.com/challenges/findChallenges" />
         <action
@@ -104,7 +104,7 @@
     <fragment
         android:id="@+id/avatarOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment"
-        android:label="@string/sidebar.avatar" >
+        android:label="@string/sidebar_avatar" >
         <action
             android:id="@+id/openAvatarDetail"
             app:destination="@id/avatarCustomizationFragment" />
@@ -122,7 +122,7 @@
     <fragment
         android:id="@+id/stableFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment"
-        android:label="@string/sidebar.stable" >
+        android:label="@string/sidebar_stable" >
         <deepLink app:uri="habitica.com/inventory/stable" />
         <action
             android:id="@+id/openPetDetail"
@@ -134,11 +134,11 @@
     <activity
         android:id="@+id/gemPurchaseActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity"
-        android:label="@string/gem.purchase.toolbartitle" />
+        android:label="@string/gem_purchase_toolbartitle" />
     <fragment
         android:id="@+id/newsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.NewsFragment"
-        android:label="@string/sidebar.news" />
+        android:label="@string/sidebar_news" />
     <fragment
         android:id="@+id/FAQOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment"
@@ -151,11 +151,11 @@
     <fragment
         android:id="@+id/aboutFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.AboutFragment"
-        android:label="@string/sidebar.about" />
+        android:label="@string/sidebar_about" />
     <fragment
         android:id="@+id/inboxFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.social.InboxFragment"
-        android:label="@string/sidebar.inbox" >
+        android:name="com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment"
+        android:label="@string/sidebar_inbox" >
         <action
             android:id="@+id/openInboxDetail"
             app:destination="@id/inboxMessageListFragment" />
@@ -196,7 +196,7 @@
     <fragment
         android:id="@+id/avatarCustomizationFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment"
-        android:label="@string/sidebar.avatar" >
+        android:label="@string/sidebar_avatar" >
         <argument
             android:name="type"
             app:argType="string" />
diff --git a/Habitica/res/values-be/strings.xml b/Habitica/res/values-be/strings.xml
new file mode 100755
index 000000000..e21d72c94
--- /dev/null
+++ b/Habitica/res/values-be/strings.xml
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Абнавіць</string>
+  <string name="XP_default">Вопыт</string>
+  <string name="HP_default">Здароўе</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Наладкі</string>
+  <string name="pref_reminder_header">Штодзённы напамін</string>
+  <string name="pref_reminder_checkbox">Актываваць напамін</string>
+  <string name="pref_reminder_picker">Наладзіць час напаміну</string>
+  <!--Adding tasks-->
+  <string name="task_value">Вартасьць</string>
+  <string name="action_edit">Рэдагаваць</string>
+  <string name="action_delete">Выдаліць</string>
+  <string name="action_cancel">Адмяніць</string>
+  <string name="login_btn">Падлучыцца</string>
+  <string name="register_btn">Зарэгістравацца</string>
+  <string name="username">Імя карыстальніка</string>
+  <string name="email_username">Электронная пошта ці імя карыстальніка</string>
+  <string name="password">Пароль</string>
+  <string name="emailAddress">Электронная пошта</string>
+  <string name="confirmpassword">Пацьвердзіць пароль</string>
+  <string name="logout">Выйсьці</string>
+  <string name="string_revive">Адрадзіцца</string>
+  <string name="about.title">Інфармацыя</string>
+  <string name="about.rate_our_app">Ацаніце нашу прыладу</string>
+  <!--Network Errors-->
+  <string name="network_error_no_network_body">Вы не падлучаныя да інтэрнэту.</string>
+  <string name="authentication_error_body">Ваша імя карыстальніка і/альбо пароль былі ўведзеныя не правільна.</string>
+  <string name="save_changes">Захаваць</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_button">Ура!</string>
+  <string name="faint_subtitle">Не адчайвайцеся!</string>
+  <string name="add_checklist_item">Дадаць</string>
+  <string name="coming_soon">Неўзабаве</string>
+  <string name="flag_confirm">Паскардзіцца на паведамленьне</string>
+  <string name="reward.dialog.buy">Набыць</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_size">Памер</string>
+  <string name="avatar_background">Фон</string>
+  <string name="purchase_button">Набыць</string>
+  <string name="purchase_set_title">Набыць набор %s</string>
+  <string name="due_date">Да</string>
+  <string name="quest.accept">Згадзіцца</string>
+  <string name="quest.reject">Адмовіцца</string>
+  <string name="quest.begin">Пачаць квэст</string>
+  <string name="quest.cancel">Адмяніць запрашэньне</string>
+  <string name="quest.leave">Пакінуць квэст</string>
+  <string name="quest.accepted">Згадзіліся</string>
+  <string name="quest.rejected">Адмовіліся</string>
+  <string name="quest.participants">Удзельнікі</string>
+  <string name="complete_tutorial">Ясна!</string>
+  <string name="dismiss_tutorial">Напомніць мне яшчэ раз</string>
+  <string name="skip_button">Прапусьціць</string>
+  <string name="setup_group_school">Школа</string>
+  <string name="setup_task_work_2">Самае галоўнае заданьне</string>
+  <string name="setup_task_work_3">Працоўны праект</string>
+  <string name="setup_task_school_1">Вучыцца/Пракрастынаваць</string>
+  <string name="setup_task_school_2">Зрабіць хатнія заданьні</string>
+  <string name="setup_task_chores_1">10 хвілінаў прыборкі</string>
+  <string name="setup_task_chores_2">Памыць посуд</string>
+  <string name="my_guilds">Мае гільдыі</string>
+  <string name="public_guilds">Публічныя гільдыі</string>
+  <string name="guild">Гільдыя</string>
+  <string name="leave">Выйсьці</string>
+  <string name="join">Далучыцца</string>
+  <string name="leader">Лідэр</string>
+  <string name="gems">Каштоўныя камяні</string>
+  <string name="send_pm">Даслаць прыватнае паведамленьне</string>
+  <string name="flag">Паскардзіцца</string>
+  <string name="delete">Выдаліць</string>
+  <string name="name">Імя</string>
+  <string name="description">Апісаньне</string>
+  <string name="privacy">Прыватнасьць</string>
+  <string name="write_message">Напісаць паведамленьне</string>
+  <string name="costume">Касьцюм</string>
+  <string name="outfit_head">Галава</string>
+  <string name="outfit_body">Цела</string>
+  <string name="outfit_shield">Шчыт</string>
+  <string name="outfit_weapon">Зброя</string>
+  <string name="wear_costume">Апрануць касьцюм</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="use_animal">Скарыстаць</string>
+  <string name="feed">Пакарміць</string>
+  <string name="close">Зачыніць</string>
+  <string name="share">Падзяліцца</string>
+  <!--QR Strings-->
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index fe9695e9d..ca65ba3f6 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Ниво:</string>
     <string name="profile_class_bonus">Класов бонус:</string>
     <string name="profile_allocated">Разпределени:</string>
-    <string name="profile_boosts">Подсилки:</string>
     <string name="profile_private_message">Лично съобщение</string>
     <string name="profile_achievements">Постижения</string>
-    <string name="profile_achievement_ok">Добре</string>
-    <string name="profile_qrcode_close">Затваряне</string>
 
 </resources>
diff --git a/Habitica/res/values-bg/strings.sidebar.xml b/Habitica/res/values-bg/strings.sidebar.xml
index 63f55e193..4e20255b3 100644
--- a/Habitica/res/values-bg/strings.sidebar.xml
+++ b/Habitica/res/values-bg/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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_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_about">Относно</string>
   <string name="sidebar_shops">Магазини</string>
   <string name="sidebar_stats">Показатели</string>
 </resources>
diff --git a/Habitica/res/values-bg/strings.tutorial.xml b/Habitica/res/values-bg/strings.tutorial.xml
index d2c9b6c28..610cc0764 100644
--- a/Habitica/res/values-bg/strings.tutorial.xml
+++ b/Habitica/res/values-bg/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Купувайте екипировка за героя си със златото, което печелите!</string>
   <string name="tutorial_rewards_2">Можете и да си създадете реални персонализирани награди, в зависимост от това какво Ви мотивира.</string>
   <string name="tutorial_tasks_complete">Това е всичко засега. Ако искате да си припомните нещо, погледнете раздела с ЧЗВ.</string>
-  <string name="tutorial_equipment">Когато купувате екипировка, тя се появява тук. Бойното снаряжение променя показателите Ви, а костюмът (ако е включен) променя вида на героя Ви.</string>
-  <string name="tutorial_items">Печелете предмети като изпълнявате задачи и качвате нива. Докоснете предмет, за да го използвате!</string>
-  <string name="tutorial_pets">Когато изпълнявате задачите си в истинския живот, имате шанс на случаен принцип да Ви се паднат яйца и отвари. Комбинирайте ги, за да излюпите любимци</string>
-  <string name="tutorial_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
+    <string name="tutorial_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
   <string name="tutorial_party">Тук е мястото, където заедно с приятелите си можете взаимно да се държите отговорни за изпълнението на целите си, както и да се биете срещу чудовища със задачите си!</string>
   <string name="tutorial_tavern">Добре дошли в кръчмата — обществено място за разговори, достъпно за хора от всички възрасти! Тук можете да разговаряте за продуктивността си и да задавате въпроси. Приятно прекарване!</string>
-  <string name="tutorial_classes">Изберете дали да бъдете воин, магьосник, лечител или мошеник! Всеки клас има уникална екипировка и умения. Докоснете (?), за да научите повече!</string>
-  <string name="tutorial_stats">Докоснете сивия бутон, за да разпределите по много от точките си наведнъж, или докоснете стрелките, за да добавяте по една точка.</string>
+    <string name="tutorial_stats">Докоснете сивия бутон, за да разпределите по много от точките си наведнъж, или докоснете стрелките, за да добавяте по една точка.</string>
 </resources>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 1c5406498..3b1fb948c 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Опит</string>
   <string name="HP_default">Здраве</string>
   <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройките не могат да бъдат заредени от кода</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Вашият персонализиран сървър</string>
-  <string name="SP_userID_title">Потребителски идентификатор</string>
+    <string name="SP_userID_title">Потребителски идентификатор</string>
   <string name="SP_userID_summary">Вашият потребителски идентификатор</string>
   <string name="SP_APIToken_title">Жетон за ППИ</string>
   <string name="SP_APIToken_summary">Вашият жетон за ППИ</string>
   <string name="Language_title">Език</string>
   <string name="Language_summary">Промяна на езика на Хабитика</string>
-  <string name="SP_user_qr_code">Вашият QR-код</string>
-  <string name="PS_contact_title">Свържете се с мен</string>
-  <string name="unknown_error">Възникна грешка…</string>
-  <string name="pref_account_header">Профил</string>
+    <string name="PS_contact_title">Свържете се с мен</string>
+    <string name="pref_account_header">Профил</string>
   <string name="pref_first_day_of_the_week_title">Начален ден на седмицата</string>
   <string name="pref_first_day_of_the_week_summary">Първият ден от седмицата във всички календари</string>
   <string name="pref_reminder_header">Ежедневно напомняне</string>
   <string name="pref_reminder_checkbox">Включване на напомнянето</string>
   <string name="pref_reminder_picker">Задаване на времето за напомняне</string>
   <string name="pref_cds_header">Персонализирано начало на деня</string>
-  <string name="pref_cds_picker">Задаване на персонализирано начало на деня</string>
-  <string name="pref_push_notifications_checkbox">Потребителски известия</string>
+    <string name="pref_push_notifications_checkbox">Потребителски известия</string>
   <string name="push_notifications">Известия</string>
   <string name="push_notifications_sum">Настройте известията си</string>
   <string name="preference_push_you_won_challenge">Спечелихте предизвикателство!</string>
@@ -37,14 +32,8 @@
   <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="action_edit">Редактиране</string>
+    <string name="action_cancel">Отказ</string>
   <string name="login_btn">Вход</string>
   <string name="register_btn">Регистрация</string>
   <string name="username">Потребителско име</string>
@@ -54,32 +43,23 @@
   <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">Хабитика е софтуер с отворен код, който е наличен в Github</string>
-  <string name="about.rate_our_app">Оценете приложението</string>
-  <string name="about.give_us_feedback">Изпратете ни отзивите си!</string>
-  <string name="about.bugreport">Докладване на проблем</string>
-  <string name="about.source_code">Изходен код</string>
-  <string name="repeatEvery">Повтаря се всеки</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="LoginActivityName">Добре дошли</string>
+    <string name="about_title">Относно</string>
+  <string name="about_libraries">Библиотеки</string>
+    <string name="about_habitica_open_source">Хабитика е софтуер с отворен код, който е наличен в Github</string>
+  <string name="about_rate_our_app">Оценете приложението</string>
+  <string name="about_give_us_feedback">Изпратете ни отзивите си!</string>
+  <string name="about_bugreport">Докладване на проблем</string>
+  <string name="about_source_code">Изходен код</string>
+    <!--Network Errors-->
+    <string name="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_title">Грешка при проверяването</string>
   <string name="login_validation_error_fieldsmissing">Трябва да попълните всички полета.</string>
   <string name="save_changes">Запазване</string>
   <string name="copy">Копиране</string>
   <string name="notes">Бележки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Трудност</string>
+    <string name="difficulty">Трудност</string>
   <string name="tags">Етикети</string>
   <string name="trivial">Елементарно</string>
   <string name="easy">Лесно</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Отрицателен ( - )</string>
   <string name="checklist">Подзадачи</string>
   <string name="reminders">Напомняния</string>
-  <string name="actions">Действия</string>
-  <string name="attributes">Показатели</string>
-  <string name="physical">Сила</string>
-  <string name="mental">Интелигентност</string>
-  <string name="social">Якост</string>
-  <string name="other">Усет</string>
-  <string name="frequency">Честота</string>
-  <string name="frequency_weekly">В определени дни от седмицата</string>
-  <string name="frequency_daily">На всеки Х дни</string>
-  <string name="repeatables_summary_title">Резюме</string>
-  <string name="repeatables_title">Повтаря се</string>
-  <string name="repeatables_on_title">Повтаря се в</string>
-  <string name="repeatables_frequency_daily">Ежедневно</string>
+    <string name="attributes">Показатели</string>
+    <string name="repeatables_frequency_daily">Ежедневно</string>
   <string name="repeatables_frequency_weekly">Ежеседмично</string>
   <string name="repeatables_frequency_monthly">Ежемесечно</string>
   <string name="repeatables_frequency_yearly">Всяка година</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Здравето Ви свърши!</string>
   <string name="faint_button">Възстановете здравето си и опитайте отново</string>
   <string name="filter">Филтър</string>
-  <string name="profile_image">Профилно изображение</string>
-  <string name="mana_price_button">%d МТ</string>
-  <string name="used_skill">Използвахте %1$s за %2$d точки мана.</string>
-  <string name="used_skill_without_mana">Вие използвахте %1$s.</string>
+    <string name="used_skill_without_mana">Вие използвахте %1$s.</string>
   <string name="new_checklist_item">нова подзадача</string>
-  <string name="add_checklist_item">Добавяне</string>
-  <string name="reminder_title">Не забравяйте да отметнете задачите си</string>
-  <string name="skill_progress_title">Използване на умение</string>
-  <string name="coming_soon">Очаквайте скоро</string>
-  <string name="chat_flag_confirmation">Наистина ли искате да докладвате това съобщение за нарушение?</string>
-  <string name="flag_confirm">Докладване на съобщението</string>
-  <string name="unlock_lvl_11">Оключва се на ниво 11</string>
-  <string name="no_party_message">Вие не участвате в група. За да се присъедините към група, моля, посетете уеб сайта.</string>
-  <string name="forgot_pw_btn">Забравена парола</string>
-  <string name="tavern.inn.checkOut">Включете отново ежедневните си задачи</string>
-  <string name="tavern.inn.rest">Пауза на ежедн</string>
-  <string name="reward.dialog.buy">Купуване</string>
-  <string name="reward.dialog.dismiss">Премахване</string>
+    <string name="reminder_title">Не забравяйте да отметнете задачите си</string>
+    <string name="unlock_lvl_11">Оключва се на ниво 11</string>
+    <string name="forgot_pw_btn">Забравена парола</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>
@@ -148,24 +108,20 @@
   <string name="dailies">Ежедн</string>
   <string name="todos">Задачи</string>
   <string name="rewards">Награди</string>
-  <string name="taskform.delete.title">Сигурен/на ли сте?</string>
-  <string name="taskform.delete.message">Наистина ли искате да изтриете това?</string>
-  <string name="yes">Да</string>
+    <string name="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_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">Размер</string>
   <string name="avatar_size_slim">Слаб</string>
   <string name="avatar_size_broad">Широк</string>
   <string name="avatar_background">Фон</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Купуване</string>
   <string name="purchase_set_title">Купуване на комплекта %s</string>
   <string name="due_date">Крайна дата</string>
-  <string name="quest.accept">Приемане</string>
-  <string name="quest.reject">Отказване</string>
-  <string name="quest.begin">Започване на мисия</string>
-  <string name="quest.cancel">Отказване на поканата</string>
-  <string name="quest.abort">Прекратяване на мисията</string>
-  <string name="quest.leave">Напускане на мисията</string>
-  <string name="quest.pending">В очакване</string>
-  <string name="quest.accepted">Приета</string>
-  <string name="quest.rejected">Отказана</string>
-  <string name="quest.participants">Участници</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="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="version_info">Версия %1$s (%2$d)</string>
   <string name="sidebar_help">Помощ и ЧЗВ</string>
   <string name="complete_tutorial">Разбрано!</string>
   <string name="dismiss_tutorial">Напомнете ми отново</string>
   <string name="intro_1_subtitle">Добре дошли в</string>
-  <string name="intro_1_title">Хабитика</string>
-  <string name="intro_1_description">Време е да започнете да се забавлявате, докато вършите задачите си. Над %s вече подобряват живота си с малки стъпки.</string>
+    <string name="intro_1_description">Време е да започнете да се забавлявате, докато вършите задачите си. Над %s вече подобряват живота си с малки стъпки.</string>
   <string name="intro_2_subtitle">Напредък в играта</string>
   <string name="intro_2_title">Напредък в живота</string>
   <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
@@ -198,12 +148,9 @@
   <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="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="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</string>
   <string name="task_setup_description">Страхотно! И така, върху какво искате да поработите по време на това пътешествие?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Упражнения</string>
@@ -233,29 +180,20 @@
   <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="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="gems">Диаманти</string>
+    <string name="delete">Изтриване</string>
   <string name="name">Име</string>
   <string name="description">Описание</string>
   <string name="add_tag">Добавяне на нов етикет</string>
   <string name="privacy">Поверителност</string>
   <string name="write_message">Напишете съобщение</string>
-  <string name="post">Изпр.</string>
-  <string name="guild_search_hint">Търсене на гилдии</string>
-  <string name="todo_due">Срок: %s</string>
-  <string name="daily_streak">текуща серия: %d</string>
-  <string name="todo_has_duedate">Задачата има краен срок</string>
-  <string name="battle_gear">Бойно снаряжение</string>
+    <string name="guild_search_hint">Търсене на гилдии</string>
+    <string name="battle_gear">Бойно снаряжение</string>
   <string name="costume">Костюм</string>
   <string name="outfit_head">Глава</string>
   <string name="outfit_headAccessory">Аксесоар за глава</string>
@@ -268,10 +206,8 @@
   <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">Наистина ли искате това? Само %1$d от общо %2$d членове на групата са се присъединили в мисията! Мисията ще започне автоматично, след като всички играчи се присъединят или откажат поканата.</string>
-  <string name="quest.invitation.text">Получихте покана за участие в мисия!</string>
-  <string name="ago_1day">Преди 1 час</string>
+    <string name="quest_begin_message">Наистина ли искате това? Само %1$d от общо %2$d членове на групата са се присъединили в мисията! Мисията ще започне автоматично, след като всички играчи се присъединят или откажат поканата.</string>
+    <string name="ago_1day">Преди 1 час</string>
   <string name="ago_days">Преди %dдни</string>
   <string name="ago_1Minute">Преди 1 мин</string>
   <string name="ago_minutes">Преди %dмин</string>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
   <string name="armoireFood">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
   <string name="armoireExp">Сборвате се с гардероба и получавате опит. Така му се пада!</string>
-  <string name="armoireNotesFull">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
-  <string name="armoireLastItem">Намерихте последния рядък предмет за екипиране в омагьосания гардероб.</string>
-  <string name="armoireNotesEmpty">В гардероба ще се появяват нови предмети през първата седмица на всеки месец. До тогава продължавайте да щракате за опит и храна!</string>
-  <string name="sell">Продаване (%d злато)</string>
+    <string name="sell">Продаване (%d злато)</string>
   <string name="hatch_with_potion">Излюпване с отвара</string>
-  <string name="feed_to_pet">Даване на любимец</string>
-  <string name="hatch_egg">Излюпване с яйце</string>
+    <string name="hatch_egg">Излюпване с яйце</string>
   <string name="invite_party">Поканване на групата</string>
   <string name="dialog_feeding">Хранене на %s с:</string>
   <string name="use_animal">Използване</string>
@@ -305,13 +237,8 @@
   <string name="close">Затваряне</string>
   <string name="share">Споделяне</string>
   <string name="notification_pet_fed">Вие нахранихте своя(та/то) %s!</string>
-  <string name="notification_purchase">Вие закупихте %s</string>
-  <string name="notification_purchase_reward">Вие закупихте награда</string>
-  <string name="sectiondrop">Обикновени</string>
-  <string name="sectionpremium">Магическа отвара</string>
-  <string name="sectionquest">Мисия</string>
-  <string name="sectionspecial">Редки</string>
-  <string name="world_quest">Световна мисия</string>
+    <string name="notification_purchase_reward">Вие закупихте награда</string>
+    <string name="world_quest">Световна мисия</string>
   <string name="inn_description">Нуждаете се от почивка\? Идете в странноприемницата на Даниел, за да спрете някои от по-трудните механики на Хабитика:
 \n
 \n • Пропуснатите ежедневни задачи няма да Ви нараняват;
@@ -331,8 +258,7 @@
   <string name="healer_description">Лечителите трудно могат да бъдат наранени и разпростират защитата си върху останалите. Пропуснатите ежедневни задачи и лошите навици не ги смущават толкова много; те винаги могат да възстановят здравето си след провал. Играйте като лечител, ако обичате да помагате на останалите в групата си или ако искате да изиграете смъртта чрез усърдна работа!</string>
   <string name="select_class">Изберете клас</string>
   <string name="opt_out_class">Отказване</string>
-  <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
-  <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
+    <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
   <string name="class_changed">Вие вече сте %s!</string>
   <string name="class_changed_description">Вече имате ново бойно снаряжение по подразбиране, което можете да намерите в „Екипировка“!</string>
   <string name="choose_class">Избиране на класа</string>
@@ -346,23 +272,18 @@
   <string name="invite_existing_users">Поканете съществуващи потребители</string>
   <string name="send">Изпращане</string>
   <string name="invite">Поканете приятели</string>
-  <string name="invite_id_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителски идентификатор тук.</string>
-  <string name="invite_username_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителските им имена тук.</string>
+    <string name="invite_username_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="email">Е-поща</string>
+    <string name="share_using">Споделяне чрез</string>
   <string name="share_levelup">Достигнах ниво %d в Хабитика, като подобрявам навиците си в истинския живот!</string>
   <string name="share_hatched">Току-що излюпих любимец — %1$s %2$s в Хабитика, като изпълнявах задачите си в истинския живот!</string>
   <string name="share_raised">Току-що се сдобих с превоз — %1$s в Хабитика като изпълнявах задачите си в истинския живот!</string>
   <string name="open_in_store">Отваряне в магазина</string>
   <string name="change_class_confirmation">Наистина ли искате да промените класа си? Това ще Ви струва 3 диаманта.</string>
   <string name="change_class_equipment_warning">Внимание: Повече няма да можете да купувате екипировка за класа „%s“.</string>
-  <string name="leaderMessage">Съобщение от %1$s</string>
-  <string name="leaderName">Водач: %1$s</string>
-  <string name="confirm">Потвърждаване</string>
+    <string name="confirm">Потвърждаване</string>
   <string name="market">Пазар</string>
   <string name="timeTravelers">Пътешественици във времето</string>
   <string name="seasonalShop">Сезонен магазин</string>
@@ -370,37 +291,16 @@
   <string name="party_invite">Отключете като поканите приятели</string>
   <string name="login_incentive">Отключете като се вписвате редовно в Хабитика</string>
   <string name="create_account">Отключете като си създадете профил</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="successful_purchase">Закупено: %1$s</string>
+    <string name="gold_plural">злато</string>
   <string name="chat_message_copied">Съобщението е копирано</string>
-  <string name="copy_chat_message">Копиране</string>
-  <string name="edit_tag_title">Редактиране на етикет</string>
-  <string name="edit_tag_btn_edit">Редактиране</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Изтриване</string>
-  <string name="confirm_delete_tag_title">Сигурен/на ли сте?</string>
+    <string name="edit_tag_btn_edit">Редактиране</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Изберете получател</string>
   <string name="action_continue">Продължаване</string>
-  <string name="scan_qr_code">Сканиране на QR-код</string>
-  <string name="enter_recipient_uuid">Въведете потр. ид. на получателя</string>
-  <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
+    <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
   <string name="stats_widget_label">Статистика на Хабитика</string>
   <string name="add_task">Добавяне на задача</string>
   <string name="add_habit">Добавяне на навик</string>
@@ -411,15 +311,14 @@
   <string name="widget_habit_button">Извършване на навик в Хабитика</string>
   <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
   <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
-  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
-  <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
-  <string name="gem.purchase.toolbartitle">Купуване</string>
-  <string name="gem.purchase.title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
-  <string name="gem.purchase.subtitle">Диамантите Ви позволяват да закупувате забавни екстри за профила си като:</string>
-  <string name="gem.purchase.listitem1">Страхотни костюми за героя Ви</string>
-  <string name="gem.purchase.listitem2">Невероятни фонови изображения</string>
-  <string name="gem.purchase.listitem3">Мисии, които Ви награждават с яйца за любимци</string>
-  <string name="gem.purchase.listitem4">Възможността да промените класа си преди ниво 100</string>
+    <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
+  <string name="gem_purchase_toolbartitle">Купуване</string>
+  <string name="gem_purchase_title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
+  <string name="gem_purchase_subtitle">Диамантите Ви позволяват да закупувате забавни екстри за профила си като:</string>
+  <string name="gem_purchase_listitem1">Страхотни костюми за героя Ви</string>
+  <string name="gem_purchase_listitem2">Невероятни фонови изображения</string>
+  <string name="gem_purchase_listitem3">Мисии, които Ви награждават с яйца за любимци</string>
+  <string name="gem_purchase_listitem4">Възможността да промените класа си преди ниво 100</string>
   <string name="support_habitica">Подкрепете Хабитика</string>
   <string name="skill_transformation_use">използване</string>
   <string name="hatching_market_info">Не Ви се падат предметите, които искате? Прегледайте пазара!</string>
@@ -433,32 +332,32 @@
   <string name="belongs_to_challenge">Принадлежи на предизвикателство</string>
   <string name="has_reminder">Има напомняне</string>
   <string name="has_tag">Има етикет</string>
-  <string name="subscribe.title">Абонирането подкрепя разработчиците и помага на Хабитика да продължи да съществува</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="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="subscription_duration_norenew">За %s</string>
   <string name="subscribe">Абониране</string>
-  <string name="subscribe.listitem1.description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
-  <string name="subscribe.listitem2.description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</string>
-  <string name="subscribe.listitem3.description">Прави завършените задачи и историята на задачите налични за по-дълго време.</string>
-  <string name="subscribe.listitem4.description">С двойно увеличеното ограничение на паданията ще получавате повече предмети от завършените си задачи всеки ден, което ще Ви помогне да завършите конюшнята си по-бързо!</string>
-  <string name="subscribe1month.gemcap">Ограничение от 25 диаманта</string>
-  <string name="subscribe3month.gemcap">Ограничение от 30 диаманта</string>
-  <string name="subscribe6month.gemcap">Ограничение от 35 диаманта</string>
-  <string name="subscribe12month.gemcap">Ограничение от 45 диаманта</string>
+  <string name="subscribe_listitem1_description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
+  <string name="subscribe_listitem2_description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</string>
+  <string name="subscribe_listitem3_description">Прави завършените задачи и историята на задачите налични за по-дълго време.</string>
+  <string name="subscribe_listitem4_description">С двойно увеличеното ограничение на паданията ще получавате повече предмети от завършените си задачи всеки ден, което ще Ви помогне да завършите конюшнята си по-бързо!</string>
+  <string name="subscribe1month_gemcap">Ограничение от 25 диаманта</string>
+  <string name="subscribe3month_gemcap">Ограничение от 30 диаманта</string>
+  <string name="subscribe6month_gemcap">Ограничение от 35 диаманта</string>
+  <string name="subscribe12month_gemcap">Ограничение от 45 диаманта</string>
   <string name="subscription_hourglasses">+%d Тайнствен пясъчен часовник</string>
   <string name="payment_method">Разплащателен метод</string>
   <string name="subscription">Абонамент</string>
   <string name="active">Активен</string>
   <string name="due">Краен срок</string>
   <string name="cancel_subscription">Прекратяване на абонамента</string>
-  <string name="cancel_subscription_google.description">Не искате вече да бъдете абонат? Можете да прекратите абонамента си от раздела „Моите приложения“ в магазина „Google Play“.</string>
-  <string name="cancel_subscription_notgoogle.description">Искате да прекратите абонамента си? Заради избрания от Вас разплащателен метод, можете да направите това само от уеб сайта. Натиснете бутона по-долу, за да отворите уеб сайта в браузъра си!</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>
@@ -466,63 +365,47 @@
   <string name="monthly_gem_cap">Месечно ограничение на диамантите</string>
   <string name="inactive">Неактивен</string>
   <string name="one_month">1 месец</string>
-  <string name="months">%d месеца</string>
+  <string name="months">месеца</string>
   <string name="month">месец</string>
   <string name="three_months">3 месеца</string>
   <string name="six_months">6 месеца</string>
   <string name="twelve_months">12 месеца</string>
   <string name="subscribe_prompt_thanks">За абонирането си получавате следните полезни неща:</string>
   <string name="subscription_status">Състояние на абонамента</string>
-  <string name="byLeader">от %s</string>
-  <string name="challenge_details">Подробности за предизвикателството</string>
-  <string name="challenge_leave_title">Напускане на предизвикателството</string>
+    <string name="challenge_leave_title">Напускане на предизвикателството</string>
   <string name="challenge_leave_text">Наистина ли искате да напуснете предизвикателството „%s“?</string>
   <string name="challenge_remove_tasks_title">Премахване на задачите</string>
   <string name="challenge_remove_tasks_text">Искате ли да премахнете задачите?</string>
   <string name="remove_tasks">Премахване</string>
   <string name="keep_tasks">Задържане</string>
   <string name="my_challenges">Моите предизвикателства</string>
-  <string name="public_challenges">Обществени</string>
-  <string name="challenges">Предизвикателства</string>
-  <string name="daily">Ежедневно</string>
+    <string name="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="challenge">Предизвикателство</string>
+    <string name="not_part_of_a_challenge">В момента не участвате в предизвикателство!</string>
   <string name="join_a_challenge">Включете се в предизвикателство, така ще добавите списък от подбрани задачи към списъка си. След това се състезавайте с останалите хабитиканци, за да печелите постижения и дори диаманти!</string>
   <string name="check_the_public_challenge_tab">Докоснете раздела „Обществени“, там ще откриете предизвикателствата, създадени от потребителите и ще можете да изберете най-подходящото за себе си!</string>
-  <string name="add_reminder">Добавяне на напомняне</string>
-  <string name="warning">Внимание</string>
-  <string name="open_settings">Отваряне на настройките</string>
-  <string name="dont_keep_activities_warning">Изглежда сте включили опцията за разработчици „Да не се пазят дейностите“. В момента тя предизвиква проблеми с приложението на Хабитика, така че е препоръчително да я изключите.</string>
-  <string name="inbox">Съобщения</string>
-  <string name="FAQ">Често задавани въпроси</string>
-  <string name="special">Специален</string>
+    <string name="inbox">Съобщения</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="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="checkInRewardEarned">Спечелихте %1$s като награда за усърдието си в подобряването на живота си.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Следващата Ви награда ще се отключи след %1$d отчитания</string>
   <string name="pending_approval">изчакване за одобрение</string>
   <string name="filters">Филтри</string>
   <string name="done">Готово</string>
-  <string name="group_tasks_edit_description">Груповите задачи не могат да бъдат редактирани.</string>
-  <string name="group_tasks_edit_title">Тази задача не може да се редактира</string>
-  <string name="groups">Групи</string>
+    <string name="groups">Групи</string>
   <string name="all">Всички</string>
   <string name="none">Нищо</string>
   <string name="owned">Притежавани</string>
   <string name="not_owned">Непритежавани</string>
-  <string name="new_game">Нова\nигра</string>
-  <string name="login_btn_fb">Влизане с Фейсбук</string>
+    <string name="login_btn_fb">Влизане с Фейсбук</string>
   <string name="login_btn_google">Влизане с Гугъл</string>
   <string name="action_back">Назад</string>
   <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nПърво, как да Ви наричам? Можете спокойно да промените това, което съм избрал. Когато сте готови, можем да преминем към създаването на герой!</string>
@@ -554,7 +437,6 @@
   <string name="reload_content">Презареждане на съдържанието</string>
   <string name="dailyDueDefaultView">Ежедневните по подразбиране да са неизпълнени</string>
   <string name="dailyDueDefaultViewDescription">Ако това е избрано, ежедневните задачи по подразбиране ще се появяват в раздела с неизпълнени, вместо в този с всички задачи</string>
-  <string name="repeat_summary">Повтаря се %1$s всеки %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Устройството Ви не разполага с никой от поддържаните разплащателни методи. Моля, използвайте уеб сайта на Хабитика, ако искате да закупите диаманти.</string>
   <string name="no_billing_subscriptions">Устройството Ви не разполага с никой от поддържаните разплащателни методи. Моля, използвайте уеб сайта на Хабитика, ако искате да закупите абонамент.</string>
   <string name="save">Запазване</string>
@@ -562,8 +444,7 @@
   <string name="gem_reward">Награда в диаманти</string>
   <string name="tasks">Задачи</string>
   <string name="create_challenge">Създаване на предизвикателство</string>
-  <string name="edit_challenge">Редактиране</string>
-  <string name="challenge_create_error_tavern_one_gem">Трябва да разполагате с поне 1 диамант, за да създадете обществено предизвикателство.</string>
+    <string name="challenge_create_error_tavern_one_gem">Трябва да разполагате с поне 1 диамант, за да създадете обществено предизвикателство.</string>
   <string name="challenge_create_error_enough_gems">Не разполагате с достатъчно диаманти, за да създадете предизвикателство.</string>
   <string name="identify_your_challenge_with_a_tag">Задайте кратко име на предизвикателството си</string>
   <string name="challenge_create_error_tag">Трябва Ви кратко име, за да създадете това предизвикателство.</string>
@@ -573,42 +454,36 @@
   <string name="new_challenge_title">Ново заглавие на предизвикателството</string>
   <string name="ownership">Притежание</string>
   <string name="inn">Странноприемница</string>
-  <string name="system">Система</string>
-  <string name="start_quest">Започване на нова мисия</string>
+    <string name="start_quest">Започване на нова мисия</string>
   <string name="leave_party">Напускане на групата</string>
   <string name="party_description">Описание на групата</string>
-  <string name="abort_confirmation">Наистина ли искате да прекъснете мисията? Така тя ще приключи за всички в групата Ви и целият Ви напредък ще бъде изгубен. Свитъкът с мисията ще бъде върнат на собственика си.</string>
-  <string name="leave_quest_confirmation">Наистина ли искате да напуснете текущата мисия\? Целият Ви напредък по нея ще бъде изгубен.</string>
-  <string name="number_participants">%1$d участници</string>
+    <string name="number_participants">%1$d участници</string>
   <string name="welcome_back">Добре дошли отново</string>
   <string name="yesterdaililes_prompt">Свършихте ли някоя от тези ежедневни задачи вчера?</string>
   <string name="start_day">Начало на деня ми</string>
   <string name="leave_party_confirmation">Наистина ли искате да напуснете групата?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Следващата награда ще бъде след %d отчитания</string>
-  <string name="pending">В очакване</string>
+    <string name="pending">В очакване</string>
   <string name="accepted">Приета</string>
   <string name="declined">Отказана</string>
   <string name="participants">Участници</string>
   <string name="invitations">Покани</string>
-  <string name="quest_leader_header" formatted="false">Започната от %s</string>
+  <string name="quest_leader_header">Започната от %s</string>
   <string name="quest_abort_message">Наистина ли искате да прекъснете мисията? Така тя ще приключи за всички в групата Ви и целият Ви напредък ще бъде изгубен. Свитъкът с мисията ще бъде върнат на собственика си.</string>
-  <string name="loading">Зареждане…</string>
-  <string name="reloading_content">Презареждане на съдържанието</string>
+    <string name="reloading_content">Презареждане на съдържанието</string>
   <string name="thousand_abbrev">хил.</string>
   <string name="million_abbrev">млн.</string>
   <string name="billion_abbrev">млд.</string>
-  <string name="your_balance">Вашите средства:</string>
-  <string name="available_until" formatted="false">Налично до %s</string>
-  <string name="gems_left_max" formatted="false">Месечни диаманти: остават %1$d/%2$d</string>
-  <string name="gems_left_nomax" formatted="false">Месечни диаманти: остават %d</string>
+    <string name="available_until">Налично до %s</string>
+  <string name="gems_left_max">Месечни диаманти: остават %1$d/%2$d</string>
+  <string name="gems_left_nomax">Месечни диаманти: остават %d</string>
   <string name="health">Здраве</string>
   <string name="collect">Събиране</string>
   <string name="rage_meter">Яростомер</string>
   <string name="boss_quest">Мисия с главатар</string>
   <string name="collection_quest">Мисия за събиране</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d точки опит</string>
-  <string name="gold_reward" formatted="false">%d злато</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d точки опит</string>
+  <string name="gold_reward">%d злато</string>
   <string name="quest_owner_rewards">Награди за собственика на мисията</string>
   <string name="str_abbrv">СИЛ</string>
   <string name="per_abbrv">УСЕ</string>
@@ -621,8 +496,7 @@
   <string name="reset_account_confirmation">нулиране на профила ми</string>
   <string name="delete_account_confirmation">изтриване на профила ми</string>
   <string name="danger_zone">Опасна зона</string>
-  <string name="nevermind">Няма значение</string>
-  <string name="resetting_account">Нулиране на профила</string>
+    <string name="resetting_account">Нулиране на профила</string>
   <string name="deleting_account">Изтриване на профила</string>
   <string name="insufficientGold">Трябва да изпълните още задачи, преди да можете да си позволите този предмет!</string>
   <string name="insufficientGems">Трябват Ви повече диаманти, за да купите този предмет!</string>
@@ -655,8 +529,7 @@
   <string name="authentication_summary">Промяна на настройките за удостоверяване.</string>
   <string name="change_password">Промяна на паролата</string>
   <string name="change_email">Промяна на е-пощата</string>
-  <string name="change_login_name">Промяна на потребителското име</string>
-  <string name="change_username">Промяна на потребителското име</string>
+    <string name="change_username">Промяна на потребителското име</string>
   <string name="change">Промяна</string>
   <string name="character_level">Ниво на героя</string>
   <string name="auto_allocate_points">Авт. разпределение на точките</string>
@@ -677,7 +550,7 @@
   <string name="distribute_class">Разпределяне според класа</string>
   <string name="distribute_task">Разпределяне според дейността по задачите</string>
   <string name="no_points_to_allocate">Няма точки за разпределяне</string>
-  <string name="points_to_allocate" formatted="false">%d точки за разпределяне</string>
+  <string name="points_to_allocate">%d точки за разпределяне</string>
   <string name="distribute_evenly_help">Задава един и същ брой точки на всеки показател.</string>
   <string name="distribute_class_help">Задава повече точки на показателите, които са важни за класа Ви.</string>
   <string name="distribute_task_help">Задава точки според силата, интелигентността, якостта и усета, свързани със задачите, които изпълнявате.</string>
@@ -687,9 +560,7 @@
   <string name="classless">Без клас</string>
   <string name="class_equipment_shop_dialog">Този предмет е предназначен само за определен клас.\nМожете да промените класа си от Настройките.</string>
   <string name="class_gear_disclaimer">Можете да купувате екипировка само за текущия си клас</string>
-  <string name="available_stats" formatted="false">%d точки</string>
-  <string name="toogle_emojis">Превкл. на емоджитата</string>
-  <string name="tavern_description">Добре дошли в Странноприемницата! Поседнете, за да си поговорим, или за да си починете от задачите.</string>
+    <string name="tavern_description">Добре дошли в Странноприемницата! Поседнете, за да си поговорим, или за да си починете от задачите.</string>
   <string name="check_into_inn">Влизане в странноприемницата</string>
   <string name="community_guidelines">Обществени правила</string>
   <string name="view_community_guidelines">Преглед на Обществените правила</string>
@@ -703,19 +574,13 @@
   <string name="navigation_drawer_open">Отваряне на менюто за преход</string>
   <string name="navigation_drawer_close">Затваряне на менюто за преход</string>
   <string name="world_boss">Световен главатар</string>
-  <string name="world_boss_art">Графика на главатаря</string>
-  <string name="boss_art">Графика на главатаря</string>
+    <string name="boss_art">Графика на главатаря</string>
   <string name="world_boss_description">Описание на световния главатар</string>
-  <string name="rage_strike_count" formatted="false">Яростни удари: %d/%d</string>
-  <string name="pending_strike_description">Този удар още не е бил изпълнен!\nСветовният главатар ще се нахвърли върху някой от нашите дружелюбни продавачи, когато лентата на яростта му се запълни. Изпълнявайте ежедневните си задачи, за да се опитате да предотвратите това!</string>
-  <string name="pending_strike_title">Изчакващ удар</string>
+  <string name="rage_strike_count">Яростни удари: %d/%d</string>
+    <string name="pending_strike_title">Изчакващ удар</string>
   <string name="strike_description_title">Какво е яростен удар?</string>
-  <string name="strike_description_subtitle">Има 3 възможни яростни удара</string>
-  <string name="strike_description_description">Този измервателен елемент се запълва, когато хабитиканците пропускат ежедневните си задачи. Ако се запълни докрай, Обезсърчителят ще отприщи своята атака, наречена „Сърцеразбиване“, върху някой от продавачите на Хабитика, така че не пропускайте да изпълнявате задачите си!</string>
-  <string name="pending_strike_subtitle">Този удар още не е бил изпълнен!</string>
-  <string name="strike_active_title" formatted="false">%s беше нападнат!</string>
-  <string name="strike_active_subtitle" formatted="false">%s получи Сърцеразбиване!</string>
-  <string name="strike_active_description" formatted="false">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
+    <string name="strike_active_title">%s беше нападнат!</string>
+    <string name="strike_active_description">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
   <string name="questShop">Магазинът за мисии</string>
   <string name="market_owner_long">Алекс Търговеца</string>
   <string name="tavern_owner_long">Даниел Кръчмаря</string>
@@ -725,33 +590,21 @@
   <string name="no_party_description">Изпълнявайте мисии заедно с приятели или самостоятелно. Бийте се с чудовища, създавайте предизвикателства и поддържайте отговорността си чрез групите.</string>
   <string name="no_party_title">Играйте Хабитика в група</string>
   <string name="join_party_description">Дайте потребителското си име (по-долу) на член на гилдия, за да може да Ви изпрати покана</string>
-  <string name="join_party_description_id">Дайте потребителския си идентификатор или покажете своя QR-код за поканата</string>
-  <string name="join_party_title">Искате ли да се присъедините към група?</string>
-  <string name="create_party_website">Отворете уеб сайта, за да създадете група</string>
-  <string name="id_copied">Идентификаторът е копиран</string>
-  <string name="insufficientSubscriberGems">Не можете да купите повече диаманти този месец. Ограничението се премахва през първите три дни на всеки месец. Благодарим Ви за абонамента!</string>
-  <string name="insufficientSubscriberGemsTitle">Достигнато е месечното ограничение на диамантите</string>
-  <string name="chat_message">Съобщение в чата</string>
-  <string name="world_boss_description_title">Какво е световен главатар?</string>
-  <string name="world_boss_description_description">Световният главатар е специално събитие, при което цялата общност работи заедно, за да победи могъщо чудовище, използвайки задачите си!
-\nЗавършете задачите си, за да нанесете щети на главатаря.
-\nГлаватарят няма да Ви нанесе щети за пропуснатите задачи, но яростомерът му ще се запълни. Ако лентата се запълни, главатарят ще нападне някой от продавачите!
-\nМожете да продължите с нормалните главатари от мисиите си, като щетите ще се прилагат и на двамата главатари.
-\nПогледнете в кръчмата, за да видите напредъка за главатаря и яростните удари</string>
-  <string name="world_boss_description_intro">Световният главатар е специално събитие, при което цялата общност работи заедно, за да победи могъщо чудовище, използвайки задачите си!</string>
+    <string name="join_party_title">Искате ли да се присъедините към група?</string>
+    <string name="insufficientSubscriberGems">Не можете да купите повече диаманти този месец. Ограничението се премахва през първите три дни на всеки месец. Благодарим Ви за абонамента!</string>
+    <string name="world_boss_description_title">Какво е световен главатар?</string>
+    <string name="world_boss_description_intro">Световният главатар е специално събитие, при което цялата общност работи заедно, за да победи могъщо чудовище, използвайки задачите си!</string>
   <string name="world_boss_description_1">Завършете задачите си, за да нанесете щети на главатаря</string>
   <string name="world_boss_description_2">Главатарят няма да Ви нанесе щети за пропуснатите задачи, но яростомерът му ще се запълни. Ако лентата се запълни, главатарят ще нападне някой от продавачите!</string>
   <string name="world_boss_description_3">Можете да продължите с нормалните главатари от мисиите си, като щетите ще се прилагат и на двамата главатари</string>
   <string name="world_boss_description_4">Погледнете в кръчмата, за да видите напредъка за главатаря и яростните удари</string>
-  <string name="world_boss_action_prompt" formatted="false">Победете главатаря, за да спечелите специални награди и да спасите Хабитика от ужаса на %s!</string>
-  <string name="world_boss_description_subtitle">%s атакува!</string>
-  <string name="questShop_owner_long">Иън Пазителят на Мисиите</string>
+  <string name="world_boss_action_prompt">Победете главатаря, за да спечелите специални награди и да спасите Хабитика от ужаса на %s!</string>
+    <string name="questShop_owner_long">Иън Пазителят на Мисиите</string>
   <string name="seasonalShop_owner_long">Сезонната магьосница</string>
   <string name="rage_attack">Яростна атака:</string>
   <string name="tavern_description_world_boss">Не обръщай внимание на чудовището по-долу – това все още е спокойно място за разговори по време на почивките Ви.</string>
   <string name="report">Докладване</string>
-  <string name="like">Харесва ми</string>
-  <string name="reply">Отговор</string>
+    <string name="reply">Отговор</string>
   <string name="challenge_prize">Награда за предизвикателството</string>
   <string name="challenge_categories">Категории за предизвикателството</string>
   <string name="created_challenge">Създадено предизвикателство</string>
@@ -785,17 +638,15 @@
   <string name="two_handed">За две ръце</string>
   <string name="usernamePromptTitle">Време е да си създадете потребителско име!</string>
   <string name="usernamePromptBody">Имената за вписване вече са уникални потребителски имена, които се виждат до екранните имена и се използват за покани, @споменавания в чата и за изпращане на съобщения.</string>
-  <string name="usernamePromptWiki">Ако искате да научите повече за тази промяна, посетете <a href="https://habitica.wikia.com/wiki/Player_Names">уикито ни</a></string>
-  <string name="confirmUsername">Потвърждаване на потребителското име</string>
-  <string name="usernamePromptDisclaimer">Потребителските имена трябва са съобразени с <a href="https://habitica.com/static/terms">Условията за ползване</a> и <a href="https://habitica.com/static/community-guidelines">Обществените правила</a>. Ако преди това не сте имали име за вписване, то потребителското Ви име е създадено автоматично.</string>
+  <string name="usernamePromptWiki">Ако искате да научите повече за тази промяна, посетете <a href="https://habitica.wikia_com/wiki/Player_Names">уикито ни</a></string>
+    <string name="usernamePromptDisclaimer">Потребителските имена трябва са съобразени с <a href="https://habitica.com/static/terms">Условията за ползване</a> и <a href="https://habitica_com/static/community-guidelines">Обществените правила</a>. Ако преди това не сте имали име за вписване, то потребителското Ви име е създадено автоматично.</string>
   <string name="confirm_username_title">Наистина ли искате да потвърдите текущото си потребителско име?</string>
   <string name="confirm_username_description">Ако потвърдите потребителското си име, то ще стане публично и ще може да се използва за покани, @споменавания и съобщения. Можете да промените потребителското си име по всяко време в настройките.</string>
   <string name="cancel">Отказ</string>
   <string name="confirm_username">Потвърждаване на потребителското име</string>
   <string name="username_not_confirmed">Потребителското име не е потвърдено</string>
   <string name="username_confirmed">Потребителското име е потвърдено</string>
-  <string name="username_level">\@%s ・Ниво %d</string>
-  <string name="enter_recipient_username">Въведете @ потребителското име на получателя</string>
+    <string name="enter_recipient_username">Въведете @ потребителското име на получателя</string>
   <string name="username_copied">Потребителското име е копирано</string>
   <string name="verification_pet">Един от тези любимци-ветерани ще Ви чака след като завършите потвърждението!</string>
   <string name="welcomeNameTitle">Как да Ви наричаме?</string>
diff --git a/Habitica/res/values-ca/strings.xml b/Habitica/res/values-ca/strings.xml
new file mode 100755
index 000000000..f76dc88e5
--- /dev/null
+++ b/Habitica/res/values-ca/strings.xml
@@ -0,0 +1,439 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Recarregar</string>
+  <string name="XP_default">Experiència</string>
+  <string name="HP_default">Salut</string>
+  <string name="MP_default">Mannà</string>
+  <string name="ERR_pb_barcode">No s\'han pogut carregar les preferències a partir de codi de barres</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Configuració</string>
+  <string name="SP_address_hint">El teu servidor personalitzat</string>
+  <string name="SP_userID_title">ID d\'usuari</string>
+  <string name="SP_userID_summary">El teu ID d\'usuari</string>
+  <string name="SP_APIToken_title">Token d\'API</string>
+  <string name="SP_APIToken_summary">El teu token d\'API</string>
+  <string name="Language_title">Idioma</string>
+  <string name="Language_summary">Canvia l\'idioma d\'Habitica</string>
+  <string name="SP_user_qr_code">El teu codi QR</string>
+  <string name="PS_contact_title">Contacta\'m</string>
+  <string name="pref_account_header">Compte</string>
+  <string name="pref_first_day_of_the_week_title">Primer dia de la setmana</string>
+  <string name="pref_first_day_of_the_week_summary">Primer dia de la setmana a tots els calendaris</string>
+  <string name="pref_reminder_header">Recordatori diari</string>
+  <string name="pref_reminder_checkbox">Activar recordatori</string>
+  <string name="pref_reminder_picker">Establir hora de recordatori</string>
+  <string name="pref_cds_header">Inici del dia personalitzat</string>
+  <string name="pref_cds_picker">Personalitza l\'hora d\'inici del dia</string>
+  <string name="pref_push_notifications_checkbox">Notificacions automàtiques d\'usuari</string>
+  <string name="push_notifications">Notificacions automàtiques</string>
+  <string name="push_notifications_sum">Configura les notificacions automàtiques</string>
+  <string name="preference_push_you_won_challenge">Has guanyat un Repte!</string>
+  <string name="preference_push_received_a_private_message">Has rebut un Missatge Privat</string>
+  <string name="preference_push_gifted_gems">Gemes Regalades</string>
+  <string name="preference_push_gifted_subscription">Subscripció Regalada</string>
+  <string name="preference_push_invited_to_party">Convidat a la Colla</string>
+  <string name="preference_push_invited_to_guild">Convidat al Gremi</string>
+  <string name="preference_push_your_quest_has_begun">La teva Missió ha començat</string>
+  <string name="preference_push_invited_to_quest">Convidat a una Missió</string>
+  <!--Adding tasks-->
+  <string name="task_value">Valor</string>
+  <string name="action_edit">Editar</string>
+  <string name="action_delete">Eliminar</string>
+  <string name="action_cancel">Cancelar</string>
+  <string name="login_btn">Iniciar sessió</string>
+  <string name="register_btn">Registrar-se</string>
+  <string name="username">Nom d\'usuari</string>
+  <string name="email_username">Correu electrònic o nom d\'usuari</string>
+  <string name="password">Contrasenya </string>
+  <string name="emailAddress">Correu electrònic</string>
+  <string name="confirmpassword">Confirmar contrasenya </string>
+  <string name="logout">Tancar sessió </string>
+  <string name="logout_description">Tanca la sessió del teu compte</string>
+  <string name="account_details">Detalls del compte</string>
+  <string name="LoginActivityName">Benvingut</string>
+  <string name="string_revive">Reviure</string>
+  <string name="please_connect">Si us plau connectat a través de la aplicació abans d\'utilitzar un widget</string>
+  <string name="about.title">Informació</string>
+  <string name="about.libraries">Biblioteca</string>
+  <string name="about.versionhistory">Historials de versions</string>
+  <string name="about.habitica_open_source">Habitica està disponible com a software de codi obert en Github</string>
+  <string name="about.rate_our_app">Califica la nostra aplicació</string>
+  <string name="about.give_us_feedback">Envia\'ns els teus comentaris!</string>
+  <string name="about.bugreport">Notificar un error</string>
+  <string name="about.source_code">Codi font</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Error de connexió </string>
+  <string name="network_error_no_network_body">No estàs connectat a internet.</string>
+  <string name="internal_error_api">Sembla que hi ha un problema amb el servidor. Torna-ho a intentar més tard.</string>
+  <string name="authentication_error_title">Error d\'autenticació 
+</string>
+  <string name="authentication_error_body">El teu nom d\'usuari i/o contrasenya era incorrecte</string>
+  <string name="login_validation_error_title">Error de validació </string>
+  <string name="login_validation_error_fieldsmissing">Has d\'omplir tots els camps.</string>
+  <string name="save_changes">Guardar</string>
+  <string name="copy">Copiar</string>
+  <string name="notes">Notes</string>
+  <string name="text">Text</string>
+  <string name="difficulty">Dificultat</string>
+  <string name="tags">Etiquetes</string>
+  <string name="trivial">Trivial</string>
+  <string name="easy">Fàcil</string>
+  <string name="medium">Mitjana</string>
+  <string name="hard">Difícil</string>
+  <string name="start_date">Data d\'inici</string>
+  <string name="positive_habit_form">Positiu ( + )</string>
+  <string name="negative_habit_form">Negatiu ( - )</string>
+  <string name="checklist">Llistat</string>
+  <string name="reminders">Recordatoris</string>
+  <string name="actions">Accions</string>
+  <string name="attributes">Atributs</string>
+  <string name="frequency">Freqüència </string>
+  <string name="frequency_weekly">Certs dies de la setmana</string>
+  <string name="frequency_daily">Cada X dies </string>
+  <string name="monday">Dilluns</string>
+  <string name="tuesday">Dimarts</string>
+  <string name="wednesday">Dimecres</string>
+  <string name="thursday">Dijous</string>
+  <string name="friday">Divendres</string>
+  <string name="saturday">Dissabte</string>
+  <string name="sunday">Diumenge </string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">No desesperis!</string>
+  <string name="faint_header">T\'has quedat sense salut!</string>
+  <string name="faint_button">Reomplir la salut i intentar un altre cop</string>
+  <string name="filter">Filtrar</string>
+  <string name="profile_image">Imatge de perfil</string>
+  <string name="mana_price_button">%d PM</string>
+  <string name="used_skill">Has usat %1$s per %2$d de manà.</string>
+  <string name="used_skill_without_mana">Has emprat %1$s.</string>
+  <string name="new_checklist_item">Nou element de la llista</string>
+  <string name="add_checklist_item">Afegir</string>
+  <string name="skill_progress_title">Utilitzant l\'habilitat</string>
+  <string name="coming_soon">Pròximament </string>
+  <string name="chat_flag_confirmation">Estàs segur que vols denunciar aquest missatge per incomplir les normes?</string>
+  <string name="flag_confirm">Marcar missatge</string>
+  <string name="unlock_lvl_11">Es desbloqueja al nivell 11</string>
+  <string name="no_party_message">No estàs en un grup. Per unir-te a un grup, si us plau visita la pàgina web. </string>
+  <string name="forgot_pw_btn">M\'he oblidat de la contrasenya </string>
+  <string name="tavern.inn.checkOut">Reactiva les tasques diàries</string>
+  <string name="tavern.inn.rest">Pausa les tasques diàries</string>
+  <string name="reward.dialog.buy">Comprar</string>
+  <string name="reward.dialog.dismiss">Descartar</string>
+  <string name="party">Grup</string>
+  <string name="chat">Xat</string>
+  <string name="members">Membres</string>
+  <string name="habits">Hàbits </string>
+  <string name="dailies">Tasques diàries</string>
+  <string name="todos">Tasques pendents</string>
+  <string name="rewards">Recompenses </string>
+  <string name="taskform.delete.title">Estàs segur?</string>
+  <string name="taskform.delete.message">Segur que vols esborrar-ho?</string>
+  <string name="yes">Sí</string>
+  <string name="no">No</string>
+  <string name="quest">Missió</string>
+  <string name="avatar_body">Cos</string>
+  <string name="avatar_hair">Cabell </string>
+  <string name="avatar_shirt">Samarreta</string>
+  <string name="avatar_skin">Pell</string>
+  <string name="avatar_ears">Orelles d\'animals</string>
+  <string name="avatar_base">Base</string>
+  <string name="avatar_color">Color</string>
+  <string name="avatar_beard">Barba</string>
+  <string name="avatar_mustache">Bigoti </string>
+  <string name="avatar_flower">Flor</string>
+  <string name="avatar_bangs">Serrells</string>
+  <string name="avatar_nothing">Res seleccionat</string>
+  <string name="avatar_size">Mida</string>
+  <string name="avatar_size_slim">Prim</string>
+  <string name="avatar_size_broad">Ample</string>
+  <string name="avatar_background">Fons</string>
+  <string name="purchase_customization">Comprar personalització</string>
+  <string name="purchase_set_button">Desbloquejar el conjunt per %d gemmes</string>
+  <string name="purchase_button">Comprar</string>
+  <string name="purchase_set_title">Comprar el conjunt %s</string>
+  <string name="due_date">Data límit</string>
+  <string name="quest.accept">Acceptar</string>
+  <string name="quest.reject">Rebutjar</string>
+  <string name="quest.begin">Començar Missió</string>
+  <string name="quest.cancel">Cancel·lar Invitació </string>
+  <string name="quest.abort">Avortar Missió</string>
+  <string name="quest.leave">Abandonar Missió</string>
+  <string name="quest.pending">Pendent</string>
+  <string name="quest.accepted">Acceptat</string>
+  <string name="quest.rejected">Rebutjat</string>
+  <string name="quest.participants">Participants</string>
+  <string name="version_info">Versió %1$s (%2$d)</string>
+  <string name="sidebar_help">Ajuda &amp; FAQ</string>
+  <string name="complete_tutorial">D\'acord!</string>
+  <string name="dismiss_tutorial">Recorda\'m altre cop</string>
+  <string name="intro_3_description">No perdis de vista els teus objectius amb l\'ajuda dels teus amics. Doneu-vos suport mutu en la vida i en la batalla mentre milloreu junts!</string>
+  <string name="previous_button">Anterior</string>
+  <string name="next_button">Següent</string>
+  <string name="skip_button">Saltar </string>
+  <string name="setup_welcome_description">Benvingut a Habitica, on avançar en el joc millorarà la teva vida real! Mentre aconsegueixes objectius del món real, desbloquejaràs equipament, mascotes, missions i més.</string>
+  <string name="setup_welcome_title">Benvingut </string>
+  <string name="setup_group_work">Feina</string>
+  <string name="setup_group_exercise">Exercici </string>
+  <string name="setup_group_school">Escola </string>
+  <string name="setup_group_teams">Equips</string>
+  <string name="setup_group_chores">Tasques</string>
+  <string name="setup_group_creativity">Creativitat </string>
+  <string name="setup_task_work_1">Processar correu</string>
+  <string name="setup_task_work_2">Tasca més important</string>
+  <string name="setup_task_work_3">Projecte profesional </string>
+  <string name="setup_task_exercise_1">10 minuts d\'exercici</string>
+  <string name="setup_task_exercise_2">Estirar</string>
+  <string name="setup_task_exercise_3">Fer un plan d\'entrenament</string>
+  <string name="setup_task_healthWellness_1">Menjar sa/ menjar escombraria</string>
+  <string name="setup_task_healthWellness_2">Usar fil dental</string>
+  <string name="setup_task_healthWellness_3">Planificar reunió </string>
+  <string name="setup_task_school_1">Estudiar/Procrastinar </string>
+  <string name="setup_task_school_2">Fer deures</string>
+  <string name="setup_task_school_3">Acabar treball per la classe</string>
+  <string name="setup_task_teams_1">Quedar amb el grup </string>
+  <string name="setup_task_teams_2">Posar al dia l\'equip</string>
+  <string name="setup_task_teams_3">Completar un projecte en equip</string>
+  <string name="setup_task_chores_1">Netejar durant 10 minuts</string>
+  <string name="setup_task_chores_2">Rentar els plats</string>
+  <string name="setup_task_chores_3">Organitzar l\'armari</string>
+  <string name="setup_task_creativity_1">Estudiar fins a dominar la tècnica </string>
+  <string name="setup_task_creativity_2">Treballar en projecte creatiu</string>
+  <string name="setup_task_creativity_3">Acabar projecte creatiu</string>
+  <string name="gem.purchase.support">Vols ajudar-nos a mantenir Habitica funcionant? Pots donar suport als desenvolupadors comprant gemmes! \n\nLes Gemmes et permeten comprar articles addicionals pel teu compte, incloent: \n\n - Fantàstics vestits per el teu personatge\n - Increïbles fons\n - Divertides missions que et recompensen amb mascotes\n - L\'habilitat de canviar de classe abans del nivell 100\n\nMoltes gràcies per ajudar-nos a fer Habitica el millor possible. El teu suport significa molt per nosaltres!</string>
+  <string name="my_guilds">Els meus Gremis</string>
+  <string name="public_guilds">Gremis Publics</string>
+  <string name="guild">Gremi</string>
+  <string name="leave">Abandonar</string>
+  <string name="join">Unir-se</string>
+  <string name="leader">Líder</string>
+  <string name="gems">Gemmes</string>
+  <string name="send_pm">Envia PM</string>
+  <string name="flag">Marcar</string>
+  <string name="delete">Eliminar</string>
+  <string name="name">Nom</string>
+  <string name="description">Descripció</string>
+  <string name="privacy">Privacitat</string>
+  <string name="write_message">Escriu Missatge</string>
+  <string name="post">Publica</string>
+  <string name="guild_search_hint">Cercar Gremis</string>
+  <string name="todo_due">Caduca: %s</string>
+  <string name="daily_streak">ratxa actual: %d</string>
+  <string name="todo_has_duedate">La tasca te data de caducitat</string>
+  <string name="battle_gear">Roba de batalla</string>
+  <string name="costume">Vestit</string>
+  <string name="outfit_head">Cap</string>
+  <string name="outfit_headAccessory">Accessori per al cap</string>
+  <string name="outfit_eyewear">Ulleres</string>
+  <string name="outfit_armor">Armadura</string>
+  <string name="outfit_back">Esquena</string>
+  <string name="outfit_body">Cos</string>
+  <string name="outfit_shield">Escut</string>
+  <string name="outfit_weapon">Arma</string>
+  <string name="wear_costume">Disfressa\'t</string>
+  <string name="equipped">Equipat</string>
+  <string name="quest_cancel_message">Estàs segur que vols cancel·lar aquesta missió? No es recuperarà cap invitació acceptada. El propietari de la Missió mantindrà el rotlle de la Missió.</string>
+  <string name="quest.invitation">Invitació a una missió</string>
+  <string name="quest.invitation.text">T\'han invitat a participar en una missió!</string>
+  <string name="today">Avui</string>
+  <string name="sidebar_items">Objectes</string>
+  <string name="eggs">Ous</string>
+  <string name="hatching_potions">Pocions d\'eclosió</string>
+  <string name="food">Menjar</string>
+  <string name="quests">Missions</string>
+  <string name="pets">Mascotes</string>
+  <string name="mounts">Montures</string>
+  <string name="armoireEquipment">Has trobat una peça d\'equipament rar a l\'Armari: %s! Genial!</string>
+  <string name="armoireFood">Rebusques a l\'Armari i trobes %1$s %2$s. Què fa això aquí?</string>
+  <string name="armoireExp">Et baralles amb l\'Armari i ganes experiència. Va!</string>
+  <string name="armoireNotesFull">Obre l\'armari per rebre equipament especial, experiència o menjar! Peces d\'equipament restants: %d</string>
+  <string name="armoireLastItem">Has trobat l\'última peça d\'equipament rar a l\'armari encantat.</string>
+  <string name="armoireNotesEmpty">L\'armari tindrà equipament nou a la primera setmana de cada mes. Fins aleshores, segueix fent clic per experiència i menjar!</string>
+  <string name="sell">Ven (%d Or)</string>
+  <string name="hatch_with_potion">Eclosione-ho amb una poció</string>
+  <string name="feed_to_pet">Alimenta la mascota</string>
+  <string name="hatch_egg">Eclosione-ho amb un ou</string>
+  <string name="invite_party">Invitar grup</string>
+  <string name="dialog_feeding">Alimenta el %1$s %2$s amb:</string>
+  <string name="use_animal">Utilitzar</string>
+  <string name="feed">Alimenta</string>
+  <string name="hatch_with">Fer sortir mascota de l\'ou amb %s</string>
+  <string name="hatched_pet_title">Has fet sortir de l\'ou a un %1$s %2$s!</string>
+  <string name="close">Tanca</string>
+  <string name="share">Comparteix</string>
+  <string name="notification_pet_fed">Has alimentat el teu %1$s %2$s!</string>
+  <string name="world_quest">Missió Mundial</string>
+  <string name="empty_items">No tens cap %s</string>
+  <string name="user_level">Nivell %d</string>
+  <string name="user_level_with_class">Nivell %1$d %2$s</string>
+  <string name="warrior">Guerrer</string>
+  <string name="rogue">Murri</string>
+  <string name="mage">Mag</string>
+  <string name="healer">Curador</string>
+  <string name="mage_description">Els mags aprenen ràpidament, guanyant experiència i nivells més ràpid que altres classes.. També aconsegueixen una gran quantitat de mannà utilitzant habilitats especials. Juga aom a mag si gaudeixes els aspectes de joc tàctics de l\'Hàbit, o si estàs fortament motivat per pujar de nivell i desbloquejar característiques avançades!</string>
+  <string name="rogue_description">Els murris estimen acumular diners, guanyant més or que qualsevol altre, i se\'ls dóna bé trobar objectes aleatoris. La seva icònica habilitat de sigil els permet evitar les conseqüències de  les tasques diàries fallades. Juga com a murri si trobes motivació forta als premis i als assoliments, esforçant-te pel botí i les insígnies!</string>
+  <string name="healer_description">Els curadors són resistents al dany, i extenen aquella protecció a altres. Les tasques diàries fallades i els mals hàbits no els molesten massa, i tenen maneres de recuperar salut del fracàs. Juga com a curador si gaudeixes ajudant a altres al teu grup, o si la idea de burlar la Mort amb treball dur t\'inspira!</string>
+  <string name="select_class">Selecciona Classe</string>
+  <string name="opt_out_class">No optar per res</string>
+  <string name="opt_out_description">No t\'identifiques amb cap classe? Vols escollir més tard? Pots no optar res - seràs un guerrer sense habilitats especials. Pots llegir sobre el sistema de classes més tard a la wiki i activar-les a qualsevol moment.</string>
+  <string name="class_confirmation">Segur que vols ser un %s?</string>
+  <string name="class_changed">Ara ets un %s!</string>
+  <string name="class_changed_description">Tens un nou Equip de Batalla per defecte que pots canviar a Equipament.</string>
+  <string name="choose_class">Escull la classe</string>
+  <string name="dialog_go_back">Torna enrere</string>
+  <string name="opt_out_confirmation">Estàs segur que no vols optar per res?</string>
+  <string name="change_class">Canvia de classe</string>
+  <string name="enable_class">Activar sistema de classes</string>
+  <string name="changing_class_progress">Canviar de classe</string>
+  <string name="by_email">per Email</string>
+  <string name="invite_existing_users">Invita usuaris existents</string>
+  <string name="send">Envia</string>
+  <string name="invite">Invita amics</string>
+  <string name="invite_id_description">Si tens amics que ja utilitzen Habitica, invita\'ls amb la ID d\'usuari aquí.</string>
+  <string name="invite_email_description">Si un amic es registra a Habitica a través del teu email, seran invitats a la teva colla automàticament!</string>
+  <string name="add_invites">Afegir invitacions</string>
+  <string name="user_id">ID d\'usuari</string>
+  <string name="email">Correu electrònic</string>
+  <string name="invite_users">Invita a la colla</string>
+  <string name="share_using">Compartir ús</string>
+  <string name="share_levelup">He arribat al nivell %d a Habitica millorant els meus hàbits de la vida real!</string>
+  <string name="share_hatched">He fet sortir de l\'ou a una mascota %1$s %2$s  a Habitica completant les meves tasques de la vida real!</string>
+  <string name="share_raised">Acabo de guanyar una muntura %1$s %2$s a Habitica completant les meves tasques de la vida real!</string>
+  <string name="open_in_store">Obrir a la play store</string>
+  <string name="change_class_confirmation">Estàs segur que vols canviar de classe? Això et costarà 3 gemmes.</string>
+  <string name="change_class_equipment_warning">Advertència: Ja no podràs comprar més equip per a la classe %s.</string>
+  <string name="leaderMessage">Missatge de %1$s</string>
+  <string name="leaderName">Líder: %1$s</string>
+  <string name="confirm">Confirmar</string>
+  <string name="market">Mercat</string>
+  <string name="timeTravelers">Viatgers del Temps</string>
+  <string name="seasonalShop">Botiga Estacional</string>
+  <string name="party_invite">Desbloquejar convidant a amics</string>
+  <string name="no_gold">No tens suficient or</string>
+  <string name="no_potion">No necessites comprar una poció de salut</string>
+  <string name="purchase_confirmation_title">Comfirmar compra</string>
+  <string name="confirm_purchase_text">Comprar %1$s per %2$s %3$s</string>
+  <string name="gem">gemma</string>
+  <string name="hourglass">rellotge de sorra</string>
+  <string name="hourglasses">rellotges de sorra</string>
+  <string name="gold_singular">or</string>
+  <string name="gold_plural">or</string>
+  <string name="chat_message_copied">Missatge copiat al porta-retalls</string>
+  <string name="copy_chat_message">Copiar al porta-retalls</string>
+  <string name="edit_tag_title">Modificar etiqueta</string>
+  <string name="edit_tag_btn_edit">Editar</string>
+  <string name="edit_tag_btn_done">Fet</string>
+  <string name="edit_tag_btn_delete">Esborrar</string>
+  <string name="confirm_delete_tag_title">Estàs segur?</string>
+  <string name="confirm_delete_tag_message">Segur que vols esborrar-ho?</string>
+  <string name="filter_drawer_edit_tags">Modificar etiquetes</string>
+  <string name="filter_drawer_filter_tags">Filtrar per etiquetes</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Fes que et convidin amb aquest codi QR</string>
+  <string name="qr_save_message">Codi QR guardat a</string>
+  <string name="qr_dialogue_title">El teu codi QR</string>
+  <string name="download">Descarrega</string>
+  <string name="send_new_message">Envia un nou missatge</string>
+  <string name="choose_recipient_title">Escull el receptor del missatge</string>
+  <string name="action_continue">Continua</string>
+  <string name="scan_qr_code">Escaneja el codi QR</string>
+  <string name="enter_recipient_uuid">Escriu l\'ID d\'usuari del receptor</string>
+  <string name="invited_to_party">T\'han convidat a unir-te a una colla!</string>
+  <string name="stats_widget_label">Estadístiques d\'Habitica</string>
+  <string name="add_task">Afegir Tasca</string>
+  <string name="add_habit">Afegir Hàbit</string>
+  <string name="add_daily">Afegir Tasca Diària</string>
+  <string name="add_todo">Afegir Tasca Pendent</string>
+  <string name="add_reward">Afegir Recompensa</string>
+  <string name="all_dailies_completed">Has completat totes les teves tasques diàries. Ben fet!</string>
+  <string name="widget_habit_button">Habitica Marca l\'Hàbit</string>
+  <string name="widget_dailies">Habitica Tasques Diaries</string>
+  <string name="widget_add_task">Habitica Afegir Tasca</string>
+  <string name="google_services_missing">No s\'han trobat els serveis de Google Play.</string>
+  <string name="gem.purchase.toolbartitle">Comprar</string>
+  <string name="gem.purchase.title">Comprar gemmes dóna suport als desenvolupadors i ajuda a que Habitica segueixi funcionant</string>
+  <string name="gem.purchase.subtitle">Les gemmes et permeten comprar divertits extres per al teu compte, entre ells:</string>
+  <string name="gem.purchase.listitem1">Peces de roba genials per al teu avatar</string>
+  <string name="gem.purchase.listitem2">Fons increïbles</string>
+  <string name="gem.purchase.listitem3">Missions que et recompensen amb ous de mascota</string>
+  <string name="gem.purchase.listitem4">L\'habilitat de canviar de classe abans d\'arribar a nivell 100</string>
+  <string name="support_habitica">Dóna el teu suport a Habitica</string>
+  <string name="skill_transformation_use">utilizar</string>
+  <string name="hatching_market_info">No et toca el que busques? Mira al Mercat!</string>
+  <string name="feeding_market_info">Necessites menjars diferents? Compra\'n més al Mercat!</string>
+  <string name="open_market">Mercat Obert</string>
+  <string name="cds_description">Les teves Tasques Diaries es reiniciaràn la primera vegada que empris Habitica després de %1$s. Assegura\'t de tenir-les completades abans!</string>
+  <string name="AudioTheme_title">Tema d\'audio</string>
+  <string name="AudioTheme_summary">Canvia el tema d\'audio d\'Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Fins demà!</string>
+  <string name="belongs_to_challenge">Pertany a un Repte</string>
+  <string name="has_reminder">Té un Recordatori</string>
+  <string name="has_tag">Té una Etiqueta</string>
+  <string name="subscribe.title">Si et subscrius dones suport als desenvolupadors i ajudes a que Habitica segueixi funcionant</string>
+  <string name="subscribe_prompt">Fes-te subscriptor i tendràs aquests útils beneficis:</string>
+  <string name="subscribe.listitem1">Comprar gemmes amb or</string>
+  <string name="subscribe.listitem2">Objectes mensuals exclusius</string>
+  <string name="subscribe.listitem3">Manteniment d\'entrades d\'historial adicionals</string>
+  <string name="subscribe.listitem4">Màxim de troballes diaries duplicat</string>
+  <string name="subscriptions">Subscripcions</string>
+  <string name="subscription_duration">Es repeteix cada %s </string>
+  <string name="subscribe">Subscriu-te</string>
+  <string name="subscribe.listitem1.description">Ara, Alex el comerciant et vendrà gemmes per 20 ors cada una!\n\nEls seus enviaments mensuals tenen un màxim inicial de 25 Gemmes per mes, però això pot augmentar en funció de la duració de la teva subscripció.\n\nEl màxim s\'incrementa 5 gemmes per cada tres mesos de subscripció consecutiva, fins a un màxim de 50 gemmes per mes!</string>
+  <string name="subscribe.listitem2.description">Cada mes rebràs un objecte decoratiu únic per al teu avatar!\n\nA més, per cada tres mesos consecutius de subscripció, els Misteriosos Viatgers del Temps et donaràn access a objectes decoratius històrics (o futuristes!).</string>
+  <string name="subscribe.listitem3.description">Fa que l\'historial de Tasques Pendents i tasques estigui disponible per més temps.</string>
+  <string name="subscribe.listitem4.description">Duplicar el màxim de troballes et permetrà rebre més objectes cada dia per part de les teves tasques completades, ajudant-te a completar el teu estable més ràpidament.</string>
+  <string name="subscription_hourglasses">+%d Rellotge Místic</string>
+  <string name="payment_method">Mètode de pagament</string>
+  <string name="subscription">Subscripció</string>
+  <string name="active">Activa</string>
+  <string name="cancel_subscription">Cancel·la la subscripció</string>
+  <string name="cancel_subscription_google.description">No vols ser més subscriptor? Pots trobar la opció per a desubscriure\'t a la secció \"Les meves aplicación\" de la Tenda de Google Play.</string>
+  <string name="cancel_subscription_notgoogle.description">No vols ser més subscriptor? Degut al teu mètode de pagament, només et pots desubsciure a través de la pàgina web. Clica al botó d\'aquí sota per a obrir la pàgina al teu navegador!</string>
+  <string name="visit_habitica_website">Visita la web d\'Habitica</string>
+  <string name="current_bonuses">Bonus actuals</string>
+  <string name="months_subscribed">Mesos que portes subscrit</string>
+  <string name="current_hourclasses">Rellotges Místics actuals</string>
+  <string name="monthly_gem_cap">Màxim de gemmes mensual</string>
+  <string name="inactive">Inactiva</string>
+  <string name="one_month">1 mes</string>
+  <string name="months">%d mesos</string>
+  <string name="month">mes</string>
+  <string name="three_months">3 mesos</string>
+  <string name="six_months">6 mesos</string>
+  <string name="twelve_months">12 mesos</string>
+  <string name="subscribe_prompt_thanks">Estàs rebent aquests útils beneficis per haver-te subscrit:</string>
+  <string name="subscription_status">Estat de la subscripció</string>
+  <string name="byLeader">per %s </string>
+  <string name="challenge_details">Detalls del Repte</string>
+  <string name="challenge_leave_title">Abandonar Repte</string>
+  <string name="challenge_leave_text">Estàs segur que vols deixar el Repte \"%s\"?</string>
+  <string name="my_challenges">Els meus Reptes</string>
+  <string name="public_challenges">Públic</string>
+  <string name="challenges">Reptes</string>
+  <string name="daily">Tasca Diària</string>
+  <string name="habit">Hàbit</string>
+  <string name="reward">Recompensa</string>
+  <string name="todo">Tasca Pendent</string>
+  <string name="official">Oficial</string>
+  <string name="participating">Participant</string>
+  <string name="challenge">Repte</string>
+  <string name="go_to_challenge">Ves al Repte</string>
+  <string name="not_part_of_a_challenge">Ara mateix no formes part de cap Repte!</string>
+  <string name="join_a_challenge">Uneix-te a un Repte per a afegir un selecte grup de tasques a la teva llista, i després competeix contra altres Habiticans per a guanyar fites i, fins i tot, gemmes!</string>
+  <string name="check_the_public_challenge_tab">Ves a la pestanya \"Públic\" per a trobar els Reptes, creats per usuàris, que s\'adapten millor a tu!</string>
+  <string name="add_reminder">Afegeix un Recordatori</string>
+  <string name="warning">Advertència</string>
+  <string name="open_settings">Obre la Configuració</string>
+  <string name="dont_keep_activities_warning">Sembla que tens l\'opció de desenvolupador \\"No mantenir Activitats\\" activada. Actualment, aquesta opció causa problemes amb l\'applicació d\'habitica, així que et suggerim que la desactivis.</string>
+  <string name="FAQ">Preguntes Freqüents</string>
+  <string name="special">Especial</string>
+  <string name="gem_for_gold_description">Com que estàs subscrit a Habitica, pots comprar un cert nombre de Gemmes cada mes emprant Or.</string>
+  <string name="limited_count">queden %d</string>
+  <string name="gem_shop">Gemma</string>
+  <string name="mystery_item">Objecte Misteriós</string>
+  <string name="myster_item_notes">Cada mes, els subscriptors rebràn un objecte misteriós. Normalment es publica una setmana abans de la fi del mes. </string>
+  <string name="open">Obrir</string>
+  <string name="notification_mystery_item">Obres la capsa i hi trobes %s!</string>
+  <string name="checkInRewardEarned">Has guanyat un/a %1$s com a recompensa per a la teva devoció per millorar la teva vida.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">El pròxim premi es desbloquejarà d\'aquí a %1$d inicis de sessió</string>
+</resources>
diff --git a/Habitica/res/values-cs/strings.xml b/Habitica/res/values-cs/strings.xml
new file mode 100755
index 000000000..24d2c2c32
--- /dev/null
+++ b/Habitica/res/values-cs/strings.xml
@@ -0,0 +1,523 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Obnovit</string>
+  <string name="XP_default">Zkušenosti</string>
+  <string name="HP_default">Zdraví</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Preference nebylo možné načíst z čárového kódu.</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Nastavení</string>
+  <string name="SP_address_hint">Vlastní server</string>
+  <string name="SP_userID_title">Uživatelské ID</string>
+  <string name="SP_userID_summary">Tvoje uživatelské ID</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Tvůj API Token</string>
+  <string name="Language_title">Jazyk</string>
+  <string name="Language_summary">Změnit jazyk Habitici</string>
+  <string name="SP_user_qr_code">Tvůj QR kód</string>
+  <string name="PS_contact_title">Kontaktovat mě</string>
+  <string name="unknown_error">Došlo k chybě...</string>
+  <string name="pref_account_header">Účet</string>
+  <string name="pref_first_day_of_the_week_title">První den v týdnu</string>
+  <string name="pref_first_day_of_the_week_summary">První den v týdnu ve všech kalendářích</string>
+  <string name="pref_reminder_header">Denní připomínka</string>
+  <string name="pref_reminder_checkbox">Aktivovat připomínku</string>
+  <string name="pref_reminder_picker">Nastavit čas připomínky</string>
+  <string name="pref_cds_header">Vlastní začátek dne</string>
+  <string name="pref_cds_picker">Nastavit vlastní začátek dne</string>
+  <string name="pref_push_notifications_checkbox">Uživatelské oznámení</string>
+  <string name="push_notifications">Oznámen</string>
+  <string name="push_notifications_sum">Nastav si notifikace</string>
+  <string name="preference_push_you_won_challenge">Vyhrál jsi výzvu!</string>
+  <string name="preference_push_received_a_private_message">Přijata osobní zpráva</string>
+  <string name="preference_push_gifted_gems">Darované diamanty</string>
+  <string name="preference_push_gifted_subscription">Darované předpatné</string>
+  <string name="preference_push_invited_to_party">Pozván do skupiny</string>
+  <string name="preference_push_invited_to_guild">Pozván do gildy</string>
+  <string name="preference_push_your_quest_has_begun">Tvoje výprava začala</string>
+  <string name="preference_push_invited_to_quest">Pozván na výpravu</string>
+  <!--Adding tasks-->
+  <string name="task_value">Hodnota</string>
+  <string name="new_todo">Nový úkol</string>
+  <string name="new_reward">Nová odměna</string>
+  <string name="new_daily">Nový denní úkol</string>
+  <string name="new_habit">Nový zvyk</string>
+  <string name="action_edit">Upravit</string>
+  <string name="action_delete">Smazat</string>
+  <string name="action_cancel">Zrušit</string>
+  <string name="login_btn">Přihlásit</string>
+  <string name="register_btn">Registrovat</string>
+  <string name="username">Uživatelské jméno</string>
+  <string name="email_username">Email nebo uživatelské jméno</string>
+  <string name="password">Heslo</string>
+  <string name="emailAddress">Emailová adresa</string>
+  <string name="confirmpassword">Heslo ještě jednou</string>
+  <string name="logout">Odhlásit</string>
+  <string name="logout_description">Odhlásit se z tvého účtu</string>
+  <string name="account_details">Detaily účtu</string>
+  <string name="LoginActivityName">Vítej</string>
+  <string name="string_revive">Oživit</string>
+  <string name="please_connect">Nejdříve se připoj v aplikaci, než použiješ widget.</string>
+  <string name="about.title">O nás</string>
+  <string name="about.libraries">Knihovny</string>
+  <string name="about.versionhistory">Historie verzí</string>
+  <string name="about.habitica_open_source">Habitica je dostupná jako open source software na Github</string>
+  <string name="about.rate_our_app">Ohodnoťte tuto aplikaci</string>
+  <string name="about.give_us_feedback">Napište nám svůj názor!</string>
+  <string name="about.bugreport">Ohlaste chybu</string>
+  <string name="about.source_code">Zdrojový kód</string>
+  <string name="repeatEvery">Opakovat každý</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Chyba připojení</string>
+  <string name="network_error_no_network_body">Nejste připojeni k internetu.</string>
+  <string name="internal_error_api">Objevil se problém se serverem. Zkuste to znovu později.</string>
+  <string name="authentication_error_title">Chyba přihlášení</string>
+  <string name="authentication_error_body">Vaše přihlašovací jméno a/nebo heslo jsou nesprávné.</string>
+  <string name="login_validation_error_title">Chyba ověření</string>
+  <string name="login_validation_error_fieldsmissing">Musíte vyplnit všechna pole.</string>
+  <string name="save_changes">Uložit</string>
+  <string name="copy">Zkopírovat</string>
+  <string name="notes">Poznámky</string>
+  <string name="text">Text</string>
+  <string name="difficulty">Obtížnost</string>
+  <string name="tags">Štítky</string>
+  <string name="trivial">Velmi lehké</string>
+  <string name="easy">Lehké</string>
+  <string name="medium">Středně těžké</string>
+  <string name="hard">Těžké</string>
+  <string name="start_date">Počáteční datum</string>
+  <string name="positive_habit_form">Kladné ( + )</string>
+  <string name="negative_habit_form">Záporné ( - )</string>
+  <string name="checklist">Seznam</string>
+  <string name="reminders">Připomínky</string>
+  <string name="actions">Akce</string>
+  <string name="attributes">Vlastnosti</string>
+  <string name="physical">Síla</string>
+  <string name="mental">Inteligence</string>
+  <string name="social">Obrana</string>
+  <string name="other">Vnímání</string>
+  <string name="frequency">Četnost</string>
+  <string name="frequency_weekly">Některé dny v týdnu</string>
+  <string name="frequency_daily">Každých X dní</string>
+  <string name="repeatables_summary_title">Shrnutí</string>
+  <string name="repeatables_title">Opakuje</string>
+  <string name="repeatables_on_title">Opakuje se</string>
+  <string name="repeatables_frequency_daily">Denně</string>
+  <string name="repeatables_frequency_weekly">Týdně</string>
+  <string name="repeatables_frequency_monthly">Měsíčně</string>
+  <string name="repeatables_frequency_yearly">Ročně</string>
+  <string name="repeatables_frequency_day_of_month">Den v měsíci</string>
+  <string name="repeatables_frequency_day_of_week">Den v týdnu</string>
+  <string name="monday">Pondělí</string>
+  <string name="tuesday">Úterý</string>
+  <string name="wednesday">Středa</string>
+  <string name="thursday">Čtvrtek</string>
+  <string name="friday">Pátek</string>
+  <string name="saturday">Sobota</string>
+  <string name="sunday">Neděle</string>
+  <string name="levelup_button">Jupí!</string>
+  <string name="faint_subtitle">Nezoufejte!</string>
+  <string name="faint_penalty_body">Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí--Ať se ti daří.</string>
+  <string name="faint_header">Došlo ti zdraví!</string>
+  <string name="faint_button">Doplnit zdraví &amp; a zkusit to znovu</string>
+  <string name="filter">Filtr</string>
+  <string name="profile_image">Profilový obrázek</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Použil/a jsi %1$s za %2$d many.</string>
+  <string name="used_skill_without_mana">použil jsi %1$s.</string>
+  <string name="new_checklist_item">nová položka v seznamu</string>
+  <string name="add_checklist_item">Přidat</string>
+  <string name="reminder_title">Nezapomeň si zkontrolovat svoje úkoly</string>
+  <string name="skill_progress_title">Použití Dovednosti</string>
+  <string name="coming_soon">Již Brzy</string>
+  <string name="chat_flag_confirmation">Jste si jisti, že chcete nahlásit tuto zprávu pro porušení pravidel?</string>
+  <string name="flag_confirm">Nahlásit zprávu</string>
+  <string name="unlock_lvl_11">Odemknutí na úrovni 11</string>
+  <string name="no_party_message">Nejsi ve skupině. Pro přidání se do skupiny, prosím, navštiv webovou stránku.</string>
+  <string name="forgot_pw_btn">Zapomenuté heslo</string>
+  <string name="tavern.inn.checkOut">Odejít z hostince</string>
+  <string name="tavern.inn.rest">Odpočinout si od tvých povinností</string>
+  <string name="reward.dialog.buy">Koupit</string>
+  <string name="reward.dialog.dismiss">Opustit</string>
+  <string name="party">Skupina</string>
+  <string name="chat">Chat</string>
+  <string name="members">Členové</string>
+  <string name="habits">Zvyky</string>
+  <string name="dailies">Každodenní</string>
+  <string name="todos">Úkoly</string>
+  <string name="rewards">Odměny</string>
+  <string name="taskform.delete.title">Určitě?</string>
+  <string name="taskform.delete.message">Určitě smazat?</string>
+  <string name="yes">Ano</string>
+  <string name="no">Ne</string>
+  <string name="quest">Skupinový cíl</string>
+  <string name="avatar_body">Tělo</string>
+  <string name="avatar_hair">Vlasy</string>
+  <string name="avatar_shirt">Svršek</string>
+  <string name="avatar_skin">Kůže</string>
+  <string name="avatar_ears">Zvířecí uši</string>
+  <string name="avatar_base">Zadní</string>
+  <string name="avatar_color">Barva</string>
+  <string name="avatar_beard">Vousy</string>
+  <string name="avatar_mustache">Knír</string>
+  <string name="avatar_flower">Květina</string>
+  <string name="avatar_bangs">Přední</string>
+  <string name="avatar_nothing">Nic vybraného</string>
+  <string name="avatar_size">Velikost</string>
+  <string name="avatar_size_slim">Štíhlý</string>
+  <string name="avatar_size_broad">Široký</string>
+  <string name="avatar_background">Pozadí</string>
+  <string name="purchase_customization">Koupit úpravu</string>
+  <string name="purchase_set_button">Odemknutí za %d drahokamů</string>
+  <string name="purchase_button">Koupit</string>
+  <string name="purchase_set_title">Koupit sadu %s</string>
+  <string name="due_date">Termín do</string>
+  <string name="quest.accept">Příjmout</string>
+  <string name="quest.reject">Odmítnout</string>
+  <string name="quest.begin">Začít úkol</string>
+  <string name="quest.cancel">Zrušit pozvánku</string>
+  <string name="quest.abort">Vzdát úkol</string>
+  <string name="quest.leave">Opustit úkol</string>
+  <string name="quest.pending">Nevyřízené</string>
+  <string name="quest.accepted">Příjmuto</string>
+  <string name="quest.rejected">Odmítnuto</string>
+  <string name="quest.participants">Účastníci</string>
+  <string name="version_info">Verze %1$s (%2$d)</string>
+  <string name="sidebar_help">Pomoc &amp; FAQ</string>
+  <string name="complete_tutorial">Rozumím!</string>
+  <string name="dismiss_tutorial">Připomenout později</string>
+  <string name="intro_1_subtitle">Vítej v</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">Pokrok ve hře</string>
+  <string name="intro_2_title">Pokrok v životě</string>
+  <string name="intro_2_description">Odemkni herní prvky plněním svých reálných úkolů. Získej brnění, mazlíčky, a mnohem více jako odměny za dosažení svých cílů.</string>
+  <string name="intro_3_subtitle">Bojuj s nestvůrami</string>
+  <string name="intro_3_title">Najdi nové přátele</string>
+  <string name="intro_3_description">Mějte přehled o svých cílech s pomocí svých přátel. Podporujte se navzájem v životě i v boji a zlepšujte se společně!</string>
+  <string name="intro_finish_button">Pojďme začít!</string>
+  <string name="previous_button">Předchozí</string>
+  <string name="next_button">Další</string>
+  <string name="skip_button">Přeskočit</string>
+  <string name="setup_welcome_description">Vítejte v Habitice, kde postup ve hře zlepší Váš život! Dosažením cílů v reálném světě odemykejte brnění, mazlíčky, skupinové cíle a mnohem víc.</string>
+  <string name="setup_welcome_title">Vítej</string>
+  <string name="avatar_setup_description">Takže, jak by jsi chtěl vypadat? Neboj se, tohle můžeš později změnit.</string>
+  <string name="task_setup_description">Skvělé! Teď, na čem máš zájem pracovat po celou tuto cestu?</string>
+  <string name="setup_group_work">Práce</string>
+  <string name="setup_group_exercise">Cvičení</string>
+  <string name="setup_group_health">Zdraví</string>
+  <string name="setup_group_school">Škola</string>
+  <string name="setup_group_teams">Týmy</string>
+  <string name="setup_group_chores">Domácí práce</string>
+  <string name="setup_group_creativity">Kreativita</string>
+  <string name="setup_task_work_1">Zpracovat email</string>
+  <string name="setup_task_work_2">Nejdůležitější úkol</string>
+  <string name="setup_task_work_3">Pracovní projekt</string>
+  <string name="setup_task_exercise_1">10 minut kardia</string>
+  <string name="setup_task_exercise_2">Protahování</string>
+  <string name="setup_task_exercise_3">Vytvořit rozvrh cvičení</string>
+  <string name="setup_task_healthWellness_1">Jíst zdravě / nezdravě</string>
+  <string name="setup_task_healthWellness_2">Použít zubní nit</string>
+  <string name="setup_task_healthWellness_3">Objednat se na prohlídku</string>
+  <string name="setup_task_school_1">Učit se / Odkládat učení</string>
+  <string name="setup_task_school_2">Udělat domácí úkoly</string>
+  <string name="setup_task_school_3">Dodělat úlohu do školy</string>
+  <string name="setup_task_teams_1">Zkontrolovat průběh práce s týmem</string>
+  <string name="setup_task_teams_2">Informovat tým o průběhu</string>
+  <string name="setup_task_teams_3">Dokončit týmový projekt</string>
+  <string name="setup_task_chores_1">10 minut úklidu</string>
+  <string name="setup_task_chores_2">Umýt nádobí</string>
+  <string name="setup_task_chores_3">Uklidit skříň</string>
+  <string name="setup_task_creativity_1">Vypracovat předlohu</string>
+  <string name="setup_task_creativity_2">Pracovat na kreativním projektu</string>
+  <string name="setup_task_creativity_3">Dokončit kreativní projekt</string>
+  <string name="gem.purchase.support">Chceš pomoci udržet Habiticu v provozu? Můžeš podpořit vývojáře koupí drahokamů!\n\nDrahokamy ti umožňují kupovat zábavné doplňky, včetně: \n\n - Parádní kostýmy pro tvého avatara\n - Úžasná pozadí\n - Zábavné skupinové cíle, které tě odmění mazlíčky\n - Možnost změnit své zaměření před úrovní 100\n\nMockrát děkujeme, že pomáháte Habitice být co možná nejlepší. Tvá podpora pro nás hodně znamená!</string>
+  <string name="my_guilds">Moje cechy</string>
+  <string name="public_guilds">Veřejné cechy</string>
+  <string name="guild">Cech</string>
+  <string name="leave">Odejít</string>
+  <string name="join">Připojit se</string>
+  <string name="leader">Vůdce</string>
+  <string name="gems">Drahokamy</string>
+  <string name="copy_as_todo">Kopírovat jako Úkol</string>
+  <string name="send_pm">Poslat soukromou zprávu.</string>
+  <string name="flag">Vlajka</string>
+  <string name="delete">Smazat</string>
+  <string name="name">Jméno</string>
+  <string name="description">Popis</string>
+  <string name="add_tag">Přidat nový Štítek</string>
+  <string name="privacy">Soukromí</string>
+  <string name="write_message">Napsat zprávu.</string>
+  <string name="post">Zveřejnit</string>
+  <string name="guild_search_hint">Hledat gildy</string>
+  <string name="todo_due">Do: %s</string>
+  <string name="daily_streak">Momentální combo: %d</string>
+  <string name="todo_has_duedate">Úkol má termín </string>
+  <string name="battle_gear">Zbroj</string>
+  <string name="costume">Kostým</string>
+  <string name="outfit_head">Hlava</string>
+  <string name="outfit_headAccessory">Příslušenství na hlavu</string>
+  <string name="outfit_eyewear">Na oči</string>
+  <string name="outfit_armor">Brnění</string>
+  <string name="outfit_back">Záda</string>
+  <string name="outfit_body">Tělo</string>
+  <string name="outfit_shield">Štít</string>
+  <string name="outfit_weapon">Zbraň</string>
+  <string name="wear_costume">Obléct si kostým</string>
+  <string name="equipped">Nasazeno</string>
+  <string name="quest_cancel_message">Jsi si jistý že chceš tento úkol zrušit? Všechy příjmuté žádosti budou ztraceny. Majitel úkolu si ponechá jeho svitek.</string>
+  <string name="quest.invitation">Pozvánka k úkolu</string>
+  <string name="quest.invitation.text">Byl jsi pozván k účasti v úkolu</string>
+  <string name="ago_1day">Před 1 dnem</string>
+  <string name="ago_1Minute">Před 1 minutou</string>
+  <string name="ago_minutes">Před %dminutama</string>
+  <string name="ago_hours">Před %d hodinama</string>
+  <string name="ago_1hour">Před 1 hodinou</string>
+  <string name="today">Dnes</string>
+  <string name="sidebar_items">Předměty</string>
+  <string name="eggs">Vajíčka</string>
+  <string name="hatching_potions">Lektvary na vylíhnutí</string>
+  <string name="food">Jídlo</string>
+  <string name="quests">Úkoly</string>
+  <string name="pets">Mazlíčci</string>
+  <string name="mounts">Přepravní zvířata </string>
+  <string name="armoireEquipment">Našel jsi kousek vzácného vybavení v Airmoire: %s! Super!</string>
+  <string name="armoireFood">Prohrabeš Armoire a nalézáš %1$s %2$s. Co to tu dělá?</string>
+  <string name="armoireExp">Biješ se s Airmoire a získáváš zkušenosti. Vem si je!</string>
+  <string name="armoireNotesFull">Otevři Airmoire aby jsi dostal buď speciální vybavení, zkušenosti, nebo jídlo! Zbývá ti %d částí vybavení</string>
+  <string name="armoireLastItem">Našel jsi poslední kousek vzácného vybavení v čarovné Airmoire.</string>
+  <string name="armoireNotesEmpty">Airmoire bude mít každý první týden v měsíci nové vybavení. Do té doby, klikej a získávej zkušenosti a jídlo.</string>
+  <string name="sell">Prodat (%dZlata)</string>
+  <string name="hatch_with_potion">Vylíhnout pomocí lektvaru</string>
+  <string name="feed_to_pet">Nakrmit mazlíčka</string>
+  <string name="hatch_egg">Vylíhnout s vejcem</string>
+  <string name="invite_party">Pozvat skupinu</string>
+  <string name="dialog_feeding">Nakrmit %1$s %2$s:</string>
+  <string name="use_animal">Použít</string>
+  <string name="feed">Nakrmit</string>
+  <string name="hatch_with">Vylíhnou vejce s %s</string>
+  <string name="hatched_pet_title">Vylíhnulo se ti %1$s %2$s!</string>
+  <string name="close">Zavřít</string>
+  <string name="share">Sdílet</string>
+  <string name="notification_pet_fed">Nakrmil jsi své zvíře %1$s %2$s</string>
+  <string name="notification_purchase">Koupil jsi %s</string>
+  <string name="notification_purchase_reward">Koupil jsi odměnu</string>
+  <string name="sectionpets">Standardní</string>
+  <string name="sectionpremiumPets">Magický lektvar</string>
+  <string name="sectionquestPets">Výprava</string>
+  <string name="sectionspecialPets">Vzácný</string>
+  <string name="sectionmounts">Standardní</string>
+  <string name="sectionpremiumMounts">Magický lektvar</string>
+  <string name="sectionquestMounts">Výprava</string>
+  <string name="sectionspecialMounts">Vzácný</string>
+  <string name="world_quest">Celosvětový úkol</string>
+  <string name="inn_description">Potřebuješ pauzu? Přihlaš se do Danielovy krčmy pro pozastavení některých z těžších herních mechanismů Habitici:\n\n
+• Nesplněný denní úkol ti neublíží\n
+• Úkoly neztratí sérii úspěšnosti, nebo nezmění na barvě \n
+• Bosové ti neublíží za nesplněný denní úkol\n
+• Tvé zranění bosse nebo sběr předmětů pro výpravu zůstane pozdrženo do odhlášení</string>
+  <string name="empty_items">Nemáš žádné %s</string>
+  <string name="user_level">Úroveň %d</string>
+  <string name="user_level_with_class">Úroveň %1$d%2$s</string>
+  <string name="warrior">Bojovník </string>
+  <string name="rogue">Zloděj</string>
+  <string name="mage">Mág</string>
+  <string name="healer">Lékař</string>
+  <string name="mage_description">Mágové se učí rychle, získávají zkušenosti a úrovně rychleji než ostatní povolání. Také mají hodně Many na používání speciálních schopností. Hraj za mága jestli tě baví taktická stránka hry nebo jsi silně motivován zvyšováním úrovně a odemykání pokročilých funkcí.</string>
+  <string name="rogue_description">Zlodějové milují hromadit bohatství, získávají více peněz než kdokoli jiný a jsou adepti na nacházení náhodných věcí. Jejich ikonická schopnost tajnosti jim pomáhá vyhnout se následkům nespněných denních úkolů. Hraj za zloděje když nacházíš silnou motivaci v odměnách a úspěších, usilování o kořist a odznacích!</string>
+  <string name="healer_description">Lékaři stojí proti poškození a přenáší jejich ochranu na ostatní. Vynechané denní úkoly a špatné návyky je nějak nevytrhnou a mají vždy možnosti jak si obnovit zdraví ze selhání. Hraj za lékaře když tě baví pomáhat ostatním ve tvé družině nebo tě myšlenka obelstění smrti pomocí těžké práce inspiruje!</string>
+  <string name="select_class">Vybrat třìdu</string>
+  <string name="opt_out_class">Neúčastnit se</string>
+  <string name="opt_out_description">Nemůžeš být obtěžovám povoláním? chceš si vybrat později? Neúčastni se - bude bojovní bez žádných speciálních schopností. Můžeš si přečíst s systému povolání pozdějí na wiki a zapnout systém povolání kdykoli chceš</string>
+  <string name="class_confirmation">Opravdu chceš být %s?</string>
+  <string name="class_changed">Nyní jsi %s!</string>
+  <string name="class_changed_description">Máš novou výchozí Bojovou výzbroj, kterou si můžeš změnit ve Vybavení!</string>
+  <string name="choose_class">Vybrat třidu</string>
+  <string name="dialog_go_back">Jít zpět</string>
+  <string name="opt_out_confirmation">Jsi si jist, že se chceš neúčastnit?</string>
+  <string name="change_class">Změn svou třídu</string>
+  <string name="change_class_description">Změň své povolání a nahraď body vlastností za 3 drahokamy.</string>
+  <string name="enable_class">Povolit systém tříd</string>
+  <string name="changing_class_progress">Měním třídu</string>
+  <string name="by_email">Podle e-mailu</string>
+  <string name="invite_existing_users">Pozvat existující uživatele</string>
+  <string name="send">Odeslat</string>
+  <string name="invite">Pozvat přátele</string>
+  <string name="invite_id_description">Jestli máš přátele kteří již používají Habiticu, pozvi je pomocí uživatelského ID zde.</string>
+  <string name="invite_email_description">Když se přítel připojí k Habitice pomocí tvého e-mailu automaticky budou pozvání do tvé družiny!</string>
+  <string name="add_invites">Přidat pozvánky</string>
+  <string name="user_id">Uživatelské ID</string>
+  <string name="email">E-mail</string>
+  <string name="invite_users">Pozvat do družiny</string>
+  <string name="share_using">Sdílet pomocí</string>
+  <string name="share_levelup">Získal jsem úroveň %d v Habitice díky zlepšování mých zvyků v reálném životě!</string>
+  <string name="share_hatched">Zrovna jsem vylíhl mazlíčka, %1$s %2$s , v Habitice pomocí dělání mých úkolů v reálném životě. </string>
+  <string name="share_raised">Zrovna jsem získal zvíře k osedlání, %1$s %2$s , v Habitice pomocí dělání mých úkolů v reálném životě!</string>
+  <string name="open_in_store">Otevřít v obchodě Play</string>
+  <string name="change_class_confirmation">Jsi si jist, že chceš změnit povolání? Stojí to 3 diamanty.</string>
+  <string name="change_class_equipment_warning">Varování: Nadále si nebudeš moct koupit výbavu z %s povolání.</string>
+  <string name="leaderMessage">Zpráva od %1$s</string>
+  <string name="leaderName">Vůdce: %1$s</string>
+  <string name="confirm">Potvrdit</string>
+  <string name="market">Obchod</string>
+  <string name="timeTravelers">Cestovatelé časem</string>
+  <string name="seasonalShop">Sezóní obchod</string>
+  <string name="empty_inbox">Nemáš žádné zprávy. Můžeš poslat uživateli novou zprávu skrz jejich veřejné chatové zprávy!</string>
+  <string name="party_invite">Odemčít pomocí pozvání přátel</string>
+  <string name="login_incentive">Odemkni pravidelným přihlašováním se do appky Habitica</string>
+  <string name="create_account">Odemkni vytvořením účtu</string>
+  <string name="no_gold">Nemáš dostatek Zlata</string>
+  <string name="no_potion">Nepotřebuješ si koupit lektvar zdraví.</string>
+  <string name="successful_purchase">Koupeno %1$s</string>
+  <string name="purchase_confirmation_title">Potvrdit koupi</string>
+  <string name="confirm_purchase_text">Koupit %1$s za %2$s %3$s</string>
+  <string name="gem">Diamant</string>
+  <string name="hourglass">Přesýpací hodiny</string>
+  <string name="hourglasses">Přesýpací hodiny</string>
+  <string name="gold_singular">Zlato</string>
+  <string name="gold_plural">Zlato</string>
+  <string name="chat_message_copied">Zpráva zkopírována do schránky</string>
+  <string name="copy_chat_message">Zkopírovat do schránky</string>
+  <string name="edit_tag_title">Upravit štítek</string>
+  <string name="edit_tag_btn_edit">Upravit</string>
+  <string name="edit_tag_btn_done">Hotovo</string>
+  <string name="edit_tag_btn_delete">Smazat</string>
+  <string name="confirm_delete_tag_title">Jsi si jist?</string>
+  <string name="confirm_delete_tag_message">Opravdu to chceš vymazat?</string>
+  <string name="filter_drawer_edit_tags">Upravit štítky</string>
+  <string name="filter_drawer_filter_tags">Filtrovat pomocí štítků</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Ať tě někdo pozve pomocí tohoto QR kódu</string>
+  <string name="qr_save_message">GR kód uložen v</string>
+  <string name="qr_dialogue_title">Tvůj QR kód</string>
+  <string name="download">Stáhnout</string>
+  <string name="send_new_message">Odeslat novou zprávu</string>
+  <string name="choose_recipient_title">Vyber příjemce zprávy</string>
+  <string name="action_continue">Pokračovat</string>
+  <string name="scan_qr_code">Skenovat QR kód</string>
+  <string name="enter_recipient_uuid">Zadej uživatelské ID příjemce</string>
+  <string name="invited_to_party">Byl si pozván k družině!</string>
+  <string name="stats_widget_label">Habitica statistiky</string>
+  <string name="add_task">Přidat úkol</string>
+  <string name="add_habit">Přidat zvyk</string>
+  <string name="add_daily">Přidat denní úkol</string>
+  <string name="add_todo">Přidat úkol</string>
+  <string name="add_reward">Přidat odměnu</string>
+  <string name="all_dailies_completed">Udělal si všechny své denní úkoly. Výborně!</string>
+  <string name="widget_habit_button">Habitica Zvyky</string>
+  <string name="widget_dailies">Habitica Denní úkoly</string>
+  <string name="widget_todo_list">Habitica Úkolníček</string>
+  <string name="widget_add_task">Habitica přidat úkol</string>
+  <string name="google_services_missing">Google play services could not be found.</string>
+  <string name="gem.purchase.toolbartitle">Koupit</string>
+  <string name="gem.purchase.title">Zakoupením drahokamů podpoříš vývojáře a pomůžeš Habitice dál fungovat</string>
+  <string name="gem.purchase.subtitle">Drahokamy ti umožní koupit zábavné bonusy pro tvůj účet:</string>
+  <string name="gem.purchase.listitem1">Cool kostýmy pro tvého avatara</string>
+  <string name="gem.purchase.listitem2">Úžasná pozadí</string>
+  <string name="gem.purchase.listitem3">Výpravy, které tě odmění vajíčkem mazlíčka</string>
+  <string name="gem.purchase.listitem4">Možnost změnit povolání svojí postavy před 100. úrovní</string>
+  <string name="support_habitica">Podpořit Habiticu</string>
+  <string name="skill_transformation_use">použít</string>
+  <string name="hatching_market_info">Nepoštěstilo se ti s předměty? Zkontroluj trh!</string>
+  <string name="feeding_market_info">Potřebuješ jiné jídlo? Kup si ho více na trhu!</string>
+  <string name="open_market">Otevřít Trh</string>
+  <string name="cds_description">Tvé Denní úkoly se resetují sotva zapneš Habiticu po %1$s. Přesvědč se, jestli si je do té doby stihl všechny dodělat!</string>
+  <string name="AudioTheme_title">Hudební téma</string>
+  <string name="AudioTheme_summary">Změň hudební téma Habiticy</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Uvidíme se zítra!</string>
+  <string name="belongs_to_challenge">Patří k Výzvě</string>
+  <string name="has_reminder">Má připomínku</string>
+  <string name="has_tag">Má štítek</string>
+  <string name="subscribe.title">Předplatné podporuje vývojáře a pomáhá držet Habiticu v chodu</string>
+  <string name="subscribe_prompt">Staň se předplatitel a získáš tyto užitečné benefity:</string>
+  <string name="subscribe.listitem1">Kup drahokamy za zlato</string>
+  <string name="subscribe.listitem2">Jedinečné předměty každý měsíc</string>
+  <string name="subscribe.listitem3">Ponech si další položky historie</string>
+  <string name="subscribe.listitem4">Denně získáš dvakrát více pokladů</string>
+  <string name="subscriptions">Předplatné</string>
+  <string name="subscription_duration">Opakující se každý %s</string>
+  <string name="subscribe">Předplatit</string>
+  <string name="subscribe.listitem1.description">Obchodník Alexander ti prodá drahokamy za cenu 20 zlaťáků za drahokam!\n\nHis Jeho měsíční dodávky jsou zprvu omezeny na 25 drahokamů za měsíc, ale může se postupně navyšovat na základě délky tvého předplatného.\n\n Každé tři měsíce souvislého předplatného se jejich počet navýší o 5 a může dosáhnout maxima až 50 drahokamů za měsíc!</string>
+  <string name="subscribe.listitem2.description">Každý měsíc obdržíš unikátní předmět pro svojí postavu!\n\n Navíc za každé tři měsíce nepřerušeného předplatného ti Tajemní cestovatelé časem zaručí přístup k historickým (a futuristickým!) kosmetickým předmětům.</string>
+  <string name="subscription_hourglasses">+%dMystické přesýpací hodiny</string>
+  <string name="payment_method">Způsob platby</string>
+  <string name="subscription">Předplatné</string>
+  <string name="active">Aktivní</string>
+  <string name="cancel_subscription">Zrušit předplatné</string>
+  <string name="visit_habitica_website">Navštiv stránky Habitica</string>
+  <string name="current_bonuses">Aktuální bonusy</string>
+  <string name="current_hourclasses">Aktuální Mystické přesýpací hodiny</string>
+  <string name="monthly_gem_cap">Měsíčný strop drahokamů</string>
+  <string name="inactive">Neaktivní</string>
+  <string name="one_month">1 měsíc</string>
+  <string name="months">%dměsíců</string>
+  <string name="month">měsíc</string>
+  <string name="three_months">3 měsíce</string>
+  <string name="six_months">6 měsíců</string>
+  <string name="twelve_months">12 měsíců</string>
+  <string name="subscribe_prompt_thanks">Za předplatné obdržuješ tyto užitečné benefity:</string>
+  <string name="subscription_status">Status předplatného</string>
+  <string name="byLeader">o %s</string>
+  <string name="challenge_details">Detaily výzvy</string>
+  <string name="challenge_leave_title">Opustit výzvu</string>
+  <string name="challenge_leave_text">Jsi si jistý, že chceš opustit výzvu \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Odstranit úkoly</string>
+  <string name="challenge_remove_tasks_text">Chceš odstranit úkoly?</string>
+  <string name="remove_tasks">Odstranit</string>
+  <string name="keep_tasks">Ponechat</string>
+  <string name="my_challenges">Moje výzvy</string>
+  <string name="public_challenges">Veřejné</string>
+  <string name="challenges">Výzvy</string>
+  <string name="daily">Denně</string>
+  <string name="habit">Zvyk</string>
+  <string name="reward">Odměna</string>
+  <string name="todo">Úkol</string>
+  <string name="official">Oficiální</string>
+  <string name="participating">Účastnící se</string>
+  <string name="challenge">Výzva</string>
+  <string name="warning">Varování</string>
+  <string name="inbox">Zprávy</string>
+  <string name="FAQ">Často kladené otázky</string>
+  <string name="special">Speciální</string>
+  <string name="gem_for_gold_description">Protože si předplácíš program Habitica, tak můžeš koupit několik drahokamů každý měsíc za zlaťáky.</string>
+  <string name="limited_count">%d zbývá</string>
+  <string name="gem_shop">Drahokam</string>
+  <string name="mystery_item">Záhadný předmět</string>
+  <string name="myster_item_notes">Každý měsíc předplatitelé získají záhadný předmět. Ten je obvykle vypuštěn kolem posledního týdne v měsíci.</string>
+  <string name="open">Otevřít</string>
+  <string name="notification_mystery_item">Otevřel jsi krabici a našel jsi %s!</string>
+  <string name="checkInRewardEarned">Získal jsi %1$s jako odměnu za tvoje odhodlání zlepšit si svůj život.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Tvá další odměna se odemkne za %1$d přihlášení</string>
+  <string name="pending_approval">čeká na schválení</string>
+  <string name="filters">Filtry</string>
+  <string name="done">Hotovo</string>
+  <string name="group_tasks_edit_description">Skupinové úkoly nemohou být upravovány.</string>
+  <string name="group_tasks_edit_title">Nemůžeš upravit tento úkol</string>
+  <string name="groups">Skupiny</string>
+  <string name="all">Všechny</string>
+  <string name="none">Žádné</string>
+  <string name="owned">Vlastněno</string>
+  <string name="not_owned">Nevlastněno</string>
+  <string name="new_game">Nová\nHra</string>
+  <string name="login_btn_fb">Přihlásit se pomocí Facebooku</string>
+  <string name="login_btn_google">Přihlásit se pomocí Google</string>
+  <string name="action_back">Zpět</string>
+  <string name="randomize">Náhodně</string>
+  <string name="avatar_extras">Další</string>
+  <string name="avatar_skin_color">Barva kůže</string>
+  <string name="avatar_hair_color">Barva vlasů</string>
+  <string name="avatar_hair_bangs">Ofina</string>
+  <string name="avatar_hair_ponytail">Culík</string>
+  <string name="avatar_glasses">Brýle</string>
+  <string name="avatar_wheelchair">Kolečkové křeslo</string>
+  <string name="weak">Slabý</string>
+  <string name="strong">Silný</string>
+  <string name="gray">Šedá</string>
+  <string name="dated">Naplánováno</string>
+  <string name="completed">Dokončeno</string>
+  <string name="setuP_group_other">Ostatní</string>
+  <string name="clear">Vyčistit</string>
+  <string name="empty_title_habits">Nemáš žádné zvyky</string>
+  <string name="tasks">Úkoly</string>
+  <string name="description_optional">Popis (volitelný)</string>
+</resources>
diff --git a/Habitica/res/values-da/strings.xml b/Habitica/res/values-da/strings.xml
new file mode 100755
index 000000000..341f983e6
--- /dev/null
+++ b/Habitica/res/values-da/strings.xml
@@ -0,0 +1,359 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Opdater</string>
+  <string name="XP_default">Erfaring</string>
+  <string name="HP_default">Liv</string>
+  <string name="MP_default">Mana</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Indstillinger</string>
+  <string name="SP_userID_title">Bruger ID</string>
+  <string name="SP_userID_summary">Dit Bruger ID</string>
+  <string name="SP_APIToken_title">API Nøgle</string>
+  <string name="SP_APIToken_summary">Din API Nøgle</string>
+  <string name="Language_title">Sprog</string>
+  <string name="Language_summary">Skift Habiticas sprog</string>
+  <string name="SP_user_qr_code">Din QR Kode</string>
+  <string name="PS_contact_title">Kontakt mig</string>
+  <string name="unknown_error">Der opstod en fejl...</string>
+  <string name="pref_account_header">Konto</string>
+  <string name="pref_first_day_of_the_week_title">Første dag af ugen</string>
+  <string name="pref_first_day_of_the_week_summary">Første dag af ugen i alle kalendere</string>
+  <string name="pref_reminder_header">Daglig Påmindelse</string>
+  <string name="pref_reminder_checkbox">Aktiver Påmindelser</string>
+  <string name="pref_reminder_picker">Sæt Påmidelses Tid</string>
+  <string name="pref_cds_header">Brugerdefineret Dagstart</string>
+  <string name="pref_cds_picker">Sæt Brugerdefineret Dagstart</string>
+  <string name="pref_push_notifications_checkbox">Bruger Push-Notifikationer</string>
+  <string name="push_notifications">Push-Notifikationer</string>
+  <string name="push_notifications_sum">Ændre dine push-notifikationer indstillinger</string>
+  <string name="preference_push_you_won_challenge">Du vandt en udfordring!</string>
+  <string name="preference_push_received_a_private_message">Modtog en Privatbesked</string>
+  <string name="preference_push_gifted_gems">Ædelstensgave</string>
+  <string name="preference_push_gifted_subscription">Abonnementsgave</string>
+  <string name="preference_push_invited_to_party">Inviteret til Gruppe</string>
+  <string name="preference_push_invited_to_guild">Inviteret til Klan</string>
+  <string name="preference_push_your_quest_has_begun">Din quest er startet</string>
+  <string name="preference_push_invited_to_quest">Inviteret til Quest</string>
+  <!--Adding tasks-->
+  <string name="task_value">Værdi</string>
+  <string name="new_todo">Ny To-Do</string>
+  <string name="new_reward">Ny Belønning</string>
+  <string name="new_daily">Ny Daglig Opgave</string>
+  <string name="new_habit">Ny Vane</string>
+  <string name="action_edit">Ret</string>
+  <string name="action_delete">Slet</string>
+  <string name="action_cancel">Afbryd</string>
+  <string name="login_btn">Log ind</string>
+  <string name="register_btn">Registrer</string>
+  <string name="username">Brugernavn</string>
+  <string name="email_username">Email eller Brugernavn</string>
+  <string name="password">Kodeord</string>
+  <string name="emailAddress">Email adresse</string>
+  <string name="confirmpassword">Bekræft kodeord</string>
+  <string name="logout">Log ud</string>
+  <string name="logout_description">Log ud af din konto</string>
+  <string name="account_details">Konto Detaljer</string>
+  <string name="LoginActivityName">Velkommen</string>
+  <string name="string_revive">Genopliv</string>
+  <string name="please_connect">Forbind venligst gennem applikationen før du bruger en widget</string>
+  <string name="about.title">Om</string>
+  <string name="about.libraries">Biblioteker</string>
+  <string name="about.versionhistory">Udgave Historie</string>
+  <string name="about.habitica_open_source">Habitica er tilgængelig som open source software på GitHub</string>
+  <string name="about.rate_our_app">Bedøm vores App</string>
+  <string name="about.give_us_feedback">Send us Feedback!</string>
+  <string name="about.bugreport">Rapportér en fejl</string>
+  <string name="about.source_code">Kilde Kode</string>
+  <string name="repeatEvery">Gentag Hver</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Forbindelsesfejl</string>
+  <string name="network_error_no_network_body">Du er ikke forbundet til internettet.</string>
+  <string name="internal_error_api">Der er problemer med serveren. Prøv igen senere.</string>
+  <string name="authentication_error_title">Godkendelsesfejl</string>
+  <string name="authentication_error_body">Dit Brugernavn og/eller Kodeord var forkert.</string>
+  <string name="login_validation_error_title">Bekræftigelsesfejl</string>
+  <string name="login_validation_error_fieldsmissing">Du skal udfylde alle felter.</string>
+  <string name="save_changes">Gem</string>
+  <string name="copy">Kopier</string>
+  <string name="notes">Noter</string>
+  <string name="text">Tekst</string>
+  <string name="difficulty">Sværhedsgrad</string>
+  <string name="tags">Tags</string>
+  <string name="trivial">Triviel</string>
+  <string name="easy">Let</string>
+  <string name="medium">Medium</string>
+  <string name="hard">Hård</string>
+  <string name="start_date">Start Dato</string>
+  <string name="positive_habit_form">Positiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Tjekliste</string>
+  <string name="reminders">Påmindelser</string>
+  <string name="actions">Handlinger</string>
+  <string name="attributes">Attributter</string>
+  <string name="frequency">Frekvens</string>
+  <string name="frequency_weekly">På specifikke ugedage</string>
+  <string name="frequency_daily">Hver X dage</string>
+  <string name="repeatables_summary_title">Resumé</string>
+  <string name="repeatables_title">Gentagelser</string>
+  <string name="repeatables_on_title">Gentages På</string>
+  <string name="repeatables_frequency_daily">Daglig</string>
+  <string name="repeatables_frequency_weekly">Ugentlig</string>
+  <string name="repeatables_frequency_monthly">Månedlig</string>
+  <string name="repeatables_frequency_yearly">Årlig</string>
+  <string name="repeatables_frequency_day_of_month">Dag i Måneden</string>
+  <string name="repeatables_frequency_day_of_week">Ugedag</string>
+  <string name="monday">Mandag</string>
+  <string name="tuesday">Tirsdag</string>
+  <string name="wednesday">Onsdag</string>
+  <string name="thursday">Torsdag</string>
+  <string name="friday">Fredag</string>
+  <string name="saturday">Lørdag</string>
+  <string name="sunday">Søndag</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Frygt ikke!</string>
+  <string name="faint_header">Du løb tør for liv!</string>
+  <string name="faint_button">Genfyld Liv &amp; Prøv igen</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Profil Billede</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Du har brugt %1$s til %2$d mana.</string>
+  <string name="used_skill_without_mana">Du har brugt %1$s.</string>
+  <string name="new_checklist_item">nyt tjekliste punkt</string>
+  <string name="add_checklist_item">Tilføj</string>
+  <string name="skill_progress_title">Brug Evne</string>
+  <string name="coming_soon">Kommer Snart</string>
+  <string name="chat_flag_confirmation">Er du sikker på, at du vil rapporterer denne overtrædelse?</string>
+  <string name="flag_confirm">Anmeld Besked</string>
+  <string name="unlock_lvl_11">Låses op for ved niv. 11</string>
+  <string name="no_party_message">Du er ikke i en gruppe. For at blive medlem af en gruppe, gå venligst til hjemmesiden.</string>
+  <string name="forgot_pw_btn">Glemt kodeord</string>
+  <string name="tavern.inn.checkOut">Genaktiver dine Daglige</string>
+  <string name="tavern.inn.rest">Sæt dine Daglige på pause</string>
+  <string name="reward.dialog.buy">Køb</string>
+  <string name="reward.dialog.dismiss">Afsked</string>
+  <string name="party">Gruppe</string>
+  <string name="chat">Chat</string>
+  <string name="members">Medlemmer</string>
+  <string name="habits">Vaner</string>
+  <string name="dailies">Daglige</string>
+  <string name="todos">To-Dos</string>
+  <string name="rewards">Belønninger</string>
+  <string name="taskform.delete.title">Er du sikker?</string>
+  <string name="taskform.delete.message">Vil du virkelig slette?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="quest">Quest</string>
+  <string name="avatar_body">Krop</string>
+  <string name="avatar_hair">Hår</string>
+  <string name="avatar_shirt">Trøje</string>
+  <string name="avatar_skin">Hud</string>
+  <string name="avatar_ears">Dyre-øre</string>
+  <string name="avatar_base">Base</string>
+  <string name="avatar_color">Farve</string>
+  <string name="avatar_beard">Skæg</string>
+  <string name="avatar_mustache">Overskæg</string>
+  <string name="avatar_flower">Blomst</string>
+  <string name="avatar_bangs">Pandehår</string>
+  <string name="avatar_nothing">Intet sæt</string>
+  <string name="avatar_size">Størrelse</string>
+  <string name="avatar_size_slim">Tynd</string>
+  <string name="avatar_size_broad">Bred</string>
+  <string name="avatar_background">Baggrund</string>
+  <string name="purchase_customization">Køb Brugerdefinering</string>
+  <string name="purchase_set_button">Lås op for sættet for %d Ædelsten</string>
+  <string name="purchase_button">Køb</string>
+  <string name="purchase_set_title">Køb sæt %s</string>
+  <string name="due_date">Forfaldsdato</string>
+  <string name="quest.accept">Accepter</string>
+  <string name="quest.reject">Afvis</string>
+  <string name="quest.begin">Start Quest</string>
+  <string name="quest.cancel">Aflys Invitation</string>
+  <string name="quest.abort">Afbryd Quest</string>
+  <string name="quest.leave">Forlad Quest</string>
+  <string name="quest.pending">Afventer</string>
+  <string name="quest.accepted">Accepteret</string>
+  <string name="quest.rejected">Afvist</string>
+  <string name="quest.participants">Deltagere</string>
+  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="sidebar_help">Hjælp &amp; OSS</string>
+  <string name="complete_tutorial">Forstået!</string>
+  <string name="dismiss_tutorial">Påmind mig igen</string>
+  <string name="intro_1_subtitle">Velkommen til</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">Fremskridt i spillet</string>
+  <string name="intro_2_title">Fremskridt i livet</string>
+  <string name="intro_finish_button">Lad os starte!</string>
+  <string name="previous_button">Tidligere</string>
+  <string name="next_button">Næste</string>
+  <string name="skip_button">Spring over</string>
+  <string name="setup_welcome_title">Velkommen</string>
+  <string name="setup_group_work">Arbejde</string>
+  <string name="setup_group_exercise">Motion</string>
+  <string name="setup_group_health">Liv</string>
+  <string name="setup_group_school">Skole</string>
+  <string name="setup_group_teams">Hold</string>
+  <string name="setup_group_chores">Pligter</string>
+  <string name="setup_group_creativity">Kreativitet</string>
+  <string name="setup_task_work_2">Mest vigtige opgave</string>
+  <string name="setup_task_work_3">Arbejdsprojekt</string>
+  <string name="setup_task_exercise_1">10 minutters konditionstræning</string>
+  <string name="setup_task_exercise_2">Udstrækning</string>
+  <string name="setup_task_exercise_3">Opret træningsprogram</string>
+  <string name="setup_task_healthWellness_1">Spis sundt / junk food</string>
+  <string name="setup_task_healthWellness_2">Brug tandtråd</string>
+  <string name="setup_task_healthWellness_3">Planlæg check-up</string>
+  <string name="setup_task_school_1">Studere/Udsætte</string>
+  <string name="setup_task_school_2">Lav lektier</string>
+  <string name="setup_task_chores_1">10 minutters rengøring</string>
+  <string name="setup_task_chores_2">Vask op</string>
+  <string name="setup_task_chores_3">Organiser skab</string>
+  <string name="setup_task_creativity_2">Arbejd på et kreativt projekt</string>
+  <string name="setup_task_creativity_3">Færdiggør et kreativt projekt</string>
+  <string name="my_guilds">Mine klaner</string>
+  <string name="public_guilds">Offentlige klaner</string>
+  <string name="guild">Klan</string>
+  <string name="leave">Forlad</string>
+  <string name="leader">Leder</string>
+  <string name="gems">Ædelsten</string>
+  <string name="send_pm">Send PM</string>
+  <string name="flag">Anmeld</string>
+  <string name="delete">Slet</string>
+  <string name="name">Navn</string>
+  <string name="description">Beskrivelse</string>
+  <string name="privacy">Privatliv</string>
+  <string name="write_message">Skriv besked</string>
+  <string name="guild_search_hint">Søg efter klaner</string>
+  <string name="todo_due">Due: %s</string>
+  <string name="daily_streak">nuværende stribe: %d</string>
+  <string name="todo_has_duedate">Opgaven har en forfaldsdato</string>
+  <string name="battle_gear">Kampudstyr</string>
+  <string name="costume">Kostume</string>
+  <string name="outfit_head">Hoved</string>
+  <string name="outfit_headAccessory">Hoved Udstyr</string>
+  <string name="outfit_armor">Rustning</string>
+  <string name="outfit_back">Ryg</string>
+  <string name="outfit_body">Krop</string>
+  <string name="outfit_shield">Skjold</string>
+  <string name="outfit_weapon">Våben</string>
+  <string name="wear_costume">Bær Kostume</string>
+  <string name="quest.invitation">Quest Invitation</string>
+  <string name="quest.invitation.text">Du er blevet inviteret til, at deltage i en quest!</string>
+  <string name="today">I dag</string>
+  <string name="sidebar_items">Ting</string>
+  <string name="eggs">Æg</string>
+  <string name="hatching_potions">Udrugningseliksir</string>
+  <string name="food">Mad</string>
+  <string name="quests">Quests</string>
+  <string name="pets">Kæledyr</string>
+  <string name="mounts">Ridedyr</string>
+  <string name="armoireEquipment">Du har fundet et stykke sjældent udstyr i Armoire: %s! Fedt!</string>
+  <string name="armoireFood">Du roder rundt i Armoire og finder %1$s %2$s. Hvad laver det her?</string>
+  <string name="armoireExp">Du kæmper med Armoire og får Erfaring. Tag den!</string>
+  <string name="sell">Sælg (%d Guld)</string>
+  <string name="hatch_with_potion">Udrug med eliksir</string>
+  <string name="hatch_egg">Udrug med æg</string>
+  <string name="invite_party">Inviter gruppe</string>
+  <string name="dialog_feeding">Foder %1$s %2$s med:</string>
+  <string name="use_animal">Brug</string>
+  <string name="feed">Foder</string>
+  <string name="hatch_with">Udrug kæledyr med %s</string>
+  <string name="hatched_pet_title">Du har udruget en/et %1$s %2$s!</string>
+  <string name="close">Luk</string>
+  <string name="share">Del</string>
+  <string name="notification_pet_fed">Du har fodret din %1$s %2$s!</string>
+  <string name="world_quest">Verdensquest</string>
+  <string name="empty_items">Du have ingen %s</string>
+  <string name="user_level">Niv. %d</string>
+  <string name="user_level_with_class">Niv. %1$d %2$s</string>
+  <string name="warrior">Kriger</string>
+  <string name="rogue">Slyngel</string>
+  <string name="mage">Magiker</string>
+  <string name="healer">Helbreder</string>
+  <string name="select_class">Vælg Klasse</string>
+  <string name="opt_out_class">Fravælg</string>
+  <string name="class_confirmation">Er du sikker på, at du vil være en %s?</string>
+  <string name="class_changed">Du er nu en %s!</string>
+  <string name="choose_class">Vælg Klasse</string>
+  <string name="dialog_go_back">Gå tilbage</string>
+  <string name="opt_out_confirmation">Er du sikker på, at du vil fravælge?</string>
+  <string name="change_class">Ændre din Klasse</string>
+  <string name="enable_class">Aktiver Klassesystem</string>
+  <string name="user_id">Bruger ID</string>
+  <string name="email">E-mail</string>
+  <string name="open_in_store">Åben i play store</string>
+  <string name="leaderMessage">Besked fra %1$s</string>
+  <string name="leaderName">Leder: %1$s</string>
+  <string name="confirm">Bekræft</string>
+  <string name="market">Marked</string>
+  <string name="timeTravelers">Tidsrejsende</string>
+  <string name="no_gold">Ikke nok Guld</string>
+  <string name="no_potion">Du behøver ikke at købe en en livseliksir</string>
+  <string name="gem">ædelsten</string>
+  <string name="hourglass">timeglas</string>
+  <string name="hourglasses">timeglas</string>
+  <string name="gold_singular">guld</string>
+  <string name="gold_plural">guld</string>
+  <string name="edit_tag_btn_edit">Ret</string>
+  <string name="edit_tag_btn_done">Færdig</string>
+  <string name="edit_tag_btn_delete">Slet</string>
+  <string name="confirm_delete_tag_title">Er du sikker?</string>
+  <string name="confirm_delete_tag_message">Vil du virkelig slette?</string>
+  <!--QR Strings-->
+  <string name="add_task">Tilføj Opgave</string>
+  <string name="add_habit">Tilføj Vane</string>
+  <string name="add_daily">Tilføj Daglig Opgave</string>
+  <string name="add_todo">Tilføj To-Do</string>
+  <string name="add_reward">Tilføj Belønning</string>
+  <string name="widget_dailies">Habitica Daglige Opgaver</string>
+  <string name="widget_todo_list">Habitica To-Do Liste</string>
+  <string name="widget_add_task">Habitica Tilføj Opgave</string>
+  <string name="gem.purchase.toolbartitle">Køb</string>
+  <!--Login Incentives-->
+  <string name="subscription_hourglasses">+%d Mystisk Timeglas</string>
+  <string name="payment_method">Betalingsmetode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Annuller Abonnement</string>
+  <string name="current_hourclasses">Nuværende Mystiske Timeglas</string>
+  <string name="monthly_gem_cap">Månedlig ædelstensmaksimum</string>
+  <string name="inactive">Inaktiv</string>
+  <string name="one_month">1 Måned</string>
+  <string name="months">%d Måneder</string>
+  <string name="month">måned</string>
+  <string name="three_months">3 måneder</string>
+  <string name="six_months">6 måneder</string>
+  <string name="twelve_months">12 måneder</string>
+  <string name="subscribe_prompt_thanks">Du modtager følgende fordele for dit abonnement:</string>
+  <string name="subscription_status">Abonnement status</string>
+  <string name="challenge_details">Udfordrings-detaljer</string>
+  <string name="challenge_leave_title">Forlad Udfordring</string>
+  <string name="challenge_leave_text">Er du sikker på, at du vil forlade Udfordringen \"%s\"?</string>
+  <string name="my_challenges">Mine Udfordringer</string>
+  <string name="public_challenges">Offentlig</string>
+  <string name="challenges">Udfordringer</string>
+  <string name="daily">Daglig</string>
+  <string name="habit">Vane</string>
+  <string name="reward">Belønning</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Officiel</string>
+  <string name="participating">Deltager</string>
+  <string name="challenge">Udfordring</string>
+  <string name="go_to_challenge">Gå til Udfordring</string>
+  <string name="add_reminder">Tilføj påmindelse</string>
+  <string name="warning">Advarsel</string>
+  <string name="open_settings">Åben Indstillinger</string>
+  <string name="FAQ">Ofte Stillede Spørgsmål</string>
+  <string name="special">Special</string>
+  <string name="gem_for_gold_description">Fordi du abonnere på Habitica, kan du købe et antal Ædelsten hver måned ved at bruge Guld.</string>
+  <string name="limited_count">%d tilbage</string>
+  <string name="gem_shop">Ædelsten</string>
+  <string name="mystery_item">Mystisk Vare</string>
+  <string name="myster_item_notes">Hver måned modtager abonnenter en mystisk vare. Den er typisk frigivet ca. en uge før slutningen af måneden. </string>
+  <string name="open">Åben</string>
+  <string name="notification_mystery_item">Du åbner denne box og finder %s!</string>
+  <string name="checkInRewardEarned">Du har modtaget en/et %1$s som belønning for din hengivenhed til at forbedre dit liv.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Din næste præmie vil åbne ved %1$d Check-ins</string>
+  <string name="pending_approval">afventer godkendelse</string>
+  <string name="group_tasks_edit_description">Gruppe opgave kan ikke redigeres.</string>
+  <string name="group_tasks_edit_title">Kan ikke redigere denne opgave</string>
+</resources>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index f09d576fb..69dc88577 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -9,10 +9,7 @@
     <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">Ok</string>
-    <string name="profile_qrcode_close">Schließen</string>
 
 </resources>
diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml
index aed435a3e..9eca7353e 100644
--- a/Habitica/res/values-de/strings.sidebar.xml
+++ b/Habitica/res/values-de/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Aufgaben</string>
-  <string name="sidebar.skills">Fähigkeiten</string>
-  <string name="sidebar.section.social">Soziales</string>
-  <string name="sidebar.inbox">Nachrichten</string>
-  <string name="sidebar.tavern">Gasthaus</string>
-  <string name="sidebar.party">Gruppe</string>
-  <string name="sidebar.purchaseGems">Edelsteine &amp; Abonnement</string>
-  <string name="sidebar.guilds">Gilden</string>
-  <string name="sidebar.challenges">Wettbewerbe</string>
-  <string name="sidebar.section.inventory">Inventar</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Ausrüstung</string>
-  <string name="sidebar.stable">Stall</string>
-  <string name="sidebar.news">Neuigkeiten</string>
-  <string name="sidebar.settings">Einstellungen</string>
-  <string name="sidebar.about">Über</string>
+  <string name="sidebar_tasks">Aufgaben</string>
+  <string name="sidebar_skills">Fähigkeiten</string>
+  <string name="sidebar_section_social">Soziales</string>
+  <string name="sidebar_inbox">Nachrichten</string>
+  <string name="sidebar_tavern">Gasthaus</string>
+  <string name="sidebar_party">Gruppe</string>
+  <string name="sidebar_purchaseGems">Edelsteine &amp; Abonnement</string>
+  <string name="sidebar_guilds">Gilden</string>
+  <string name="sidebar_challenges">Wettbewerbe</string>
+  <string name="sidebar_section_inventory">Inventar</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Ausrüstung</string>
+  <string name="sidebar_stable">Stall</string>
+  <string name="sidebar_news">Neuigkeiten</string>
+    <string name="sidebar_about">Über</string>
   <string name="sidebar_shops">Märkte</string>
   <string name="sidebar_stats">Statuswerte</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index e6569d055..829e8e7e1 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Kaufe dir mit dem verdienten Gold Ausrüstung für deinen Avatar!</string>
   <string name="tutorial_rewards_2">Du kannst auch benutzerdefinierte Belohnungen erstellen, die sich auf etwas in Deinem wirklichen Leben beziehen, je nachdem was Dich motiviert.</string>
   <string name="tutorial_tasks_complete">Das war\'s für das Erste. Falls du eine Erinnerungshilfe brauchst, dann schau in die FAQs.</string>
-  <string name="tutorial_equipment">Wenn du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst deine Statuswerte und dein Kostüm (falls aktiviert) beeinflusst was dein Avatar trägt.</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">Während Du Aufgaben abschließt, kannst Du zufällig Eier und Elixiere zu finden. Kombiniere diese um Haustiere auszubrüten</string>
-  <string name="tutorial_skills">Fähigkeiten erlauben es dir, mächtige Effekte auszulösen! Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das du verdienst, indem du dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
+    <string name="tutorial_skills">Fähigkeiten erlauben es dir, mächtige Effekte auszulösen! Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das du verdienst, indem du dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
   <string name="tutorial_party">Hier können du und deine Freunde einander motivieren und mit euren Aufgaben Monster bekämpfen!</string>
-  <string name="tutorial_tavern">Willkommen in der Taverne, einem öffentlichen Chat für alle Altersklassen! Hier kannst du dich über Produktivität unterhalten und Fragen stellen. Viel Spaß!</string>
-  <string name="tutorial_classes">Wähle aus, ob du Krieger, Magier, Heiler oder Schurke werden möchtest. Jede Klasse hat einzigartige Ausrüstungsgegenstände und Fähigkeiten. Tippe auf (?), um mehr zu erfahren!</string>
-  <string name="tutorial_stats">Tippe auf den grauen Button, um mehrere Punkte auf einmal zuzuweisen, oder tippe auf die Pfeile, um die Punkte einzeln zu verteilen.</string>
+  <string name="tutorial_tavern">Willkommen im Gasthaus, einem öffentlichen Chat für alle Altersklassen! Hier kannst du dich über Produktivität unterhalten und Fragen stellen. Viel Spaß!</string>
+    <string name="tutorial_stats">Tippe auf den grauen Button, um mehrere Punkte auf einmal zuzuweisen, oder tippe auf die Pfeile, um die Punkte einzeln zu verteilen.</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index c6f88da9d..6e116f2de 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Erfahrung</string>
   <string name="HP_default">Gesundheit</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Einstellungen konnten nicht vom Barcode geladen werden</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Einstellungen</string>
-  <string name="SP_address_hint">Dein benutzerdefinierter Server</string>
-  <string name="SP_userID_title">Benutzer-ID</string>
+    <string name="SP_userID_title">Benutzer-ID</string>
   <string name="SP_userID_summary">Deine Benutzer-ID</string>
   <string name="SP_APIToken_title">API-Token</string>
   <string name="SP_APIToken_summary">Dein API-Token</string>
   <string name="Language_title">Sprache</string>
   <string name="Language_summary">Habiticas Sprache ändern</string>
-  <string name="SP_user_qr_code">Dein QR-Code</string>
-  <string name="PS_contact_title">Kontaktiere mich</string>
-  <string name="unknown_error">Ein Fehler ist aufgetreten…</string>
-  <string name="pref_account_header">Konto</string>
+    <string name="PS_contact_title">Kontaktiere mich</string>
+    <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
   <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
   <string name="pref_reminder_header">Tägliche Erinnerung</string>
   <string name="pref_reminder_checkbox">Erinnerung aktivieren</string>
   <string name="pref_reminder_picker">Erinnerungszeit einstellen</string>
   <string name="pref_cds_header">Persönlicher Tagesstart</string>
-  <string name="pref_cds_picker">Persönlichen Tagesstart einstellen</string>
-  <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
+    <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
   <string name="push_notifications">Push-Benachrichtigungen</string>
   <string name="push_notifications_sum">Stelle deine Push-Benachrichtigungen ein</string>
   <string name="preference_push_you_won_challenge">Du hast eine Herausforderung gewonnen!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Deine Quest hat begonnen</string>
   <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
   <!--Adding tasks-->
-  <string name="task_value">Wert</string>
-  <string name="new_todo">Neue To-Do</string>
-  <string name="new_reward">Neue Belohnung</string>
-  <string name="new_daily">Neue tägliche Aufgabe</string>
-  <string name="new_habit">Neue Gewohnheit</string>
-  <string name="action_edit">Bearbeiten</string>
-  <string name="action_delete">Löschen</string>
-  <string name="action_cancel">Abbrechen</string>
+    <string name="action_edit">Bearbeiten</string>
+    <string name="action_cancel">Abbrechen</string>
   <string name="login_btn">Login</string>
   <string name="register_btn">Registrieren</string>
   <string name="username">Benutzername</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Passwort bestätigen</string>
   <string name="logout">Ausloggen</string>
   <string name="logout_description">Logge Dich aus</string>
-  <string name="account_details">Kontodetails</string>
-  <string name="LoginActivityName">Willkommen</string>
-  <string name="string_revive">Wiederbeleben</string>
-  <string name="please_connect">Baue eine Verbindung mit Hilfe der App auf, bevor Du ein Widget benutzt</string>
-  <string name="about.title">Über</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versionsverlauf</string>
-  <string name="about.habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
-  <string name="about.rate_our_app">Bewerte unsere App</string>
-  <string name="about.give_us_feedback">Sende uns Feedback!</string>
-  <string name="about.bugreport">Melde einen Fehler</string>
-  <string name="about.source_code">Quellcode</string>
-  <string name="repeatEvery">Es wiederholt sich jeden</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindungsfehler</string>
-  <string name="network_error_no_network_body">Keine Internetverbindung.</string>
-  <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
+    <string name="LoginActivityName">Willkommen</string>
+    <string name="about_title">Über</string>
+  <string name="about_libraries">Bibliotheken</string>
+    <string name="about_habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
+  <string name="about_rate_our_app">Bewerte unsere App</string>
+  <string name="about_give_us_feedback">Sende uns Feedback!</string>
+  <string name="about_bugreport">Melde einen Fehler</string>
+  <string name="about_source_code">Quellcode</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
   <string name="authentication_error_title">Authentifikationsfehler</string>
-  <string name="authentication_error_body">Ungültiger Benutzername und/oder Passwort.</string>
-  <string name="login_validation_error_title">Validierungsfehler</string>
+    <string name="login_validation_error_title">Validierungsfehler</string>
   <string name="login_validation_error_fieldsmissing">Bitte fülle alle Felder aus.</string>
   <string name="save_changes">Speichern</string>
   <string name="copy">Kopieren</string>
   <string name="notes">Notizen</string>
-  <string name="text">Text</string>
-  <string name="difficulty">Schwierigkeit</string>
+    <string name="difficulty">Schwierigkeit</string>
   <string name="tags">Tags</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Einfach</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativ ( - )</string>
   <string name="checklist">Checkliste</string>
   <string name="reminders">Erinnerungen</string>
-  <string name="actions">Aktionen</string>
-  <string name="attributes">Attribute</string>
-  <string name="physical">Stärke</string>
-  <string name="mental">Intelligenz</string>
-  <string name="social">Ausdauer</string>
-  <string name="other">Wahrnehmung</string>
-  <string name="frequency">Häufigkeit</string>
-  <string name="frequency_weekly">An bestimmten Tagen der Woche</string>
-  <string name="frequency_daily">Alle X Tage</string>
-  <string name="repeatables_summary_title">Zusammenfassung</string>
-  <string name="repeatables_title">Es wiederholt sich</string>
-  <string name="repeatables_on_title">Wiederholt sich am </string>
-  <string name="repeatables_frequency_daily">Täglich</string>
+    <string name="attributes">Attribute</string>
+    <string name="repeatables_frequency_daily">Täglich</string>
   <string name="repeatables_frequency_weekly">Wöchentlich</string>
   <string name="repeatables_frequency_monthly">Monatlich</string>
   <string name="repeatables_frequency_yearly">Jährlich</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Du hast alle Deine Lebenspunkte verloren!</string>
   <string name="faint_button">Lebenspunkte auffüllen &amp; Nochmal versuchen</string>
   <string name="filter">Filtern</string>
-  <string name="profile_image">Profilbild</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Du hast %1$s für %2$d Mana benutzt.</string>
-  <string name="used_skill_without_mana">Du hast %1$s benutzt.</string>
+    <string name="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">Vergiss nicht deine Aufgaben zu überprüfen</string>
-  <string name="skill_progress_title">Fertigkeiten benutzen</string>
-  <string name="coming_soon">demnächst verfügbar</string>
-  <string name="chat_flag_confirmation">Möchtest Du diesen Beitrag wirklich melden?</string>
-  <string name="flag_confirm">Verletzung der Community-Richtlinien melden</string>
-  <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</string>
-  <string name="no_party_message">Du bist in keiner Party. Besuche die Website, um einer Party beizutreten.</string>
-  <string name="forgot_pw_btn">Passwort vergessen</string>
-  <string name="tavern.inn.checkOut">Reaktiviere Deine täglichen Aufgaben</string>
-  <string name="tavern.inn.rest">Pausiere Deine täglichen Aufgaben</string>
-  <string name="reward.dialog.buy">Kaufen</string>
-  <string name="reward.dialog.dismiss">Ausblenden</string>
+    <string name="reminder_title">Vergiss nicht deine Aufgaben zu überprüfen</string>
+    <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</string>
+    <string name="forgot_pw_btn">Passwort vergessen</string>
+  <string name="tavern_inn_checkOut">Reaktiviere Deine täglichen Aufgaben</string>
+  <string name="tavern_inn_rest">Pausiere Deine täglichen Aufgaben</string>
+  <string name="reward_dialog_buy">Kaufen</string>
+  <string name="reward_dialog_dismiss">Ausblenden</string>
   <string name="party">Gruppe</string>
   <string name="chat">Chat</string>
   <string name="members">Mitglieder</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Tägliche Aufgaben</string>
   <string name="todos">To-Dos</string>
   <string name="rewards">Belohnungen</string>
-  <string name="taskform.delete.title">Bist Du sicher?</string>
-  <string name="taskform.delete.message">Wirklich löschen?</string>
-  <string name="yes">Ja</string>
+    <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="quest">Quest</string>
   <string name="avatar_body">Körper</string>
   <string name="avatar_hair">Haar</string>
   <string name="avatar_shirt">Shirt</string>
   <string name="avatar_skin">Haut</string>
-  <string name="avatar_ears">Tierohren</string>
-  <string name="avatar_base">hinten</string>
+    <string name="avatar_base">hinten</string>
   <string name="avatar_color">Farbe</string>
   <string name="avatar_beard">Bart</string>
   <string name="avatar_mustache">Schnurrbart</string>
   <string name="avatar_flower">Blume</string>
   <string name="avatar_bangs">Frisur vorne</string>
-  <string name="avatar_nothing">Nichts gesetzt</string>
-  <string name="avatar_size">Größe</string>
+    <string name="avatar_size">Größe</string>
   <string name="avatar_size_slim">Dünn</string>
   <string name="avatar_size_broad">Kräftig</string>
   <string name="avatar_background">Hintergrund</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Kaufen</string>
   <string name="purchase_set_title">Set %s kaufen</string>
   <string name="due_date">Frist</string>
-  <string name="quest.accept">Annehmen</string>
-  <string name="quest.reject">Ablehnen</string>
-  <string name="quest.begin">Quest starten</string>
-  <string name="quest.cancel">Einladung abbrechen</string>
-  <string name="quest.abort">Quest abbrechen</string>
-  <string name="quest.leave">Quest verlassen</string>
-  <string name="quest.pending">Ausstehend</string>
-  <string name="quest.accepted">Angenommen</string>
-  <string name="quest.rejected">Abgelehnt</string>
-  <string name="quest.participants">Teilnehmer</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="quest_accept">Annehmen</string>
+  <string name="quest_reject">Ablehnen</string>
+  <string name="quest_begin">Quest starten</string>
+  <string name="quest_cancel">Einladung abbrechen</string>
+  <string name="quest_abort">Quest abbrechen</string>
+    <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Hilfe &amp; FAQ</string>
   <string name="complete_tutorial">Verstanden!</string>
   <string name="dismiss_tutorial">Erinnere mich noch einmal</string>
   <string name="intro_1_subtitle">Willkommen bei</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
+    <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
   <string name="intro_2_subtitle">Fortschritt im Spiel</string>
   <string name="intro_2_title">Fortschritt im Leben</string>
   <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Triff dich mit Anderen</string>
   <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
   <string name="intro_finish_button">Fangen wir an!</string>
-  <string name="previous_button">Zurück</string>
-  <string name="next_button">Weiter</string>
+    <string name="next_button">Weiter</string>
   <string name="skip_button">Überspringen</string>
-  <string name="setup_welcome_description">Willkommen zu Habitica! Hier bedeutet Fortschritt im Spiel gleichzeitig Fortschritt im echten Leben! Während Du Ziele im echten Leben erreichst, wirst Du Ausrüstung, Haustiere, Quests und vieles mehr freischalten.</string>
-  <string name="setup_welcome_title">Willkommen</string>
-  <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
+    <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
   <string name="task_setup_description">Großartig! Woran möchtest Du zukünftig arbeiten?</string>
   <string name="setup_group_work">Arbeit</string>
   <string name="setup_group_exercise">Bewegung</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Lerne ein Handwerk</string>
   <string name="setup_task_creativity_2">An einem kreativem Projekt arbeiten</string>
   <string name="setup_task_creativity_3">Kreatives Projekt fertigstellen</string>
-  <string name="gem.purchase.support">Du möchtest helfen, Habitica am Laufen zu halten? Unterstütze die Entwickler, indem Du Edelsteine kaufst!\n\nMit Edelsteinen kannst Du lustige Extras kaufen, zum Beispiel:\n\n - Coole Kostüme für Deinen Avatar\n - Hübsche Hintergründe\n - Spannende Quests, um Haustiere freizuschalten\n - Die Möglichkeit, Deine Klasse schon vor Level 100 zu wechseln\n\nVielen, vielen Dank, dass Du hilfst, Habitica großartig zu machen. Deine Unterstützung bedeutet uns sehr viel!</string>
-  <string name="my_guilds">Meine Gilden</string>
+    <string name="my_guilds">Meine Gilden</string>
   <string name="public_guilds">Öffentliche Gilden</string>
   <string name="guild">Gilde</string>
   <string name="leave">Verlassen</string>
   <string name="join">Beitreten</string>
-  <string name="leader">Anführer</string>
-  <string name="gems">Edelsteine</string>
-  <string name="copy_as_todo">Als Aufgabe kopieren</string>
-  <string name="send_pm">PN senden</string>
-  <string name="flag">Melden</string>
-  <string name="delete">Löschen</string>
+    <string name="gems">Edelsteine</string>
+    <string name="delete">Löschen</string>
   <string name="name">Name</string>
   <string name="description">Beschreibung</string>
   <string name="add_tag">Tag hinzufügen</string>
   <string name="privacy">Privatsphäre</string>
   <string name="write_message">Nachricht schreiben</string>
-  <string name="post">posten</string>
-  <string name="guild_search_hint">Nach Gilden suchen</string>
-  <string name="todo_due">Bis: %s</string>
-  <string name="daily_streak">Aktuelle Serie: %d</string>
-  <string name="todo_has_duedate">Diese Aufgabe hat eine Frist</string>
-  <string name="battle_gear">Kampfausrüstung</string>
+    <string name="guild_search_hint">Nach Gilden suchen</string>
+    <string name="battle_gear">Kampfausrüstung</string>
   <string name="costume">Kostüm</string>
   <string name="outfit_head">Kopf</string>
   <string name="outfit_headAccessory">Kopfschmuck</string>
@@ -286,13 +224,9 @@
   <string name="armoireEquipment">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
   <string name="armoireFood">Du wühlst im Schrank herum und findest %1$s %2$s. Was macht das denn hier?</string>
   <string name="armoireExp">Du ringst mit dem verzauberten Schrank und gewinnst Erfahrung. Nimm das!</string>
-  <string name="armoireNotesFull">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
-  <string name="armoireLastItem">Du hast das letzte Stück der seltenen Ausrüstung im verzauberten Schrank gefunden.</string>
-  <string name="armoireNotesEmpty">Der Schrank wird jeden Monat neue Ausrüstung beinhalten. Bis dahin kannst Du weiterklicken um Erfahrung und Nahrung zu erhalten!</string>
-  <string name="sell">Verkaufen (%d Gold)</string>
+    <string name="sell">Verkaufen (%d Gold)</string>
   <string name="hatch_with_potion">Mit Elixier ausbrüten</string>
-  <string name="feed_to_pet">An Haustier verfüttern</string>
-  <string name="hatch_egg">Mit Ei ausbrüten</string>
+    <string name="hatch_egg">Mit Ei ausbrüten</string>
   <string name="invite_party">Party einladen</string>
   <string name="dialog_feeding">Füttere %s mit:</string>
   <string name="use_animal">Nutzen</string>
@@ -303,8 +237,7 @@
   <string name="close">Schließen</string>
   <string name="share">Teilen</string>
   <string name="notification_pet_fed">Du hast Dein/e/n %s gefüttert!</string>
-  <string name="notification_purchase">Du hast %s gekauft</string>
-  <string name="notification_purchase_reward">Du hast eine Belohnung gekauft</string>
+    <string name="notification_purchase_reward">Du hast eine Belohnung gekauft</string>
   <string name="world_quest">Weltenquest</string>
   <string name="inn_description">Brauchst du eine Pause? Kehre in Daniels Gasthaus ein, um ein paar von Habiticas schwierigeren Spielmechaniken zu pausieren:\n\n
 • Verpasste Tagesaufgaben fügen dir keinen Schaden zu\n
@@ -324,8 +257,7 @@
   <string name="healer_description">Heiler stehen Schaden unbeeindruckt gegenüber und erweitern diesen Schutz auf andere. Verpasste tägliche Aufgaben und schlechte Angewohnheiten schaden ihnen nicht viel und sie haben Mittel und Wege Lebenspunkte wiederherzustellen. Spiele einen Heiler, wenn Du gerne Anderen in Deiner Party hilfst, oder wenn es Dich besonders reizt, dem Tod durch harte Arbeit zu entkommen!</string>
   <string name="select_class">Klasse wählen</string>
   <string name="opt_out_class">Später entscheiden</string>
-  <string name="opt_out_description">Du willst keine Klasse oder möchtest Dich später entscheiden? Entscheide Dich später und werde zunächst ein Krieger ohne Spezialfähigkeiten. Du kannst später im Wiki etwas über das Klassensystem lesen und Deine Klasse jederzeit aktivieren.</string>
-  <string name="class_confirmation">Bist Du sicher, dass Du %s werden willst?</string>
+    <string name="class_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,23 +271,18 @@
   <string name="invite_existing_users">Nutzer einladen</string>
   <string name="send">Senden</string>
   <string name="invite">Freunde einladen</string>
-  <string name="invite_id_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit Hilfe ihrer Benutzer-ID ein.</string>
-  <string name="invite_username_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit ihrem Benutzernamen ein.</string>
+    <string name="invite_username_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit ihrem Benutzernamen ein.</string>
   <string name="invite_email_description">Wenn Freunde Habitica mit Hilfe Deiner E-Mail beitreten, werden sie automatisch zu Deiner Party eingeladen!</string>
   <string name="add_invites">Einladungen hinzufügen</string>
-  <string name="user_id">Benutzer-ID</string>
-  <string name="email">E-Mail</string>
-  <string name="invite_users">Zur Gruppe einladen</string>
-  <string name="share_using">Teilen via</string>
+    <string name="email">E-Mail</string>
+    <string name="share_using">Teilen via</string>
   <string name="share_levelup">Ich habe durch das Verbessern meiner realen Lebensgewohnheiten Level %d in Habitica erreicht!</string>
   <string name="share_hatched">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Haustier in Habitica ausgebrütet!</string>
   <string name="share_raised">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s Reittier in Habitica erhalten!</string>
   <string name="open_in_store">Im Play Store öffnen</string>
   <string name="change_class_confirmation">Bist Du sicher, dass Du Deine Klasse ändern willst? Es kostet 3 Edelsteine.</string>
   <string name="change_class_equipment_warning">Warnung: Du wirst nicht mehr Ausrüstung für die %s Klasse kaufen können.</string>
-  <string name="leaderMessage">Nachricht von %1$s</string>
-  <string name="leaderName">Führender: %1$s</string>
-  <string name="confirm">Bestätigen</string>
+    <string name="confirm">Bestätigen</string>
   <string name="market">Marktplatz</string>
   <string name="timeTravelers">Mysteriöse Zeitreisende</string>
   <string name="seasonalShop">Jahreszeitenmarkt</string>
@@ -363,37 +290,16 @@
   <string name="party_invite">Durch Einladen von Freunden freischalten</string>
   <string name="login_incentive">Freischalten durch regelmäßiges einloggen bei Habitica</string>
   <string name="create_account">Freischalten durch die Erstellung eines Kontos</string>
-  <string name="no_gold">Nicht genügend Gold</string>
-  <string name="no_potion">Du musst keinen Heiltrank kaufen</string>
-  <string name="successful_purchase">%1$s gekauft</string>
-  <string name="purchase_confirmation_title">Kauf bestätigen</string>
-  <string name="confirm_purchase_text">%1$s für %2$s %3$s kaufen</string>
-  <string name="gem">Edelstein</string>
-  <string name="hourglass">Sanduhr</string>
-  <string name="hourglasses">Sanduhren</string>
-  <string name="gold_singular">Gold</string>
-  <string name="gold_plural">Gold</string>
+    <string name="successful_purchase">%1$s gekauft</string>
+    <string name="gold_plural">Gold</string>
   <string name="chat_message_copied">Nachricht in Zwischenablage kopiert</string>
-  <string name="copy_chat_message">In Zwischenablage kopieren</string>
-  <string name="edit_tag_title">Tag bearbeiten</string>
-  <string name="edit_tag_btn_edit">Bearbeiten</string>
-  <string name="edit_tag_btn_done">Fertig</string>
-  <string name="edit_tag_btn_delete">Löschen</string>
-  <string name="confirm_delete_tag_title">Bist Du sicher?</string>
+    <string name="edit_tag_btn_edit">Bearbeiten</string>
+    <string name="confirm_delete_tag_title">Bist Du sicher?</string>
   <string name="confirm_delete_tag_message">Wirklich löschen?</string>
-  <string name="filter_drawer_edit_tags">Tags bearbeiten</string>
-  <string name="filter_drawer_filter_tags">Nach Tags filtern</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Lass Dich durch diesen QR Code von jemandem einladen</string>
-  <string name="qr_save_message">QR code gespeichert: </string>
-  <string name="qr_dialogue_title">Dein QR Code</string>
-  <string name="download">Download</string>
-  <string name="send_new_message">Neue Nachricht schicken</string>
-  <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
   <string name="action_continue">Weiter</string>
-  <string name="scan_qr_code">QR Code scannen</string>
-  <string name="enter_recipient_uuid">ID des Empfängers eingeben</string>
-  <string name="invited_to_party">Du wurdest in eine Party eingeladen!</string>
+    <string name="invited_to_party">Du wurdest in eine Party eingeladen!</string>
   <string name="stats_widget_label">Habitica: Avatar</string>
   <string name="add_task">Neue Aufgabe hinzufügen</string>
   <string name="add_habit">Neue Gewohnheit hinzufügen</string>
@@ -404,15 +310,14 @@
   <string name="widget_habit_button">Habitica: Gewohnheit</string>
   <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
   <string name="widget_todo_list">Habitica To-Do-Liste</string>
-  <string name="widget_add_task">Habitica: Neue Aufgabe</string>
-  <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden.</string>
-  <string name="gem.purchase.toolbartitle">Kaufen</string>
-  <string name="gem.purchase.title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
-  <string name="gem.purchase.subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
-  <string name="gem.purchase.listitem1">Coole Kostüme für Deinen Avatar</string>
-  <string name="gem.purchase.listitem2">Fantastische Hintergründe</string>
-  <string name="gem.purchase.listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
-  <string name="gem.purchase.listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
+    <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden.</string>
+  <string name="gem_purchase_toolbartitle">Kaufen</string>
+  <string name="gem_purchase_title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
+  <string name="gem_purchase_subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
+  <string name="gem_purchase_listitem1">Coole Kostüme für Deinen Avatar</string>
+  <string name="gem_purchase_listitem2">Fantastische Hintergründe</string>
+  <string name="gem_purchase_listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
+  <string name="gem_purchase_listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
   <string name="support_habitica">Unterstütze Habitica</string>
   <string name="skill_transformation_use">benutzen</string>
   <string name="hatching_market_info">Kriegst Du nicht die richtige Beute? Besuche den Marktplatz!</string>
@@ -426,28 +331,28 @@
   <string name="belongs_to_challenge">Gehört zur Herausforderung</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_title">Mit einem Abonnement unterstützt Du die Entwickler und den Betrieb von Habitica</string>
   <string name="subscribe_prompt">Werde Abonnent und du bekommst diese nützlichen Vorteile: </string>
-  <string name="subscribe.listitem1">Kaufe Edelsteine mit Gold</string>
-  <string name="subscribe.listitem2">Exklusive monatliche Gegenstände</string>
-  <string name="subscribe.listitem3">Zusätzliche Verlaufseinträge sichern</string>
-  <string name="subscribe.listitem4">Tägliches Beute-Limit verdoppelt</string>
+  <string name="subscribe_listitem1">Kaufe Edelsteine mit Gold</string>
+  <string name="subscribe_listitem2">Exklusive monatliche Gegenstände</string>
+  <string name="subscribe_listitem3">Zusätzliche Verlaufseinträge sichern</string>
+  <string name="subscribe_listitem4">Tägliches Beute-Limit verdoppelt</string>
   <string name="subscriptions">Abonnements</string>
   <string name="subscription_duration">Alle %s wiederholen</string>
   <string name="subscription_duration_norenew">Für %s</string>
   <string name="subscribe">Abonnieren</string>
-  <string name="subscribe.listitem1.description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
-  <string name="subscribe.listitem2.description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
-  <string name="subscribe.listitem3.description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
-  <string name="subscribe.listitem4.description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
+  <string name="subscribe_listitem1_description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
+  <string name="subscribe_listitem2_description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
+  <string name="subscribe_listitem3_description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
+  <string name="subscribe_listitem4_description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
   <string name="subscription_hourglasses">+%d Mystische Sanduhr</string>
   <string name="payment_method">Zahlungsmethode</string>
   <string name="subscription">Abonnement</string>
   <string name="active">Aktiv</string>
   <string name="due">Fällig</string>
   <string name="cancel_subscription">Abonnement kündigen</string>
-  <string name="cancel_subscription_google.description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
-  <string name="cancel_subscription_notgoogle.description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
+  <string name="cancel_subscription_google_description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
+  <string name="cancel_subscription_notgoogle_description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
   <string name="visit_habitica_website">Habitica-Internetseite besuchen</string>
   <string name="current_bonuses">Aktuelle Boni</string>
   <string name="months_subscribed">Abonnierte Monate</string>
@@ -462,56 +367,40 @@
   <string name="twelve_months">12 Monate</string>
   <string name="subscribe_prompt_thanks">Für das Abonnieren bekommst Du diese nützlichen Vorteile: </string>
   <string name="subscription_status">Abonnement Status</string>
-  <string name="byLeader">von %s</string>
-  <string name="challenge_details">Herausforderungsdetails</string>
-  <string name="challenge_leave_title">Herausforderung abbrechen</string>
+    <string name="challenge_leave_title">Herausforderung abbrechen</string>
   <string name="challenge_leave_text">Bist Du Dir sicher, dass du den die Herausforderung \"%s\" abbrechen willst?</string>
   <string name="challenge_remove_tasks_title">Aufgaben entfernen</string>
   <string name="challenge_remove_tasks_text">Willst du deine Aufgaben wirklich entfernen?</string>
   <string name="remove_tasks">Entfernen</string>
   <string name="keep_tasks">Behalten</string>
   <string name="my_challenges">Meine Herausforderungen</string>
-  <string name="public_challenges">Öffentlich</string>
-  <string name="challenges">Herausforderungen</string>
-  <string name="daily">Tägliche Aufgabe</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">Herausforderung</string>
-  <string name="go_to_challenge">Gehe zur Herausforderung</string>
-  <string name="not_part_of_a_challenge">Du nimmst im Moment an keiner Herausforderung teil!</string>
+    <string name="challenge">Herausforderung</string>
+    <string name="not_part_of_a_challenge">Du nimmst im Moment an keiner Herausforderung teil!</string>
   <string name="join_a_challenge">Trete einer Herausforderung bei, um ein ausgewähltes Set an 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 Herausforderungen zu finden, die am besten zu Dir passen!</string>
-  <string name="add_reminder">Erinnerung hinzufügen</string>
-  <string name="warning">Warnung</string>
-  <string name="open_settings">Einstellungen öffnen</string>
-  <string name="dont_keep_activities_warning">Es sieht so aus, als wäre die Entwickleroption \\"Aktivitäten nicht behalten\\" aktiviert. Momentan können dadurch Probleme in der Habitica App entstehen, deshalb empfehlen wir Dir, die Option zu deaktivieren.</string>
-  <string name="inbox">Nachrichten</string>
-  <string name="FAQ">Häufig gestellte Fragen</string>
-  <string name="special">Spezial</string>
+    <string name="inbox">Nachrichten</string>
+    <string name="special">Spezial</string>
   <string name="gem_for_gold_description">Weil Du Habitica abonnierst, kannst Du jeden Monat eine Anzahl von Edelsteinen mit Gold kaufen. </string>
-  <string name="limited_count">%d übrig</string>
-  <string name="gem_shop">Edelstein</string>
+    <string name="gem_shop">Edelstein</string>
   <string name="mystery_item">Überraschungsgegenstand</string>
   <string name="myster_item_notes">Jeden Monat bekommen Abonnenten einen Überraschungsgegenstand. Dieser wird üblicherweise circa eine Woche vor Ende des Monats veröffentlicht.</string>
   <string name="open">Öffnen</string>
-  <string name="notification_mystery_item">Du öffnest die Kiste und findest %s!</string>
-  <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
+    <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Deine nächste Belohnung wird nach %1$d Log-Ins freigeschalten </string>
   <string name="pending_approval">Zustimmung ausstehend</string>
   <string name="filters">Filter</string>
   <string name="done">Fertig</string>
-  <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
-  <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
-  <string name="groups">Gruppen</string>
+    <string name="groups">Gruppen</string>
   <string name="all">Alles</string>
   <string name="none">Nichts</string>
   <string name="owned">Im Besitz</string>
   <string name="not_owned">Nicht im Besitz</string>
-  <string name="new_game">Neues\nSpiel</string>
-  <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
+    <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
   <string name="login_btn_google">Mit Google-Konto einloggen</string>
   <string name="action_back">Zurück</string>
   <string name="welcome_text">Oh, Du musst neu hier sein. Ich bin Justin, der Stadtführer von Habitica./n/n Sag mir doch als erstes wie wir Dich nennen sollen! Du kannst jederzeit ändern was ich ausgesucht habe. Wenn Du damit fertig bist, lass uns Deinen Avatar erstellen!</string>
@@ -543,7 +432,6 @@
   <string name="reload_content">Inhalt erneut laden</string>
   <string name="dailyDueDefaultView">Setze die Standards der täglichen Aufgaben auf \"fällig\"</string>
   <string name="dailyDueDefaultViewDescription">Mit der Auswahl dieser Option werden Deine täglichen Aufgaben auf \"fällig\" zurückgesetzt, anstelle von \"all\"</string>
-  <string name="repeat_summary">%1$s wird jeden %2$s %3$s %4$s wiederholt</string>
   <string name="no_billing_gems">Mit deinem Zugangsgerät hast Du keinen Zugriff auf die möglichen Zahlungsmethoden. Bitte nutze die Habitica Website um Edelsteine zu kaufen.</string>
   <string name="no_billing_subscriptions">Mit deinem Zugangsgerät hast Du keinen Zugriff auf die möglichen Zahlungsmethoden. Bitte nutze die Habitica Website um ein Abonnement zu kaufen.</string>
   <string name="save">Speichern</string>
@@ -551,8 +439,7 @@
   <string name="gem_reward">Juwelen Preis</string>
   <string name="tasks">Aufgaben</string>
   <string name="create_challenge">Erstelle eine Herausforderung</string>
-  <string name="edit_challenge">Bearbeiten</string>
-  <string name="challenge_create_error_tavern_one_gem">Du benötigst mindestens 1 Juwel, um eine öffentliche Herausforderung zu erstellen.</string>
+    <string name="challenge_create_error_tavern_one_gem">Du benötigst mindestens 1 Juwel, um eine öffentliche Herausforderung zu erstellen.</string>
   <string name="challenge_create_error_enough_gems">Du hast nicht genug Edelsteine, um eine Herausforderung zu erstellen.</string>
   <string name="identify_your_challenge_with_a_tag">Gib deiner Herausforderung einen kurzen Namen</string>
   <string name="challenge_create_error_tag">Du brauchst einen kurzen Namen um diese Herausforderung zu erstellen.</string>
@@ -562,44 +449,38 @@
   <string name="new_challenge_title">Neuer Herausforderungstitel</string>
   <string name="ownership">Besitz</string>
   <string name="inn">Gasthaus</string>
-  <string name="system">System</string>
-  <string name="start_quest">Starte eine neue Quest</string>
+    <string name="start_quest">Starte eine neue Quest</string>
   <string name="leave_party">Party verlassen</string>
   <string name="party_description">Party-Beschreibung</string>
-  <string name="abort_confirmation">Bist Du Dir sicher, dass Du die Mission abbrechen möchtest? Die Mission wird für alle Mitglieder Deiner Party abgebrochen und Euer gesamter Fortschritt geht verloren. Die Questschriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
-  <string name="leave_quest_confirmation">Bist Du Dir sicher, dass Du die aktive Quest verlassen möchtest? Dein gesamter Fortschritt geht dabei verloren.</string>
-  <string name="number_participants">%1$d Teilnehmer</string>
+    <string name="number_participants">%1$d Teilnehmer</string>
   <string name="welcome_back">Willkommen zurück</string>
   <string name="yesterdaililes_prompt">Hast du gestern einige Deiner täglichen Aufgaben gemacht?</string>
   <string name="start_day">Starte meinen Tag</string>
   <string name="leave_party_confirmation">Bist Du sicher, dass Du die Party verlassen willst?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Nächste Belohnung in %d Check-Ins</string>
-  <string name="pending">Ausstehend</string>
+    <string name="pending">Ausstehend</string>
   <string name="accepted">Angenommen</string>
   <string name="declined">Abgelehnt</string>
   <string name="participants">Teilnehmer</string>
   <string name="invitations">Einladungen</string>
-  <string name="quest_leader_header" formatted="false">Begonnen von %s</string>
+  <string name="quest_leader_header">Begonnen von %s</string>
   <string name="quest_abort_message">Willst Du diese Mission wirklich abbrechen?
 Sie wird für alle Mitglieder Deiner Party abgebrochen und Euer gesamter Fortschritt geht verloren.
 Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
-  <string name="loading">Inhalt wird geladen…</string>
-  <string name="reloading_content">Inhalt wird erneut geladen</string>
+    <string name="reloading_content">Inhalt wird erneut geladen</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Dein Kontostand:</string>
-  <string name="available_until" formatted="false">Verfügbar bis  zum %s</string>
-  <string name="gems_left_max" formatted="false">Monatliche Edelsteine: %1$d/%2$d verbleibend</string>
-  <string name="gems_left_nomax" formatted="false">Monatliche Edelsteine: %d verbleibend</string>
+    <string name="available_until">Verfügbar bis  zum %s</string>
+  <string name="gems_left_max">Monatliche Edelsteine: %1$d/%2$d verbleibend</string>
+  <string name="gems_left_nomax">Monatliche Edelsteine: %d verbleibend</string>
   <string name="health">Gesundheit</string>
   <string name="collect">Sammel</string>
   <string name="rage_meter">Wut-Meter</string>
   <string name="boss_quest">Boss Aufgabe</string>
   <string name="collection_quest">Sammel Aufgabe</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Erfahrungspunkte</string>
-  <string name="gold_reward" formatted="false">%d Gold</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Erfahrungspunkte</string>
+  <string name="gold_reward">%d Gold</string>
   <string name="quest_owner_rewards">Quest-Besitzer Belohnungen</string>
   <string name="str_abbrv">STR</string>
   <string name="per_abbrv">WAH</string>
@@ -612,8 +493,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="reset_account_confirmation">Konto zurücksetzen</string>
   <string name="delete_account_confirmation">Mein Konto löschen</string>
   <string name="danger_zone">Gefahrenzone</string>
-  <string name="nevermind">Egal</string>
-  <string name="resetting_account">Konto zurücksetzen</string>
+    <string name="resetting_account">Konto zurücksetzen</string>
   <string name="deleting_account">Konto löschen</string>
   <string name="insufficientGold">Du musst mehr Aufgaben erledigen bevor du Dir dieses Item leisten kannst!</string>
   <string name="insufficientGoldTitle">Nicht genug Gold</string>
@@ -647,8 +527,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="authentication_summary">Ändere Deine Authentifizierungsoptionen.</string>
   <string name="change_password">Passwort ändern</string>
   <string name="change_email">E-Mail-Adresse ändern</string>
-  <string name="change_login_name">Login-Name ändern</string>
-  <string name="change_username">Benutzername ändern</string>
+    <string name="change_username">Benutzername ändern</string>
   <string name="change">Ändern</string>
   <string name="character_level">Charakterlevel</string>
   <string name="auto_allocate_points">Punkte automatisch verteilen</string>
@@ -669,7 +548,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="distribute_class">Auf Basis der eigenen Klasse verteilen</string>
   <string name="distribute_task">Nach Aufgabenaktivität verteilen</string>
   <string name="no_points_to_allocate">Keine Punkte zum Verteilen</string>
-  <string name="points_to_allocate" formatted="false">%d Punkte zum Verteilen</string>
+  <string name="points_to_allocate">%d Punkte zum Verteilen</string>
   <string name="distribute_evenly_help">Weist jedem Attribut die gleiche Anzahl an Punkten zu.</string>
   <string name="distribute_class_help">Weist den Attributen, die wichtig für Deine Klasse sind, mehr Punkte zu.</string>
   <string name="distribute_task_help">Weist Punkte nach den Eigenschaftskategorien zu, die mit den abgeschlossenen Aufgaben zusammenhängen.</string>
@@ -679,9 +558,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="classless">Klassenlos</string>
   <string name="class_equipment_shop_dialog">Dieser Gegenstand ist nur für eine bestimmte Klasse verfügbar.\nDu kannst Deine Klasse in den Einstellungen wechseln.</string>
   <string name="class_gear_disclaimer">Du kannst nur Ausrüstung für Deine aktuelle Klasse kaufen</string>
-  <string name="available_stats" formatted="false">%d Punkte</string>
-  <string name="toogle_emojis">Emojis ein-/ausschalten</string>
-  <string name="tavern_description">Willkommen im Gasthaus! Setze Dich dazu und chatte oder nimm Dir eine Pause von Deinen Aufgaben.</string>
+    <string name="tavern_description">Willkommen im Gasthaus! Setze Dich dazu und chatte oder nimm Dir eine Pause von Deinen Aufgaben.</string>
   <string name="check_into_inn">Im Gasthaus erholen</string>
   <string name="community_guidelines">Community-Richtlinien</string>
   <string name="view_community_guidelines">Community-Richtlinien ansehen</string>
@@ -695,19 +572,13 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="navigation_drawer_open">Öffne Navigationsleiste</string>
   <string name="navigation_drawer_close">Schließe Navigationsleiste</string>
   <string name="world_boss">Weltboss</string>
-  <string name="world_boss_art">Boss-Grafik</string>
-  <string name="boss_art">Boss-Grafik</string>
+    <string name="boss_art">Boss-Grafik</string>
   <string name="world_boss_description">Weltboss Beschreibung</string>
-  <string name="rage_strike_count" formatted="false">Wut-Angriff: %d/%d</string>
-  <string name="pending_strike_description">Dieser Angriff hat noch nicht stattgefunden!\nDer Weltboss einen unserer befreundeten Händler angreifen, sobald seine Wut-Anzeige voll ist. Erledige Deine Tagesaufgaben und versuche das zu verhindern!</string>
-  <string name="pending_strike_title">Ausstehender Angriff</string>
+  <string name="rage_strike_count">Wut-Angriff: %d/%d</string>
+    <string name="pending_strike_title">Ausstehender Angriff</string>
   <string name="strike_description_title">Was ist ein Wut-Angriff?</string>
-  <string name="strike_description_subtitle">Es gibt 3 mögliche Wut-Angriffe</string>
-  <string name="strike_description_description">Die Anzeige füllt sich, wenn Habiticaner ihre Tagesaufgaben nicht erledigen. Sobald sie gefüllt ist, wird der Entmutiger seine Niederschmetternde Herzschmerz-Attacke über einem von Habitica\'s Händlern entfesseln, also erledige lieber Deine Aufgaben!</string>
-  <string name="pending_strike_subtitle">Dieser Angriff wurde noch nicht ausgeführt!</string>
-  <string name="strike_active_title" formatted="false">%s wurde angegriffen!</string>
-  <string name="strike_active_subtitle" formatted="false">%s wurde das Herz gebrochen!</string>
-  <string name="strike_active_description" formatted="false">%s war am Boden zerstört, als der %s die %s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
+    <string name="strike_active_title">%s wurde angegriffen!</string>
+    <string name="strike_active_description">%s war am Boden zerstört, als der %s die %s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
   <string name="questShop">Quest Shop</string>
   <string name="market_owner_long">Alex der Händler</string>
   <string name="tavern_owner_long">Daniel der Gastwirt</string>
@@ -717,29 +588,21 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="no_party_description">haftbarBestreite Quests mit Freunden oder im Alleingang. Bekämpfe Monster, erstelle Herausforderungen und bleibe auf der Spur durch Gruppen.</string>
   <string name="no_party_title">Spiele Habitica in einer Party</string>
   <string name="join_party_description">Gib einem Party-Mitglied den Benutzernamen den Du unten finden kannst damit sie Dir eine Einladung senden können</string>
-  <string name="join_party_description_id">Gib ihnen Deine User ID oder lass sie Deinen QR Code scannen </string>
-  <string name="join_party_title">Willst Du einer Party beitreten?</string>
-  <string name="create_party_website">Öffne die Webseite, um eine Party zu erstellen</string>
-  <string name="id_copied">ID in Zwischenablage kopiert</string>
-  <string name="insufficientSubscriberGems">Du hast bereits die maximale Anzahl möglicher Edelsteine in diesem Monat gekauft. Neue Edelsteine werden innerhalb der ersten drei Tage jedes neuen Monats verfügbar. Danke für dein Abonnement!</string>
-  <string name="insufficientSubscriberGemsTitle">Monatliche Edelsteinobergrenze erreicht</string>
-  <string name="chat_message">Chat Nachricht</string>
-  <string name="world_boss_description_title">Was ist ein Weltboss?</string>
-  <string name="world_boss_description_description">Ein Weltboss ist ein spezielles Ereignis, bei dem die ganze Community zusammenarbeitet, um mit ihren Aufgaben ein mächtiges Monster zu besiegen!\nErledige Aufgaben, um dem Boss Schaden zuzufügen.\nDer Boss fügt Dir keinen Schaden für unerledigte Aufgaben zu, aber seine Raserei-Anzeige füllt sich. Wenn die Anzeige voll ist, wird der Boss einen unserer Ladenbesitzer angreifen!\nDu kannst weiterhin normale Questbosse bekämpfen;der Schaden wird beiden angerechnet.\nIn der Taverne kannst Du den Bosskampf-Fortschritt und die Raserei-Attacken einsehen.</string>
-  <string name="world_boss_description_intro">Ein Weltboss ist ein spezielles Ereignis, bei dem die ganze Community zusammenarbeitet, um mit ihren Aufgaben ein mächtiges Monster zu besiegen!</string>
+    <string name="join_party_title">Willst Du einer Party beitreten?</string>
+    <string name="insufficientSubscriberGems">Du hast bereits die maximale Anzahl möglicher Edelsteine in diesem Monat gekauft. Neue Edelsteine werden innerhalb der ersten drei Tage jedes neuen Monats verfügbar. Danke für dein Abonnement!</string>
+    <string name="world_boss_description_title">Was ist ein Weltboss?</string>
+    <string name="world_boss_description_intro">Ein Weltboss ist ein spezielles Ereignis, bei dem die ganze Community zusammenarbeitet, um mit ihren Aufgaben ein mächtiges Monster zu besiegen!</string>
   <string name="world_boss_description_1">Erledige Aufgaben, um dem Boss Schaden zuzufügen</string>
   <string name="world_boss_description_2">Der Boss fügt Dir keinen Schaden für unerledigte Aufgaben zu, aber seine Raserei-Anzeige steigt. Wenn sie gefüllt ist, greift der Boss einen der Ladenbesitzer an!</string>
   <string name="world_boss_description_3">Du kannst weiterhin gegen Questbosse kämpfen; der Schaden wird beiden angerechnet</string>
   <string name="world_boss_description_4">In der Taverne kannst Du den aktuellen Stand im Bosskampf und die Raserei-Attacken einsehen</string>
-  <string name="world_boss_action_prompt" formatted="false">Besiege den Boss, um spezielle Belohnungen zu erhalten und Habitica vom Terror des %ss zu befreien!</string>
-  <string name="world_boss_description_subtitle">%s greift an!</string>
-  <string name="questShop_owner_long">Ian der Questmeister</string>
+  <string name="world_boss_action_prompt">Besiege den Boss, um spezielle Belohnungen zu erhalten und Habitica vom Terror des %ss zu befreien!</string>
+    <string name="questShop_owner_long">Ian der Questmeister</string>
   <string name="seasonalShop_owner_long">Jahreszeitenzauberin</string>
   <string name="rage_attack">Raserei-Angriff:</string>
   <string name="tavern_description_world_boss">Ihr Lieben, kümmert Euch nicht um das Monster -- dies ist immer noch ein sicherer Platz für eine kleine Pause zum Chatten.</string>
   <string name="report">Melden</string>
-  <string name="like">Mag ich</string>
-  <string name="reply">Antworten</string>
+    <string name="reply">Antworten</string>
   <string name="challenge_prize">Herausforderungspreis</string>
   <string name="challenge_categories">Herausforderungskategorien</string>
   <string name="created_challenge">Erstellte Herausforderung</string>
@@ -770,7 +633,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="confirm_username">Benutzernamen bestätigen</string>
   <string name="username_not_confirmed">Benutzername nicht bestätigt</string>
   <string name="username_confirmed">Benutzername bestätigt</string>
-  <string name="enter_recipient_username">@ Benutzernamen eines Empfängers eingeben</string>
+  <string name="enter_recipient_username">\@ Benutzernamen eines Empfängers eingeben</string>
   <string name="username_copied">Benutzername in Zwischenablage kopiert</string>
   <string name="welcomeNameTitle">Wie sollen wir Dich nennen?</string>
   <string name="display_name_length_error">Anzeigenamen müssen zwischen 1 und 30 Zeichen lang sein</string>
@@ -785,9 +648,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="last_login">Letzte Anmeldung</string>
   <string name="total_checkins">Gesamtanmeldungen</string>
   <string name="two_handed">Zweihändig</string>
-  <string name="confirmUsername">Benutzernamen bestätigen</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
-  <string name="verification_pet">Eines dieser Veteranen-Haustiere wartet auf Dich wenn Du die Bestätigung abgeschlossen hast!</string>
+    <string name="verification_pet">Eines dieser Veteranen-Haustiere wartet auf Dich wenn Du die Bestätigung abgeschlossen hast!</string>
   <string name="gift_subscription">Abonnement verschenken</string>
   <string name="create_party">Gruppe erstellen</string>
   <string name="subscribe_gift_description">Möchtest Du jemandem die Vorteile eines Abos schenken\?</string>
@@ -806,16 +667,16 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="create">Erstellen</string>
   <string name="only_leader_create_challenge">Nur ein Gruppenleiter kann Wettbewerbe erstellen</string>
   <string name="opting_out_progress">Abmelden</string>
-  <string name="subscribe1month.gemcap">25 Edelstein Grenze</string>
-  <string name="subscribe3month.gemcap">30 Edelstein-Grenze</string>
-  <string name="subscribe6month.gemcap">35 Edelstein Grenze</string>
-  <string name="subscribe12month.gemcap">45 Edelstein Grenze</string>
-  <string name="delete_oauth_account_description">Bist du dir sicher\? Dies wird dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Du musst ein neues Konto erstellen um Habitica erneut nutzen zu können. Erreichte und ausgegebene Edelsteine werden nicht rückerstattet. Wenn du dir absolut sicher bist, schreibe DELETE in die untere Textb$
+  <string name="subscribe1month_gemcap">25 Edelstein Grenze</string>
+  <string name="subscribe3month_gemcap">30 Edelstein-Grenze</string>
+  <string name="subscribe6month_gemcap">35 Edelstein Grenze</string>
+  <string name="subscribe12month_gemcap">45 Edelstein Grenze</string>
+  <string name="delete_oauth_account_description">Bist du dir sicher\? Dies wird dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Du musst ein neues Konto erstellen um Habitica erneut nutzen zu können. Erreichte und ausgegebene Edelsteine werden nicht rückerstattet. Wenn du dir absolut sicher bist, schreibe DELETE in die untere Textbox.</string>
   <string name="daily_tip_7">Versuche Gegenstände aus dem Marktplatz an Deine Belohnungen anzuheften, um Dich zu motivieren sie Dir zu verdienen!</string>
   <string name="week_reminder_text">Pausen sind gesund, dennoch kannst du mit einfachen Aufgaben Punkte verdienen um Level aufzusteigen und coole Ausrüstung zu bekommen!</string>
   <string name="usernamePromptBody">Login Namen sind jetzt einzigartige Benutzernamen, welche sichtbar neben deinem Anzeigenamen sind und für Einladungen, Chat @Erwähnungen und Nachrichten benutzt werden.</string>
-  <string name="usernamePromptWiki">Wenn du mehr über diese Änderung erfahren möchtest, <a href="https://habitica.wikia.com/wiki/Player_Names">geh auf unsere Wiki.</a></string>
-  <string name="usernamePromptDisclaimer">Benutzernamen sollten mit unseren <a href="https://habitica.com/static/terms">Servicebedingungen</a> und <a href="https://habitica.com/static/community-guidelines">Gemeinschaftsleitlinien</a> übereinstimmen. Falls du vorher keinen Loginnamen festgelegt hast, wurde dein Benutzername auto-generiert.</string>
+  <string name="usernamePromptWiki">Wenn du mehr über diese Änderung erfahren möchtest, <a href="https://habitica.wikia_com/wiki/Player_Names">geh auf unsere Wiki.</a></string>
+  <string name="usernamePromptDisclaimer">Benutzernamen sollten mit unseren <a href="https://habitica.com/static/terms">Servicebedingungen</a> und <a href="https://habitica_com/static/community-guidelines">Gemeinschaftsleitlinien</a> übereinstimmen. Falls du vorher keinen Loginnamen festgelegt hast, wurde dein Benutzername auto-generiert.</string>
   <string name="confirm_username_description">Das Bestätigen deines Nutzernamens wird diesen öffentlich für Einladungen, @Erwähnungen und Nachrichten machen. Du kannst deinen Benutzernamen jederzeit in den Einstellungen ändern.</string>
   <string name="equipment_str">STR:</string>
   <string name="equipment_con">CON:</string>
diff --git a/Habitica/res/values-el/strings.xml b/Habitica/res/values-el/strings.xml
new file mode 100755
index 000000000..e5afe326a
--- /dev/null
+++ b/Habitica/res/values-el/strings.xml
@@ -0,0 +1,478 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Ανανέωση</string>
+  <string name="XP_default">Εμπειρία</string>
+  <string name="HP_default">Υγεία</string>
+  <string name="MP_default">Mana</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Ρυθμίσεις</string>
+  <string name="SP_address_hint">Ο προσαρμοσμένος server σας</string>
+  <string name="SP_userID_title">Ταυτότητα Χρήστη</string>
+  <string name="SP_userID_summary">Η Ταυτότητα Χρήστη σου</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Το API Token σου</string>
+  <string name="Language_title">Γλώσσα</string>
+  <string name="Language_summary">Άλλαξε τη γλώσσα του Habitica</string>
+  <string name="SP_user_qr_code">Ο QR Κωδικός σου</string>
+  <string name="PS_contact_title">Επικοινώνησε μαζί μου</string>
+  <string name="unknown_error">Προέκυψε ένα σφάλμα...</string>
+  <string name="pref_account_header">Λογαριασμός</string>
+  <string name="pref_first_day_of_the_week_title">Πρώτη Μέρα της Εβδομάδας</string>
+  <string name="pref_first_day_of_the_week_summary">Πρώτη Μέρα της Εβδομάδας σε όλα τα ημερολόγια</string>
+  <string name="pref_reminder_header">Ημερήσια Υπενθύμιση</string>
+  <string name="pref_reminder_checkbox">Ενεργοποίηση Υπενθύμισης</string>
+  <string name="pref_reminder_picker">Όρισε Ώρα Υπενθύμισης</string>
+  <string name="pref_cds_header">Προσαρμοσμένη Έναρξη Μέρας</string>
+  <string name="pref_cds_picker">Όρισε Προσαρμένη Ώρα Έναρξης Μέρας</string>
+  <string name="pref_push_notifications_checkbox">Ειδοποιήσεις Χρήστη</string>
+  <string name="push_notifications">Ειδοποιήσεις</string>
+  <string name="push_notifications_sum">Όρισε τις ρυθμίσεις ειδοποιήσεων</string>
+  <string name="preference_push_you_won_challenge">Κέρδισες μία Πρόκληση!</string>
+  <string name="preference_push_received_a_private_message">Έλαβες ένα Προσωπικό Μήνυμα</string>
+  <string name="preference_push_gifted_gems">Δωρισμένα Πετράδια</string>
+  <string name="preference_push_gifted_subscription">Δωρισμένη Συνδρομή</string>
+  <string name="preference_push_invited_to_party">Πρόσκληση σε Παρέα</string>
+  <string name="preference_push_invited_to_guild">Πρόσκληση σε Συντεχνία</string>
+  <string name="preference_push_your_quest_has_begun">Η Αποστολή σου ξεκίνησε</string>
+  <string name="preference_push_invited_to_quest">Πρόσκληση σε Αποστολή</string>
+  <!--Adding tasks-->
+  <string name="task_value">Αξία</string>
+  <string name="new_todo">Νέα Να-Κάνω</string>
+  <string name="new_reward">Νέα Ανταμοιβή</string>
+  <string name="new_daily">Νέα Ημερήσια</string>
+  <string name="new_habit">Νέα Συνήθεια</string>
+  <string name="action_edit">Επεξεργασία</string>
+  <string name="action_delete">Διαγραφή</string>
+  <string name="action_cancel">Ακύρωση</string>
+  <string name="login_btn">Είσοδος</string>
+  <string name="register_btn">Εγγραφή</string>
+  <string name="username">Όνομα Χρήστη</string>
+  <string name="email_username">Email ή Όνομα Χρήστη</string>
+  <string name="password">Κωδικός</string>
+  <string name="emailAddress">Διεύθυνση email</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">Παρακαλώ συνδέσου μέσω της εφαρμογής πρωτού χρησιμοποιήσεις το widget</string>
+  <string name="about.title">Σχετικά</string>
+  <string name="about.libraries">Βιβλιοθήκες</string>
+  <string name="about.versionhistory">Ιστορικό έκδοσης</string>
+  <string name="about.habitica_open_source">Η Habitica είναι διαθέσιμη ως λογισμικό ανοικτού κώδικα στο Github</string>
+  <string name="about.rate_our_app">Βαθμολόγησε την εφαρμογή μας</string>
+  <string name="about.give_us_feedback">Στείλτε μας τα Σχόλιά σας!</string>
+  <string name="about.bugreport">Ανάφερε ένα σφάλμα</string>
+  <string name="about.source_code">Πηγαίος Κώδικας</string>
+  <string name="repeatEvery">Επανάληψη Κάθε</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Σφάλμα Σύνδεσης</string>
+  <string name="network_error_no_network_body">Δεν είσαι συνδεδεμένος στο Διαδίκτυο</string>
+  <string name="internal_error_api">Φαίνεται να υπάρχει πρόβλημα με τον διακομιστή. Προσπάθησε αργότερα.</string>
+  <string name="authentication_error_title">Σφάλμα Πιστοποίησης</string>
+  <string name="authentication_error_body">Το Όνομα Χρήστη ή/και ο Κωδικός είναι εσφαλμένα.</string>
+  <string name="login_validation_error_title">Σφάλμα Επικύρωσης</string>
+  <string name="login_validation_error_fieldsmissing">Πρέπει να γεμίσεις όλα τα πεδία.</string>
+  <string name="save_changes">Αποθήκευση</string>
+  <string name="copy">Αντιγραφή</string>
+  <string name="notes">Σημειώσεις</string>
+  <string name="text">Κείμενο</string>
+  <string name="difficulty">Δυσκολία</string>
+  <string name="tags">Ετικέτες</string>
+  <string name="trivial">Ασήμαντο</string>
+  <string name="easy">Εύκολο</string>
+  <string name="medium">Μέτριο</string>
+  <string name="hard">Δύσκολο</string>
+  <string name="start_date">Ημέρα Έναρξης</string>
+  <string name="positive_habit_form">Θετικό (+)</string>
+  <string name="negative_habit_form">Αρνητικό (-)</string>
+  <string name="checklist">Λίστα</string>
+  <string name="reminders">Υπενθυμίσεις</string>
+  <string name="actions">Δράσεις</string>
+  <string name="attributes">Χαρακτηριστικά</string>
+  <string name="physical">Ισχύς</string>
+  <string name="mental">Ευφυΐα</string>
+  <string name="social">Κράση</string>
+  <string name="other">Φρόνηση</string>
+  <string name="frequency">Συχνότητα</string>
+  <string name="frequency_weekly">Συγκεκριμένες Μέρες της Εβδομάδας</string>
+  <string name="frequency_daily">Κάθε Χ μέρες</string>
+  <string name="repeatables_summary_title">Σύνοψη</string>
+  <string name="repeatables_title">Επαναλήψεις</string>
+  <string name="repeatables_on_title">Επαναλαμβάνεται</string>
+  <string name="repeatables_frequency_daily">Ημερήσια</string>
+  <string name="repeatables_frequency_weekly">Εβδομαδιαία</string>
+  <string name="repeatables_frequency_monthly">Μηνιαία</string>
+  <string name="repeatables_frequency_yearly">Ετήσια</string>
+  <string name="repeatables_frequency_day_of_month">Μέρα του Μήνα</string>
+  <string name="repeatables_frequency_day_of_week">Μέρα της Εβδομάδας</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">Έφτασες στο επίπεδο %1$d!</string>
+  <string name="levelup_button">Huzzah!</string>
+  <string name="faint_subtitle">Μην απελπίζεσαι!</string>
+  <string name="faint_header">Ξέμεινες από Ζωή!</string>
+  <string name="faint_button">Γέμισε Ζωή &amp; Προσπάθησε Ξανά</string>
+  <string name="filter">Φίλτρα</string>
+  <string name="profile_image">Εικόνα Προφίλ</string>
+  <string name="mana_price_button">%dΠΜ</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="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="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="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_background">Φόντο</string>
+  <string name="purchase_set_button">Ξεκλείδωσε το σετ για %d πετράδια</string>
+  <string name="purchase_button">Αγορά</string>
+  <string name="purchase_set_title">Αγορά σετ %s</string>
+  <string name="due_date">Ημερομηνία λήξης</string>
+  <string name="quest.accept">Αποδοχή</string>
+  <string name="quest.reject">Απόρριψη</string>
+  <string name="quest.begin">Έναρξη Αποστολής</string>
+  <string name="quest.cancel">Ακύρωση Πρόσκλησης</string>
+  <string name="quest.abort">Διακοπή Αποστολής</string>
+  <string name="quest.leave">Έξοδος από την Αποστολή</string>
+  <string name="quest.participants">Συμμετέχοντες</string>
+  <string name="version_info">Έκδοση %1$s (%2$d)</string>
+  <string name="sidebar_help">Βοήθεια &amp;Συχνές Ερωτήσεις</string>
+  <string name="complete_tutorial">Κατάλαβα!</string>
+  <string name="dismiss_tutorial">Υπενθύμισε μου ξανά</string>
+  <string name="intro_1_subtitle">Καλωσόρισες στο</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">Πρόοδος στο παιχνίδι</string>
+  <string name="intro_2_title">Πρόοδος στη ζωή</string>
+  <string name="intro_2_description">Ξεκλείδωσε ενέργειες στο παιχνίδι με την ολοκλήρωση των πραγματικών σου υποχρεώσεων. Κέρδισε πανοπλίες, κατοικίδια, και πολλά άλλα σαν ανταμοιβή για την εκπλήρωση των στόχων σου.</string>
+  <string name="intro_3_subtitle">Πολέμησε τέρατα</string>
+  <string name="intro_3_title">Κοινωνικοποιήσου</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_title">Καλωσόρισες</string>
+  <string name="setup_group_work">Εργασία</string>
+  <string name="setup_group_exercise">Άσκηση</string>
+  <string name="setup_group_health">Υγεία</string>
+  <string name="setup_group_school">Σχολείο</string>
+  <string name="setup_group_teams">Ομάδες</string>
+  <string name="setup_group_chores">Αγγαρείες</string>
+  <string name="setup_group_creativity">Δημιουργικότητα</string>
+  <string name="setup_task_work_1">Έλεγχος των email</string>
+  <string name="setup_task_school_1">Διάβασμα/Αναβολή</string>
+  <string name="setup_task_chores_2">Πλύσιμο Πιάτων</string>
+  <string name="setup_task_chores_3">Οργάνωση ντουλάπας</string>
+  <string name="gem.purchase.support">Θες να μας βοηθήσεις να κρατήσουμε το Habitica ζωντανό? Μπορείς να υποστηρίξεις τους developers αγοράζοντας πετράδια!\n\nΜε τα πετράδια μπορείς να αγοράσεις διασκεδαστικά πράγματα για το λογαριασμό σου, όπως: \n\n - Ωραία κουστούμια για το avatar σου\n - Μαγευτικά φόντα\n - Διασκεδαστικές αποστολές που σε ανταμείβουν με αυγά κατοικίδιων\n - Τη δυνατότητα να αλλάξεις κλάση πριν το επίπεδο 100\n\nΣας ευχαριστούμε πολύ που μας βοηθάτε να κάνουμε το Habitica το καλλίτερο που μπορεί να γίνει. Η βοήθειά σας σημαίνει πολλά για εμάς!</string>
+  <string name="my_guilds">Οι Συντεχνίες μου</string>
+  <string name="public_guilds">Δημόσιες Συντεχνίες</string>
+  <string name="guild">Συντεχνία</string>
+  <string name="leave">Αποχώρηση</string>
+  <string name="leader">Αρχηγός</string>
+  <string name="gems">Πετράδια</string>
+  <string name="send_pm">Αποστολή ΠΜ</string>
+  <string name="flag">Σημαία</string>
+  <string name="delete">Διαγραφή</string>
+  <string name="name">Όνομα</string>
+  <string name="description">Περιγραφή</string>
+  <string name="add_tag">Προσθήκη νέας ετικέτας</string>
+  <string name="privacy">Ιδιωτικότητα</string>
+  <string name="write_message">Εγγραφή Μηνύματος</string>
+  <string name="post">Ανάρτηση</string>
+  <string name="guild_search_hint">Ψάξε για Συντεχνίες</string>
+  <string name="todo_due">Λήγει:%s</string>
+  <string name="daily_streak">τρέχον σερί: %d</string>
+  <string name="todo_has_duedate">Η Υποχρέωση έχει Ημερομηνία Λήξης</string>
+  <string name="battle_gear">Εξοπλισμός Μάχης</string>
+  <string name="costume">Κουστούμι</string>
+  <string name="outfit_head">Κεφάλι</string>
+  <string name="outfit_headAccessory">Εξάρτημα κεφαλής</string>
+  <string name="outfit_eyewear">Οπτικά είδη</string>
+  <string name="outfit_armor">Πανοπλία</string>
+  <string name="outfit_back">Πλάτη</string>
+  <string name="outfit_body">Σώμα</string>
+  <string name="outfit_shield">Ασπίδα</string>
+  <string name="outfit_weapon">Όπλο</string>
+  <string name="wear_costume">Εφαρμογή Κουστουμιού</string>
+  <string name="equipped">Φορεμένο</string>
+  <string name="quest.invitation">Πρόσκληση σε Αποστολή</string>
+  <string name="quest.invitation.text">Σας έχουν προσκαλέσει σε μια αποστολή!</string>
+  <string name="ago_1day">πριν 1 ημ. </string>
+  <string name="ago_days">πριν %dημ.</string>
+  <string name="ago_1Minute">πριν 1 μήνα</string>
+  <string name="ago_minutes">πριν %dμήνες</string>
+  <string name="ago_hours">πριν %d ώρα</string>
+  <string name="ago_1hour"> πριν 1 ώρα</string>
+  <string name="today">Σήμερα</string>
+  <string name="sidebar_items">Αντικείμενα</string>
+  <string name="eggs">Αυγά</string>
+  <string name="hatching_potions">Φίλτρα εκκόλαψης</string>
+  <string name="food">Φαγητό</string>
+  <string name="quests">Αποστολές</string>
+  <string name="pets">Κατοικίδια</string>
+  <string name="mounts">Yποζύγια</string>
+  <string name="sell">Πώληση (%d Χρυσό)</string>
+  <string name="hatch_with_potion">Εκκόλαψη με φίλτρο</string>
+  <string name="feed_to_pet">Τάισε σε κατοικίδιο</string>
+  <string name="hatch_egg">Εκκόλαψη με αυγό</string>
+  <string name="invite_party">Πρόσκληση συντροφιάς</string>
+  <string name="dialog_feeding">Τάισε %1$s %2$s με:</string>
+  <string name="use_animal">Χρήση</string>
+  <string name="feed">Τάισε</string>
+  <string name="hatch_with">Εκκόλαψη κατοικίδιου με %s</string>
+  <string name="hatched_pet_title">Εκκόλαψες ένα %1$s %2$s!</string>
+  <string name="evolved_pet_title">Δάμασες το %1$s %2$s, πάμε μια βόλτα!</string>
+  <string name="close">Κλείσιμο</string>
+  <string name="share">Κοινοποίησε</string>
+  <string name="notification_pet_fed">Τάισες το %1$s %2$s σου!</string>
+  <string name="notification_purchase">Αγόρασες %s</string>
+  <string name="notification_purchase_reward">Αγόρασες μια ανταμοιβή</string>
+  <string name="sectionpremiumPets">Μαγικό Φίλτρο</string>
+  <string name="sectionquestPets">Αποστολή</string>
+  <string name="sectionspecialPets">Σπάνιο</string>
+  <string name="sectionpremiumMounts">Μαγικό Φίλτρο</string>
+  <string name="sectionquestMounts">Αποστολή</string>
+  <string name="sectionspecialMounts">Σπάνιο</string>
+  <string name="empty_items">Δεν έχεις %s</string>
+  <string name="user_level">Επίπεδο %d</string>
+  <string name="user_level_with_class">Επίπεδο %1$d %2$s</string>
+  <string name="warrior">Πολεμιστής</string>
+  <string name="rogue">Αγύρτης</string>
+  <string name="mage">Μάγος</string>
+  <string name="healer">Θεραπευτής</string>
+  <string name="select_class">Επέλεξε Κλάση</string>
+  <string name="class_confirmation">Σίγουρα θέλεις να είσαι ένας %s?</string>
+  <string name="class_changed">Τώρα είσαι ένας %s!</string>
+  <string name="choose_class">Διάλεξε Κλάση</string>
+  <string name="dialog_go_back">Πίσω</string>
+  <string name="change_class">Άλλαξε την κλάση σου</string>
+  <string name="change_class_description">Άλλαξε την κλάση σου και ξαναμοίρασε τους πόντους στατιστικών σου για 3 πετράδια.</string>
+  <string name="changing_class_progress">Αλλαγή Κλάσης</string>
+  <string name="by_email">Μέσω Email</string>
+  <string name="invite_existing_users">Πρόσκληση Υπαρκτών Χρηστών</string>
+  <string name="send">Στείλε</string>
+  <string name="invite">Κάλεσε φίλους</string>
+  <string name="invite_username_description">Αν έχετε φίλους που παίζουν ήδη το Habitica, καλέστε τους με το όνομα χρήστη τους εδώ.</string>
+  <string name="invite_email_description">Αν κάποιος φίλος σου εγγραφεί στο Habitica μέσω του email σου, θα ενταχθεί αυτόματα στη συντροφιά σου!</string>
+  <string name="add_invites">Προσθήκη Προσκλήσεων</string>
+  <string name="user_id">Ταυτότητα Χρήστη</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Προσκάλεσε στην παρέα</string>
+  <string name="share_using">Κοινή χρήση</string>
+  <string name="share_levelup">Έφτασα στο επίπεδο %d στο Habitica βελτιώνοντας τις συνήθειες μου στην πραγματική ζωή!</string>
+  <string name="share_hatched">Μόλις απέκτησα ένα %1$s %2$s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
+  <string name="share_raised">Μόλις κέρδισα ένα υποζύγιο%1$s %2$s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων!</string>
+  <string name="open_in_store">Άνοιγμα στο play store</string>
+  <string name="leaderMessage">Μήνυμα από τον %1$s</string>
+  <string name="leaderName">Αρχηγός: %1$s</string>
+  <string name="confirm">Επιβεβαίωση</string>
+  <string name="market">Αγορά</string>
+  <string name="timeTravelers">Χρονοταξιδευτές</string>
+  <string name="seasonalShop">Εποχιακό Κατάστημα</string>
+  <string name="empty_inbox">Δεν έχεις μηνύματα. Μπορείς να στείλεις νέο μήνυμα σε ένα χρήστη από τα μηνύματα δημόσιας συνομιλίας του!</string>
+  <string name="login_incentive">Ξεκλειδώνει με το να εισέρχεσαι στο Habitica τακτικά</string>
+  <string name="create_account">Ξεκλειδώνει με τη δημιουργία λογαριασμού</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="edit_tag_title">Επεξεργασία Ετικέτας</string>
+  <string name="edit_tag_btn_edit">Επεξεργασία</string>
+  <string name="edit_tag_btn_done">Ολοκληρώθηκε</string>
+  <string name="edit_tag_btn_delete">Διαγραφή</string>
+  <string name="confirm_delete_tag_title">Είσαι σίγουρος;</string>
+  <string name="confirm_delete_tag_message">Θες πραγματικά να διαγραφείς?</string>
+  <string name="filter_drawer_edit_tags">Επεξεργασία Ετικετών</string>
+  <string name="filter_drawer_filter_tags">Φίλτρο κατά Ετικέτα</string>
+  <!--QR Strings-->
+  <string name="qr_save_message">Ο κωδικός QR αποθηκεύτηκε στο</string>
+  <string name="qr_dialogue_title">Ο QR κωδικός σου</string>
+  <string name="download">Κατέβασε</string>
+  <string name="send_new_message">Στείλε καινούριο μήνυμα</string>
+  <string name="choose_recipient_title">Επέλεξε Παραλήπτη του Μηνύματος</string>
+  <string name="action_continue">Συνέχεια</string>
+  <string name="scan_qr_code">Σάρωση κωδικού QR</string>
+  <string name="stats_widget_label">Στατιστικά του Habitica</string>
+  <string name="add_task">Προσθήκη Υποχρέωσης</string>
+  <string name="add_habit">Προσθήκη Συνήθειας</string>
+  <string name="add_reward">Προσθήκη Ανταμοιβής</string>
+  <string name="widget_add_task">Habitica Πρόσθεσε Υποχρέωση</string>
+  <string name="google_services_missing">Οι υπηρεσίες Google play δεν βρέθηκαν.</string>
+  <string name="gem.purchase.toolbartitle">Αγορά</string>
+  <string name="gem.purchase.listitem3">Αποστολές που σε ανταμείβουν με αυγά κατοικίδιων</string>
+  <string name="open_market">Λαϊκή Αγορά</string>
+  <string name="AudioTheme_title">Θέμα Μουσικής</string>
+  <string name="AudioTheme_summary">Αλλαγή του Θέματος Μουσικής στο Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Τα λέμε αύριο!</string>
+  <string name="has_reminder">Έχει Υπενθύμιση</string>
+  <string name="has_tag">Έχει Ετικέτα</string>
+  <string name="subscribe.listitem1">Αγόρασε πετράδια με χρυσό</string>
+  <string name="subscriptions">Συνδρομές</string>
+  <string name="subscribe">Γίνε Συνδρομητής</string>
+  <string name="payment_method">Τρόπος πληρωμής</string>
+  <string name="subscription">Συνδρομή</string>
+  <string name="cancel_subscription">Ακύρωση Συνδρομής</string>
+  <string name="one_month">1 Μήνα</string>
+  <string name="months">%d Μήνες</string>
+  <string name="month">μήνας</string>
+  <string name="three_months">3 μήνες</string>
+  <string name="six_months">6 μήνες</string>
+  <string name="twelve_months">12 μήνες</string>
+  <string name="byLeader">κατά %s</string>
+  <string name="my_challenges">Οι Προκλήσεις μου</string>
+  <string name="public_challenges">Δημόσιο</string>
+  <string name="challenges">Προκλήσεις</string>
+  <string name="habit">Συνήθεια</string>
+  <string name="reward">Ανταμοιβή</string>
+  <string name="official">Επίσημο</string>
+  <string name="add_reminder">Προσθήκη Υπενθύμισης</string>
+  <string name="warning">Προειδοποίηση</string>
+  <string name="inbox">Μηνύματα</string>
+  <string name="FAQ">Συχνές Ερωτήσεις</string>
+  <string name="gem_shop">Πετράδι</string>
+  <string name="checkInRewardEarned">Κέρδισες ένα %1$s σαν ανταμοιβή για την αφοσίωση στη βελτίωση της ζωής σου.</string>
+  <string name="filters">Φίλτρα</string>
+  <string name="empty_title_habits">Δεν έχεις καμία συνήθεια</string>
+  <string name="empty_title_rewards">Δεν έχεις καμία ανταμοιβή</string>
+  <string name="save">Αποθήκευση</string>
+  <string name="location">Τοποθεσία</string>
+  <string name="tasks">Υποχρεώσεις</string>
+  <string name="create_challenge">Δημιουργία Πρόκλησης</string>
+  <string name="edit_challenge">Επεξεργασία</string>
+  <string name="description_optional">Περιγραφή (προαιρετικό)</string>
+  <string name="new_challenge_title">Τίτλος νέας Πρόκλησης</string>
+  <string name="system">Σύστημα</string>
+  <string name="start_quest">Έναρξη νέας Αποστολής</string>
+  <string name="party_description">Περιγραφή Συντροφιάς</string>
+  <string name="welcome_back">Καλωσόρισες Πίσω</string>
+  <string name="start_day">Η Μέρα μου ξεκινά</string>
+  <string name="your_balance">Το υπόλοιπό σου:</string>
+  <string name="available_until" formatted="false">Διαθέσιμο μέχρι %s</string>
+  <string name="gems_left_max" formatted="false">Μηνιαία Πετράδια: Απομένουν %1$d/%2$d</string>
+  <string name="gems_left_nomax" formatted="false">Μηνιαία Πετράδια: Απομένουν %d</string>
+  <string name="health">Υγεία</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%dπόντοι Εμπειρίας</string>
+  <string name="gold_reward" formatted="false">%dΧρυσό</string>
+  <string name="quest_owner_rewards">Ανταμοιβές Ιδιοκτήτη Αποστολής</string>
+  <string name="str_abbrv">ΙΣΧ</string>
+  <string name="per_abbrv">ΦΡΟ</string>
+  <string name="int_abbrv">ΕΥΦ</string>
+  <string name="con_abbrv">ΚΡΑ</string>
+  <string name="delete_account">Διαγραφή Λογαριασμού</string>
+  <string name="delete_account_confirmation">διαγραφή του λογαριασμού μου</string>
+  <string name="danger_zone">Περιοχή Κινδύνου</string>
+  <string name="deleting_account">Διαγραφή Λογαριασμού</string>
+  <string name="insufficientGems">Χρειάζεσαι περισσότερα Πετράδια για να αγοράσεις αυτό το αντικείμενο!</string>
+  <string name="purchase_gems">Αγορά Πετραδιών</string>
+  <string name="level">Επίπεδο</string>
+  <string name="stats">Στατιστικά</string>
+  <string name="fix_character_description">Αν έπεσες σε κάποιο σφάλμα ή έκανες κάποιο λάθος και άλλαξε άδικα ο χαρακτήρας σου, μπορείς να διορθώσεις χειροκίνητα τις τιμές εδώ.</string>
+  <string name="fix_character_values">Επιδιόρθωση Τιμών Χαρακτήρων</string>
+  <string name="forgot_password_title">Αποστολή με email μιας διεύθυνσης αλλαγής κωδικού.</string>
+  <string name="forgot_password_description">Εισήγαγε το email που χρησιμοποίησες για την εγγραφή σου στο Habitica.</string>
+  <string name="forgot_password_confirmation">Αν έχουμε καταχωρημένο το email σου, θα σου στείλουμε οδηγίες για να βάλεις νέο κωδικό.</string>
+  <string name="profile">Προφίλ</string>
+  <string name="about">Σχετικά</string>
+  <string name="app_settings">Ρυθμίσεις Εφαρμογής</string>
+  <string name="change_email">Αλλαγή διεύθυνσης Email</string>
+  <string name="change_username">Αλλαγή Όνομα Χρήστη</string>
+  <string name="change">Αλλαγή</string>
+  <string name="character_level">Επίπεδο Χαρακτήρα</string>
+  <string name="strength">Ισχύς</string>
+  <string name="intelligence">Ευφυΐα</string>
+  <string name="constitution">Κράση</string>
+  <string name="perception">Φρόνηση</string>
+  <string name="distribute_task_help">Τοποθέτησε πόντους με βάση την κατηγορία Ισχύς, Ευφυΐας, Κράσης, Φρόνησης σε σχέση με τις υποχρεώσεις που ολοκλήρωσες.</string>
+  <string name="classless">Χωρίς Κλάση</string>
+  <string name="available_stats" formatted="false">%d πόντοι</string>
+  <string name="helpful_links">Χρήσιμοι Σύνδεσμοι</string>
+  <string name="view_faq">Δες τις Συχνές Ερωτήσεις</string>
+  <string name="report_bug">Αναφορά Σφάλματος</string>
+  <string name="player_tiers">Βαθμίδες Παικτών</string>
+  <string name="staff_moderators">Προσωπικό και Διαχειριστές</string>
+  <string name="strike_active_title" formatted="false">Ο %s δέχτηκε Επίθεση!</string>
+  <string name="questShop">Κατάστημα Αποστολών</string>
+  <string name="market_owner_long">Alex ο Πραματευτής</string>
+  <string name="tavern_owner_long">Daniel ο ξενοδόχος</string>
+  <string name="stable_owner_long">Matt ο Θηριοδαμαστής</string>
+  <string name="no_party_title">Παίξε το Habitica σε μια Συντροφιά</string>
+  <string name="create_party_website">Άνοιξε την ιστοσελίδα για να δημιουργήσεις μια συντροφιά</string>
+  <string name="insufficientSubscriberGemsTitle">Συμπληρώθηκε το Μηνιαίο Όριο Πετραδιών</string>
+  <string name="chat_message">Μήνυμα συνομιλίας</string>
+  <string name="world_boss_description_subtitle">%s επιθέσεις!</string>
+  <string name="questShop_owner_long">Ian ο Οδηγός Αποστολών</string>
+  <string name="report">Αναφορά</string>
+  <string name="reply">Απάντηση</string>
+  <string name="challenge_prize">Έπαθλο Πρόκλησης</string>
+  <string name="challenge_categories">Κατηγορίες Προκλήσεων</string>
+  <string name="created_challenge">Δημιουργία Πρόκλησης</string>
+  <string name="public_challenge">Δημόσια Πρόκληση</string>
+  <string name="same_day_reminder_text">Όσο περισσότερα προσθέσεις, τόσο περισσότερα κερδίζεις. Ακόμη και μικρές συνήθειες προσθέτουν σε μεγάλες αλλαγές.</string>
+  <string name="daily_tip_7">Δοκίμασε να καρφιτσώσεις αντικείμενα από την Αγορά στις ανταμοιβές σου για να σε παρακινούν να τα κερδίσεις!</string>
+  <string name="daily_tip_8">Μπορείς να αλλάξεις τη δυσκολία τη υποχρέωσής σου για να πάρεις μεγαλύτερη ανταμοιβή για τις δυσκολότερες υποχρεώσεις σου!</string>
+  <string name="moderator">Διαχειριστής</string>
+  <string name="staff">Προσωπικό</string>
+  <string name="expand_notes">Περισσότερα</string>
+  <string name="collapse_notes">Λιγότερα</string>
+  <string name="last_login">Τελευταία είσοδος</string>
+  <string name="total_checkins">Σύνολο εισόδων</string>
+  <string name="two_handed">Δύο χεριών</string>
+  <string name="confirmUsername">Επιβεβαίωση Όνομα Χρήστη</string>
+  <string name="confirm_username_title">Είσαι σίγουρος για την επιβεβαίωση του τρέχον ονόματος χρήστη;</string>
+  <string name="cancel">Ακύρωση</string>
+  <string name="confirm_username">Επιβεβαίωση Όνομα Χρήστη</string>
+  <string name="username_not_confirmed">Το Όνομα Χρήστη δεν Επιβεβαιώθηκε</string>
+  <string name="username_confirmed">Το Όνομα Χρήστη Επιβεβαιώθηκε</string>
+  <string name="username_level">\@%s ・Επίπεδο %d</string>
+  <string name="welcomeNameTitle">Πώς να σε φωνάζουμε?</string>
+  <string name="display_name_length_error">Τα Ονόματα Εμφάνισης πρέπει να είναι από 1 μέχρι 30 χαρακτήρες</string>
+  <string name="setup_task_reward">Αντάμειψε τον εαυτό σου</string>
+  <string name="setup_task_reward_notes">Να δεις τηλεόραση, να παίξεις ένα παιχνίδι, να φας μια λιχουδιά, ότι θέλεις εσύ!</string>
+  <string name="equipment_str">ΙΣΧ:</string>
+  <string name="equipment_con">ΚΡΑ:</string>
+  <string name="equipment_int">ΕΥΦ:</string>
+  <string name="equipment_per">ΦΡΟ:</string>
+</resources>
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
index d058d7631..1ee1e270d 100644
--- a/Habitica/res/values-en-rGB/strings.profile.xml
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_qrcode_close">Close</string>
 
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index 4a423790c..275272e44 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tasks</string>
-  <string name="sidebar.skills">Skills</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.tavern">Tavern</string>
-  <string name="sidebar.party">Party</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>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipment</string>
-  <string name="sidebar.stable">Stable</string>
-  <string name="sidebar.news">News</string>
-  <string name="sidebar.settings">Settings</string>
-  <string name="sidebar.about">About</string>
+  <string name="sidebar_tasks">Tasks</string>
+  <string name="sidebar_skills">Skills</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_tavern">Tavern</string>
+  <string name="sidebar_party">Party</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>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipment</string>
+  <string name="sidebar_stable">Stable</string>
+  <string name="sidebar_news">News</string>
+    <string name="sidebar_about">About</string>
   <string name="sidebar_shops">Shops </string>
-<string name="sidebar.inbox">Messages</string>
+<string name="sidebar_inbox">Messages</string>
     <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.tutorial.xml b/Habitica/res/values-en-rGB/strings.tutorial.xml
index b8a4b5033..6a115f2c0 100644
--- a/Habitica/res/values-en-rGB/strings.tutorial.xml
+++ b/Habitica/res/values-en-rGB/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Buy gear for your avatar with the gold you earn!</string>
   <string name="tutorial_rewards_2">You can also make real-world Custom Rewards based on what motivates you.</string>
   <string name="tutorial_tasks_complete">That\'s all for now. If you need a reminder, check the FAQ section.</string>
-  <string name="tutorial_equipment">When you buy equipment, it appears here. Your Battle Gear affects your stats, and your Costume (if enabled) affects what your avatar wears.</string>
-  <string name="tutorial_items">Earn items by completing tasks and levelling up. Tap on an item to use it!</string>
-  <string name="tutorial_pets">As you complete real-world tasks, you now have a random chance of finding eggs and potions. Combine them to hatch pets</string>
-  <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
+    <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
   <string name="tutorial_party">This is where you and your friends can hold each other accountable to your goals and fight monsters with your tasks!</string>
   <string name="tutorial_tavern">Welcome to the Tavern, a public, all-ages chatroom! Here you can chat about productivity and ask questions. Have fun!</string>
-  <string name="tutorial_classes">Choose to become a Warrior, Mage, Healer, or Rogue! Each class has unique equipment and skills. Tap the (?) to learn more!</string>
-<string name="tutorial_stats">Tap the grey button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
+    <string name="tutorial_stats">Tap the grey button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index bb8393799..c680e7a27 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Experience</string>
   <string name="HP_default">Health</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferences couldn\'t be loaded from the barcode</string>
   <!--Prefs-->
   <string name="PS_settings_title">Settings</string>
-  <string name="SP_address_hint">Your custom server</string>
   <string name="SP_userID_title">User ID</string>
   <string name="SP_userID_summary">Your User ID</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Your API Token</string>
   <string name="Language_title">Language</string>
   <string name="Language_summary">Change Habitica\'s language</string>
-  <string name="SP_user_qr_code">Your QR Code</string>
   <string name="PS_contact_title">Contact me</string>
-  <string name="unknown_error">An error occurred…</string>
   <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
   <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
@@ -24,7 +20,6 @@
   <string name="pref_reminder_checkbox">Activate Reminder</string>
   <string name="pref_reminder_picker">Set Reminder Time</string>
   <string name="pref_cds_header">Custom Day Start</string>
-  <string name="pref_cds_picker">Set Custom Day Start Time</string>
   <string name="pref_push_notifications_checkbox">User Push Notifications</string>
   <string name="push_notifications">Push Notifications</string>
   <string name="push_notifications_sum">Set your push notifications settings</string>
@@ -37,13 +32,7 @@
   <string name="preference_push_your_quest_has_begun">Your Quest has Begun</string>
   <string name="preference_push_invited_to_quest">Invited to Quest</string>
   <!--Adding tasks-->
-  <string name="task_value">Value</string>
-  <string name="new_todo">New To-Do</string>
-  <string name="new_reward">New Reward</string>
-  <string name="new_daily">New Daily</string>
-  <string name="new_habit">New Habit</string>
   <string name="action_edit">Edit</string>
-  <string name="action_delete">Delete</string>
   <string name="action_cancel">Cancel</string>
   <string name="login_btn">Log in</string>
   <string name="register_btn">Register</string>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Confirm password</string>
   <string name="logout">Log out</string>
   <string name="logout_description">Log out of your account</string>
-  <string name="account_details">Account Details</string>
   <string name="LoginActivityName">Welcome</string>
-  <string name="string_revive">Revive</string>
-  <string name="please_connect">Please connect through the application before using a widget</string>
-  <string name="about.title">About</string>
-  <string name="about.libraries">Libraries</string>
-  <string name="about.versionhistory">Version history</string>
-  <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
-  <string name="about.rate_our_app">Rate our App</string>
-  <string name="about.give_us_feedback">Send us Feedback!</string>
-  <string name="about.bugreport">Report a Bug</string>
-  <string name="about.source_code">Source Code</string>
-  <string name="repeatEvery">Repeat Every</string>
+  <string name="about_title">About</string>
+  <string name="about_libraries">Libraries</string>
+  <string name="about_habitica_open_source">Habitica is available as open source software on Github</string>
+  <string name="about_rate_our_app">Rate our App</string>
+  <string name="about_give_us_feedback">Send us Feedback!</string>
+  <string name="about_bugreport">Report a Bug</string>
+  <string name="about_source_code">Source Code</string>
   <!--Network Errors-->
-  <string name="network_error_title">Connection Error</string>
-  <string name="network_error_no_network_body">You are not connected to the internet.</string>
   <string name="internal_error_api">There seems to be a problem with the server. Try again later.</string>
   <string name="authentication_error_title">Authentication Error</string>
-  <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
   <string name="login_validation_error_title">Validation Error</string>
   <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
   <string name="save_changes">Save</string>
   <string name="copy">Copy</string>
   <string name="notes">Notes</string>
-  <string name="text">Text</string>
   <string name="difficulty">Difficulty</string>
   <string name="tags">Tags</string>
   <string name="trivial">Trivial</string>
@@ -90,18 +70,7 @@
   <string name="negative_habit_form">Negative ( - )</string>
   <string name="checklist">Checklist</string>
   <string name="reminders">Reminders</string>
-  <string name="actions">Actions</string>
   <string name="attributes">Attributes</string>
-  <string name="physical">Strength</string>
-  <string name="mental">Intelligence</string>
-  <string name="social">Constitution</string>
-  <string name="other">Perception</string>
-  <string name="frequency">Frequency</string>
-  <string name="frequency_weekly">On Certain Days of the Week</string>
-  <string name="frequency_daily">Every X Days</string>
-  <string name="repeatables_summary_title">Summary</string>
-  <string name="repeatables_title">Repeats</string>
-  <string name="repeatables_on_title">Repeats On</string>
   <string name="repeatables_frequency_daily">Daily</string>
   <string name="repeatables_frequency_weekly">Weekly</string>
   <string name="repeatables_frequency_monthly">Monthly</string>
@@ -120,23 +89,14 @@
   <string name="faint_header">You ran out of Health!</string>
   <string name="faint_button">Refill Health &amp; Try Again</string>
   <string name="filter">Filter</string>
-  <string name="profile_image">Profile Image</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">You used %1$s for %2$d mana.</string>
   <string name="used_skill_without_mana">You used %1$s.</string>
   <string name="new_checklist_item">new checklist item</string>
-  <string name="add_checklist_item">Add</string>
-  <string name="skill_progress_title">Using Skill</string>
-  <string name="coming_soon">Coming Soon</string>
-  <string name="chat_flag_confirmation">Are you sure you want to report this message for violation?</string>
-  <string name="flag_confirm">Flag Message</string>
   <string name="unlock_lvl_11">Unlock at lvl 11</string>
-  <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
   <string name="forgot_pw_btn">Forgot Password</string>
-  <string name="tavern.inn.checkOut">Re-activate your Dailies</string>
-  <string name="tavern.inn.rest">Pause your Dailies</string>
-  <string name="reward.dialog.buy">Buy</string>
-  <string name="reward.dialog.dismiss">Dismiss</string>
+  <string name="tavern_inn_checkOut">Re-activate your Dailies</string>
+  <string name="tavern_inn_rest">Pause your Dailies</string>
+  <string name="reward_dialog_buy">Buy</string>
+  <string name="reward_dialog_dismiss">Dismiss</string>
   <string name="party">Party</string>
   <string name="chat">Chat</string>
   <string name="members">Members</string>
@@ -144,8 +104,6 @@
   <string name="dailies">Dailies</string>
   <string name="todos">To-Dos</string>
   <string name="rewards">Rewards</string>
-  <string name="taskform.delete.title">Are you sure?</string>
-  <string name="taskform.delete.message">Do you really want to delete?</string>
   <string name="yes">Yes</string>
   <string name="no">No</string>
   <string name="quest">Quest</string>
@@ -153,14 +111,12 @@
   <string name="avatar_hair">Hair</string>
   <string name="avatar_shirt">Shirt</string>
   <string name="avatar_skin">Skin</string>
-  <string name="avatar_ears">Animal Ears</string>
   <string name="avatar_base">Base</string>
   <string name="avatar_color">Colour</string>
   <string name="avatar_beard">Beard</string>
   <string name="avatar_mustache">Moustache</string>
   <string name="avatar_flower">Flower</string>
   <string name="avatar_bangs">Bangs</string>
-  <string name="avatar_nothing">Nothing set</string>
   <string name="avatar_size">Size</string>
   <string name="avatar_size_slim">Slim</string>
   <string name="avatar_size_broad">Broad</string>
@@ -170,22 +126,16 @@
   <string name="purchase_button">Purchase</string>
   <string name="purchase_set_title">Purchase set %s</string>
   <string name="due_date">Due Date</string>
-  <string name="quest.accept">Accept</string>
-  <string name="quest.reject">Reject</string>
-  <string name="quest.begin">Begin Quest</string>
-  <string name="quest.cancel">Cancel Invitation</string>
-  <string name="quest.abort">Abort Quest</string>
-  <string name="quest.leave">Leave Quest</string>
-  <string name="quest.pending">Pending</string>
-  <string name="quest.accepted">Accepted</string>
-  <string name="quest.rejected">Rejected</string>
-  <string name="quest.participants">Participants</string>
+  <string name="quest_accept">Accept</string>
+  <string name="quest_reject">Reject</string>
+  <string name="quest_begin">Begin Quest</string>
+  <string name="quest_cancel">Cancel Invitation</string>
+  <string name="quest_abort">Abort Quest</string>
   <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Help &amp; FAQ</string>
   <string name="complete_tutorial">Got it!</string>
   <string name="dismiss_tutorial">Remind me again</string>
   <string name="intro_1_subtitle">Welcome to</string>
-  <string name="intro_1_title">Habitica</string>
   <string name="intro_1_description">It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
   <string name="intro_2_subtitle">Progress in the game</string>
   <string name="intro_2_title">Progress in life</string>
@@ -194,11 +144,8 @@
   <string name="intro_3_title">Get social</string>
   <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
   <string name="intro_finish_button">Let\'s start!</string>
-  <string name="previous_button">Previous</string>
   <string name="next_button">Next</string>
   <string name="skip_button">Skip</string>
-  <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
-  <string name="setup_welcome_title">Welcome</string>
   <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
   <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
   <string name="setup_group_work">Work</string>
@@ -229,28 +176,19 @@
   <string name="setup_task_creativity_1">Study a master of the craft</string>
   <string name="setup_task_creativity_2">Work on creative project</string>
   <string name="setup_task_creativity_3">Finish creative project</string>
-  <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
   <string name="my_guilds">My Guilds</string>
   <string name="public_guilds">Public Guilds</string>
   <string name="guild">Guild</string>
   <string name="leave">Leave</string>
   <string name="join">Join</string>
-  <string name="leader">Leader</string>
   <string name="gems">Gems</string>
-  <string name="copy_as_todo">Copy as To-Do</string>
-  <string name="send_pm">Send PM</string>
-  <string name="flag">Flag</string>
   <string name="delete">Delete</string>
   <string name="name">Name</string>
   <string name="description">Description</string>
   <string name="add_tag">Add new Tag</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Write Message</string>
-  <string name="post">Post</string>
   <string name="guild_search_hint">Search for guilds</string>
-  <string name="todo_due">Due: %s</string>
-  <string name="daily_streak">current streak: %d</string>
-  <string name="todo_has_duedate">Task has Due Date</string>
   <string name="battle_gear">Battle Gear</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Head</string>
@@ -264,8 +202,6 @@
   <string name="wear_costume">Wear Costume</string>
   <string name="equipped">Equipped</string>
   <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
-  <string name="quest.invitation">Quest Invitation</string>
-  <string name="quest.invitation.text">You have been invited to participate in a quest!</string>
   <string name="today">Today</string>
   <string name="sidebar_items">Items</string>
   <string name="eggs">Eggs</string>
@@ -277,12 +213,8 @@
   <string name="armoireEquipment">You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
   <string name="armoireFood">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
   <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
-  <string name="armoireNotesFull">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
-  <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
-  <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
   <string name="sell">Sell (%d Gold)</string>
   <string name="hatch_with_potion">Hatch with potion</string>
-  <string name="feed_to_pet">Feed to pet</string>
   <string name="hatch_egg">Hatch with egg</string>
   <string name="invite_party">Invite party</string>
   <string name="dialog_feeding">Feed %s with:</string>
@@ -306,7 +238,6 @@
   <string name="healer_description">Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don\'t faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!</string>
   <string name="select_class">Select Class</string>
   <string name="opt_out_class">Opt Out</string>
-  <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
   <string name="class_confirmation">Are you sure you want to be a %s?</string>
   <string name="class_changed">You are now a %s!</string>
   <string name="class_changed_description">You have new default Battle Gear that you can change under Equipment!</string>
@@ -320,12 +251,9 @@
   <string name="invite_existing_users">Invite Existing Users</string>
   <string name="send">Send</string>
   <string name="invite">Invite Friends</string>
-  <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
   <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
   <string name="add_invites">Add Invites</string>
-  <string name="user_id">User ID</string>
   <string name="email">Email</string>
-  <string name="invite_users">Invite to Party</string>
   <string name="share_using">Share using</string>
   <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>
@@ -333,43 +261,20 @@
   <string name="open_in_store">Open in Play Store</string>
   <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
   <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
-  <string name="leaderMessage">Message from %1$s</string>
-  <string name="leaderName">Leader: %1$s</string>
   <string name="confirm">Confirm</string>
   <string name="market">Market</string>
   <string name="timeTravelers">Time Travellers</string>
   <string name="seasonalShop">Seasonal Shop</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">Purchased %1$s</string>
-  <string name="purchase_confirmation_title">Confirm purchase</string>
-  <string name="confirm_purchase_text">Purchase %1$s for %2$s %3$s</string>
-  <string name="gem">gem</string>
-  <string name="hourglass">hourglass</string>
-  <string name="hourglasses">hourglasses</string>
-  <string name="gold_singular">gold</string>
   <string name="gold_plural">gold</string>
   <string name="chat_message_copied">Message copied to Clipboard</string>
-  <string name="copy_chat_message">Copy to clipboard</string>
-  <string name="edit_tag_title">Edit Tag</string>
   <string name="edit_tag_btn_edit">Edit</string>
-  <string name="edit_tag_btn_done">Done</string>
-  <string name="edit_tag_btn_delete">Delete</string>
   <string name="confirm_delete_tag_title">Are you sure?</string>
   <string name="confirm_delete_tag_message">Do you really want to delete?</string>
-  <string name="filter_drawer_edit_tags">Edit Tags</string>
-  <string name="filter_drawer_filter_tags">Filter by Tags</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Have someone invite you with this QR Code</string>
-  <string name="qr_save_message">QR Code saved at</string>
-  <string name="qr_dialogue_title">Your QR Code</string>
-  <string name="download">Download</string>
-  <string name="send_new_message">Send new message</string>
   <string name="choose_recipient_title">Choose Message Recipient</string>
   <string name="action_continue">Continue</string>
-  <string name="scan_qr_code">Scan QR Code</string>
-  <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
   <string name="invited_to_party">You were invited to join a party!</string>
   <string name="stats_widget_label">Habitica Stats</string>
   <string name="add_task">Add Task</string>
@@ -381,15 +286,14 @@
   <string name="widget_habit_button">Habitica Do Habit</string>
   <string name="widget_dailies">Habitica Dailies</string>
   <string name="widget_todo_list">Habitica To-Do List</string>
-  <string name="widget_add_task">Habitica Add Task</string>
   <string name="google_services_missing">Google Play services could not be found.</string>
-  <string name="gem.purchase.toolbartitle">Purchase</string>
-  <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
-  <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for your account, including:</string>
-  <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
-  <string name="gem.purchase.listitem2">Awesome backgrounds</string>
-  <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
-  <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
+  <string name="gem_purchase_toolbartitle">Purchase</string>
+  <string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+  <string name="gem_purchase_subtitle">Gems allow you to buy fun extras for your account, including:</string>
+  <string name="gem_purchase_listitem1">Cool costumes for your avatar</string>
+  <string name="gem_purchase_listitem2">Awesome backgrounds</string>
+  <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>
+  <string name="gem_purchase_listitem4">The ability to change your class before level 100</string>
   <string name="support_habitica">Support Habitica</string>
   <string name="skill_transformation_use">use</string>
   <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -403,26 +307,26 @@
   <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_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="subscribe_listitem1">Buy gems with gold</string>
+  <string name="subscribe_listitem2">Exclusive monthly items</string>
+  <string name="subscribe_listitem3">Retain additional history entries</string>
+  <string name="subscribe_listitem4">Daily drop-caps doubled</string>
   <string name="subscriptions">Subscriptions</string>
   <string name="subscription_duration">Recurring every %s</string>
   <string name="subscribe">Subscribe</string>
-  <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-  <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travellers 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="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 Travellers 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="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="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>
@@ -437,8 +341,6 @@
   <string name="twelve_months">12 months</string>
   <string name="subscribe_prompt_thanks">For Subscribing, you are receiving these useful benefits:</string>
   <string name="subscription_status">Subscription Status</string>
-  <string name="byLeader">by %s</string>
-  <string name="challenge_details">Challenge Details</string>
   <string name="challenge_leave_title">Leave Challenge</string>
   <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
   <string name="challenge_remove_tasks_title">Remove tasks</string>
@@ -446,45 +348,31 @@
   <string name="remove_tasks">Remove</string>
   <string name="keep_tasks">Keep</string>
   <string name="my_challenges">My Challenges</string>
-  <string name="public_challenges">Public</string>
-  <string name="challenges">Challenges</string>
   <string name="daily">Daily</string>
   <string name="habit">Habit</string>
   <string name="reward">Reward</string>
   <string name="todo">To-Do</string>
   <string name="official">Official</string>
-  <string name="participating">Participating</string>
   <string name="challenge">Challenge</string>
-  <string name="go_to_challenge">Go to Challenge</string>
   <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
   <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
   <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
-  <string name="add_reminder">Add Reminder</string>
-  <string name="warning">Warning</string>
-  <string name="open_settings">Open Settings</string>
-  <string name="dont_keep_activities_warning">It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the Habitica app, so we suggest disabling it.</string>
-  <string name="FAQ">Frequently Asked Questions</string>
   <string name="special">Special</string>
   <string name="gem_for_gold_description">Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.</string>
-  <string name="limited_count">%d left</string>
   <string name="gem_shop">Gem</string>
   <string name="mystery_item">Mystery Item</string>
   <string name="myster_item_notes">Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month.</string>
   <string name="open">Open</string>
-  <string name="notification_mystery_item">You open the box and find %s!</string>
   <string name="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Your next prize unlocks at %1$d Check-Ins</string>
   <string name="pending_approval">pending approval</string>
   <string name="filters">Filters</string>
   <string name="done">Done</string>
-  <string name="group_tasks_edit_description">Group tasks cannot be edited.</string>
-  <string name="group_tasks_edit_title">Can\'t edit this task</string>
   <string name="groups">Groups</string>
   <string name="all">All</string>
   <string name="none">None</string>
   <string name="owned">Owned</string>
   <string name="not_owned">Not owned</string>
-  <string name="new_game">New\nGame</string>
   <string name="login_btn_fb">Log in with Facebook</string>
   <string name="login_btn_google">Log in with Google</string>
   <string name="action_back">Back</string>
@@ -515,7 +403,6 @@
   <string name="reload_content">Reload Content</string>
   <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
   <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
-  <string name="repeat_summary">Repeats %1$s every %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Your device does not have any of the supported payment methods. Please use the Habitica website if you want to purchase gems.</string>
   <string name="no_billing_subscriptions">Your device does not have any of the supported payment methods. Please use the Habitica website if you want to purchase a subscription.</string>
   <string name="save">Save</string>
@@ -528,41 +415,36 @@
   <string name="new_challenge_title">New challenge title</string>
   <string name="ownership">Ownership</string>
   <string name="inn">Inn</string>
-  <string name="system">System</string>
   <string name="start_quest">Start a new Quest</string>
   <string name="leave_party">Leave Party</string>
   <string name="party_description">Party Description</string>
-  <string name="abort_confirmation">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
-  <string name="leave_quest_confirmation">Are you sure you want to leave the active quest? All your quest progress will be lost.</string>
   <string name="number_participants">%1$d Participants</string>
   <string name="welcome_back">Welcome Back</string>
   <string name="yesterdaililes_prompt">Did you do any of these Dailies yesterday?</string>
   <string name="start_day">Start My Day</string>
   <string name="leave_party_confirmation">Are you sure you want to leave the Party?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Next Prize in %d Check-ins</string>
   <string name="pending">Pending</string>
   <string name="accepted">Accepted</string>
   <string name="declined">Declined</string>
   <string name="participants">Participants</string>
   <string name="invitations">Invitations</string>
-  <string name="quest_leader_header" formatted="false">Started by %s</string>
+  <string name="quest_leader_header">Started by %s</string>
   <string name="quest_abort_message">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
   <string name="reloading_content">Reloading Content</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Your balance:</string>
-  <string name="available_until" formatted="false">Available until %s</string>
-  <string name="gems_left_max" formatted="false">Monthly Gems: %1$d/%2$d Remaining</string>
-  <string name="gems_left_nomax" formatted="false">Monthly Gems: %d Remaining</string>
+  <string name="available_until">Available until %s</string>
+  <string name="gems_left_max">Monthly Gems: %1$d/%2$d Remaining</string>
+  <string name="gems_left_nomax">Monthly Gems: %d Remaining</string>
   <string name="health">Health</string>
   <string name="collect">Collect</string>
   <string name="rage_meter">Rage Meter</string>
   <string name="boss_quest">Boss Quest</string>
   <string name="collection_quest">Collection Quest</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Experience points</string>
-  <string name="gold_reward" formatted="false">%d Gold</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Experience points</string>
+  <string name="gold_reward">%d Gold</string>
   <string name="quest_owner_rewards">Quest Owner Rewards</string>
   <string name="reset_account">Reset Account</string>
   <string name="reset_account_description">WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.\n\nYou will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.</string>
@@ -571,7 +453,6 @@
   <string name="reset_account_confirmation">reset my account</string>
   <string name="delete_account_confirmation">delete my account</string>
   <string name="danger_zone">Danger Zone</string>
-  <string name="nevermind">Never mind</string>
   <string name="resetting_account">Resetting Account</string>
   <string name="deleting_account">Deleting Account</string>
   <string name="levelup_header">You Reached Level %1$d!</string>
@@ -585,17 +466,8 @@
   <string name="ago_minutes">%dm ago</string>
   <string name="ago_hours">%dh ago</string>
   <string name="ago_1hour">1h ago</string>
-  <string name="evolved_pet_title">You have tamed %1$s %2$s, let\'s go for a ride!</string>
-  <string name="notification_purchase">You purchased %s</string>
+  <string name="evolved_pet_title">You have tamed %s, let\'s go for a ride!</string>
   <string name="notification_purchase_reward">You purchased a reward</string>
-  <string name="sectionpets">Standard</string>
-  <string name="sectionpremiumPets">Magic Potion</string>
-  <string name="sectionquestPets">Quest</string>
-  <string name="sectionspecialPets">Rare</string>
-  <string name="sectionmounts">Standard</string>
-  <string name="sectionpremiumMounts">Magic Potion</string>
-  <string name="sectionquestMounts">Quest</string>
-  <string name="sectionspecialMounts">Rare</string>
   <string name="inn_description">Need a break\? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:
 \n
 \n • Missed Dailies won’t damage you
@@ -610,10 +482,10 @@
   <string name="login_incentive">Unlock by logging into Habitica regularly</string>
   <string name="create_account">Unlock by creating an account</string>
   <string name="subscription_duration_norenew">For %s</string>
-  <string name="subscribe1month.gemcap">25 Gem cap</string>
-  <string name="subscribe3month.gemcap">30 Gem cap</string>
-  <string name="subscribe6month.gemcap">35 Gem cap</string>
-  <string name="subscribe12month.gemcap">45 Gem cap</string>
+  <string name="subscribe1month_gemcap">25 Gem cap</string>
+  <string name="subscribe3month_gemcap">30 Gem cap</string>
+  <string name="subscribe6month_gemcap">35 Gem cap</string>
+  <string name="subscribe12month_gemcap">45 Gem cap</string>
   <string name="due">Due</string>
   <string name="inbox">Messages</string>
   <string name="welcome_text">Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.
@@ -622,11 +494,9 @@
   <string name="dated">Scheduled</string>
   <string name="gem_reward">Gem prize</string>
   <string name="create_challenge">Create Challenge</string>
-  <string name="edit_challenge">Edit</string>
   <string name="challenge_create_error_tavern_one_gem">You need at least 1 gem to create a public challenge.</string>
   <string name="identify_your_challenge_with_a_tag">Identify your challenge with a short name</string>
   <string name="challenge_create_error_tag">You need a short name to create this Challenge.</string>
-  <string name="loading">Loading…</string>
   <string name="str_abbrv">Str</string>
   <string name="per_abbrv">Per</string>
   <string name="int_abbrv">Int</string>
@@ -663,7 +533,6 @@
   <string name="authentication_summary">Change your authentication options.</string>
   <string name="change_password">Change Password</string>
   <string name="change_email">Change Email Address</string>
-  <string name="change_login_name">Change Login Name</string>
   <string name="change_username">Change Username</string>
   <string name="change">Change</string>
   <string name="character_level">Character Level</string>
@@ -685,7 +554,7 @@
   <string name="distribute_class">Distribute based on class</string>
   <string name="distribute_task">Distribute based on task activity</string>
   <string name="no_points_to_allocate">No points to Allocate</string>
-  <string name="points_to_allocate" formatted="false">%d Points to Allocate</string>
+  <string name="points_to_allocate">%d Points to Allocate</string>
   <string name="distribute_evenly_help">Assigns the same number of points to each attribute.</string>
   <string name="distribute_class_help">Assigns more points to the attributes important to your Class.</string>
   <string name="distribute_task_help">Assigns points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.</string>
@@ -696,8 +565,6 @@
   <string name="class_equipment_shop_dialog">This item is only available to a specific class.
 \nYou can change your class from Settings.</string>
   <string name="class_gear_disclaimer">You can only purchase gear for your current class</string>
-  <string name="available_stats" formatted="false">%d points</string>
-  <string name="toogle_emojis">Toggle Emojis</string>
   <string name="tavern_description">Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.</string>
   <string name="check_into_inn">Check into Inn</string>
   <string name="community_guidelines">Community Guidelines</string>
@@ -712,20 +579,13 @@
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
   <string name="world_boss">World Boss</string>
-  <string name="world_boss_art">Boss Art</string>
   <string name="boss_art">Boss Art</string>
   <string name="world_boss_description">World Boss Description</string>
-  <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
-  <string name="pending_strike_description">This Strike hasn’t happened yet!
-\nThe World Boss will lash out and attack one of our friendly shopkeepers once its rage bar fills. Keep up with your Dailies to try and prevent it from happening!</string>
+  <string name="rage_strike_count">Rage Strikes: %d/%d</string>
   <string name="pending_strike_title">Pending Strike</string>
   <string name="strike_description_title">What\'s a Rage Strike\?</string>
-  <string name="strike_description_subtitle">There are 3 potential Rage Strikes</string>
-  <string name="strike_description_description">This gauge fills when Habiticans miss their Dailies. If it fills up, the DysHeartener will unleash its Shattering Heartbreak attack on one of Habitica\'s shopkeepers, so be sure to do your tasks!</string>
-  <string name="pending_strike_subtitle">This Strike hasn\'t happened yet!</string>
-  <string name="strike_active_title" formatted="false">The %s was Attacked!</string>
-  <string name="strike_active_subtitle" formatted="false">%s is Heartbroken!</string>
-  <string name="strike_active_description" formatted="false">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+  <string name="strike_active_title">The %s was Attacked!</string>
+  <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
   <string name="questShop">Quest Shop</string>
   <string name="market_owner_long">Alex the Merchant</string>
   <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -735,32 +595,20 @@
   <string name="no_party_description">Take on quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.</string>
   <string name="no_party_title">Play Habitica in a Party</string>
   <string name="join_party_description">Give a Party member the username found below and they can send you an invite</string>
-  <string name="join_party_description_id">Give them your User ID or have them scan your QR code whilst inviting</string>
   <string name="join_party_title">Want to join a party\?</string>
-  <string name="create_party_website">Open website to create party</string>
-  <string name="id_copied">ID copied to clipboard</string>
   <string name="insufficientSubscriberGems">You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!</string>
-  <string name="insufficientSubscriberGemsTitle">Monthly Gem Cap Reached</string>
-  <string name="chat_message">Chat Message</string>
   <string name="world_boss_description_title">What\'s a World Boss\?</string>
-  <string name="world_boss_description_description">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!
-\nComplete tasks to damage the Boss
-\nThe Boss won’t damage you for missed tasks, but its Rage metre will go up. If the bar fills up, the Boss will attack one of the shopkeepers!
-\nYou can continue with normal Quest Bosses, damage will apply to both
-\nCheck the Tavern to see Boss progress and Rage attacks</string>
   <string name="world_boss_description_intro">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!</string>
   <string name="world_boss_description_1">Complete tasks to damage the Boss</string>
   <string name="world_boss_description_2">The Boss won’t damage you for missed tasks, but its Rage metre will go up. If the bar fills up, the Boss will attack one of the shopkeepers!</string>
   <string name="world_boss_description_3">You can continue with normal Quest Bosses, damage will apply to both</string>
   <string name="world_boss_description_4">Check the Tavern to see Boss progress and Rage attacks</string>
-  <string name="world_boss_action_prompt" formatted="false">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
-  <string name="world_boss_description_subtitle">%s attacks!</string>
+  <string name="world_boss_action_prompt">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
   <string name="questShop_owner_long">Ian the Quest Guide</string>
   <string name="seasonalShop_owner_long">Seasonal Sorceress</string>
   <string name="rage_attack">Rage attack:</string>
   <string name="tavern_description_world_boss">Oh dear, pay no heed to the monster below — this is still a safe haven to chat on your breaks.</string>
   <string name="report">Report</string>
-  <string name="like">Like</string>
   <string name="reply">Reply</string>
   <string name="challenge_prize">Challenge Prize</string>
   <string name="challenge_categories">Challenge Categories</string>
@@ -795,16 +643,14 @@
   <string name="two_handed">Two-handed</string>
   <string name="usernamePromptTitle">It’s time to set your username!</string>
   <string name="usernamePromptBody">Login names are now unique usernames that will be visible beside your display name and used for invitations, chat @mentions, and messaging.</string>
-  <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia.com/wiki/Player_Names">visit our wiki.</a></string>
-  <string name="confirmUsername">Confirm Username</string>
-  <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
+  <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia_com/wiki/Player_Names">visit our wiki.</a></string>
+  <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica_com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
   <string name="confirm_username_title">Are you sure you want to confirm your current username\?</string>
   <string name="confirm_username_description">Confirming your username will make it public for invitations, @mentions and messaging. You can change your username from settings at any time.</string>
   <string name="cancel">Cancel</string>
   <string name="confirm_username">Confirm Username</string>
   <string name="username_not_confirmed">Username not confirmed</string>
   <string name="username_confirmed">Username Confirmed</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
   <string name="enter_recipient_username">Enter a Recipient\'s @ username</string>
   <string name="username_copied">Username copied to clipboard</string>
   <string name="verification_pet">One of these Veteran Pets will be waiting for you after you’ve finished confirming!</string>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index dfeccc29f..4add76f2b 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_qrcode_close">Cerrar</string>
 
 </resources>
diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml
index c43f52a94..ccf48fdb7 100644
--- a/Habitica/res/values-es/strings.sidebar.xml
+++ b/Habitica/res/values-es/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tareas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Mensajes</string>
-  <string name="sidebar.tavern">Taberna</string>
-  <string name="sidebar.party">Equipo</string>
-  <string name="sidebar.purchaseGems">Gemas y Suscripción</string>
-  <string name="sidebar.guilds">Gremios</string>
-  <string name="sidebar.challenges">Desafíos</string>
-  <string name="sidebar.section.inventory">Inventario</string>
-  <string name="sidebar.avatar">Personaje</string>
-  <string name="sidebar.equipment">Equipamiento</string>
-  <string name="sidebar.stable">Establo</string>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Ajustes</string>
-  <string name="sidebar.about">Información</string>
+  <string name="sidebar_tasks">Tareas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_inbox">Mensajes</string>
+  <string name="sidebar_tavern">Taberna</string>
+  <string name="sidebar_party">Equipo</string>
+  <string name="sidebar_purchaseGems">Gemas y Suscripción</string>
+  <string name="sidebar_guilds">Gremios</string>
+  <string name="sidebar_challenges">Desafíos</string>
+  <string name="sidebar_section_inventory">Inventario</string>
+  <string name="sidebar_avatar">Personaje</string>
+  <string name="sidebar_equipment">Equipamiento</string>
+  <string name="sidebar_stable">Establo</string>
+  <string name="sidebar_news">Noticias</string>
+    <string name="sidebar_about">Información</string>
   <string name="sidebar_shops">Tiendas</string>
   <string name="sidebar_stats">Atributos</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.tutorial.xml b/Habitica/res/values-es/strings.tutorial.xml
index 55c7eb8bf..9a7b763c9 100644
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">¡Compra equipamiento para tu personaje con el oro que ganas!</string>
   <string name="tutorial_rewards_2">También puedes hacer Recompensas Personalizadas del mundo real basándote en lo que te motiva.</string>
   <string name="tutorial_tasks_complete">Eso es todo por ahora. Si necesitas un recordatorio, consulta la sección de Preguntas Frecuentes.</string>
-  <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus atributos, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
-  <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. ¡Pulsa en un artículo para usarlo!</string>
-  <string name="tutorial_pets">A medida que completes tareas del mundo real, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota</string>
-  <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, puedes consultar la sección de preguntas frecuentes en el menú!</string>
+    <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, puedes consultar la sección de preguntas frecuentes en el menú!</string>
   <string name="tutorial_party">Aquí es donde tú y tus amigos podéis estar pendientes unos de otros para cumplir vuestros objetivos y combatir monstruos con vuestras tareas!</string>
   <string name="tutorial_tavern">Te damos la bienvenida a la Taberna, una sala de chat pública para todas las edades. Aquí, puedes hablar de productividad y preguntar lo que quieras. ¡Que te diviertas!</string>
-  <string name="tutorial_classes">¡Decide si quieres ser guerrero, mago, sanador o pícaro! Cada clase tiene sus propias habilidades y equipamiento. Pulsa en (\?) si necesitas más información!</string>
-  <string name="tutorial_stats">Toca el botón gris para asignar los puntos de tus atributos de una sola vez, o toca las flechas para agregarlos punto por punto.</string>
+    <string name="tutorial_stats">Toca el botón gris para asignar los puntos de tus atributos de una sola vez, o toca las flechas para agregarlos punto por punto.</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index a549b97c7..660076b98 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -1,918 +1,696 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="action_refresh">Actualizar</string>
-    <string name="XP_default">Experiencia</string>
-    <string name="HP_default">Salud</string>
-    <string name="MP_default">Maná</string>
-    <string name="ERR_pb_barcode">No se han podido cargar las preferencias a partir del código de barras</string>
+  <string name="action_refresh">Actualizar</string>
+  <string name="XP_default">Experiencia</string>
+  <string name="HP_default">Salud</string>
+  <string name="MP_default">Maná</string>
     <!--Prefs-->
-    <string name="PS_settings_title">Ajustes</string>
-    <string name="SP_address_hint">Tu servidor personalizado</string>
+  <string name="PS_settings_title">Ajustes</string>
     <string name="SP_userID_title">ID de usuario</string>
-    <string name="SP_userID_summary">Tu ID de usuario</string>
-    <string name="SP_APIToken_title">Simbólico de API</string>
-    <string name="SP_APIToken_summary">Tu simbólico de API</string>
-    <string name="Language_title">Idioma</string>
-    <string name="Language_summary">Cambiar el idioma de Habitica</string>
-    <string name="SP_user_qr_code">Tu código QR</string>
+  <string name="SP_userID_summary">Tu ID de usuario</string>
+  <string name="SP_APIToken_title">Token de API</string>
+  <string name="SP_APIToken_summary">Tu token de API</string>
+  <string name="Language_title">Idioma</string>
+  <string name="Language_summary">Cambiar el idioma de Habitica</string>
     <string name="PS_contact_title">Contactar</string>
-    <string name="unknown_error">Ha ocurrido un error…</string>
     <string name="pref_account_header">Cuenta</string>
-    <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
-    <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
-    <string name="pref_reminder_header">Recordatorio diario</string>
-    <string name="pref_reminder_checkbox">Activar recordatorio</string>
-    <string name="pref_reminder_picker">Establecer hora de recordatorio</string>
-    <string name="pref_cds_header">Personalizar comienzo del día</string>
-    <string name="pref_cds_picker">Establecer hora del comienzo del día personalizado</string>
+  <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
+  <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
+  <string name="pref_reminder_header">Recordatorio diario</string>
+  <string name="pref_reminder_checkbox">Activar recordatorio</string>
+  <string name="pref_reminder_picker">Establecer hora de recordatorio</string>
+  <string name="pref_cds_header">Personalizar comienzo del día</string>
     <string name="pref_push_notifications_checkbox">Notificaciones push del usuario</string>
-    <string name="push_notifications">Notificaciones push</string>
-    <string name="push_notifications_sum">Establecer tu configuración de notificaciones push</string>
-    <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
-    <string name="preference_push_received_a_private_message">Has recibido un mensaje privado</string>
-    <string name="preference_push_gifted_gems">Gemas regaladas</string>
-    <string name="preference_push_gifted_subscription">Suscripción regalada</string>
-    <string name="preference_push_invited_to_party">Invitado al Equipo</string>
-    <string name="preference_push_invited_to_guild">Invitado al Gremio</string>
-    <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
-    <string name="preference_push_invited_to_quest">Invitado a una misión</string>
-    <!--Adding tasks-->
-    <string name="task_value">Valor</string>
-    <string name="new_todo">Nueva Quehacer</string>
-    <string name="new_reward">Nuevo premio</string>
-    <string name="new_daily">Nueva Tarea Diaria</string>
-    <string name="new_habit">Nuevo hábito</string>
+  <string name="push_notifications">Notificaciones push</string>
+  <string name="push_notifications_sum">Establecer tu configuración de notificaciones push</string>
+  <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
+  <string name="preference_push_received_a_private_message">Has recibido un mensaje privado</string>
+  <string name="preference_push_gifted_gems">Gemas regaladas</string>
+  <string name="preference_push_gifted_subscription">Suscripción regalada</string>
+  <string name="preference_push_invited_to_party">Invitado al Equipo</string>
+  <string name="preference_push_invited_to_guild">Invitado al Gremio</string>
+  <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
+  <string name="preference_push_invited_to_quest">Invitado a una misión</string>
+  <!--Adding tasks-->
     <string name="action_edit">Editar</string>
-    <string name="action_delete">Borrar</string>
     <string name="action_cancel">Cancelar</string>
-    <string name="login_btn">Iniciar sesión</string>
-    <string name="register_btn">Registrarse</string>
-    <string name="username">Nombre de usuario</string>
-    <string name="email_username">Correo electrónico o nombre de usuario</string>
-    <string name="password">Contraseña</string>
-    <string name="emailAddress">Correo electrónico</string>
-    <string name="confirmpassword">Confirma la contraseña</string>
-    <string name="logout">Cerrar sesión</string>
-    <string name="logout_description">Cierra la sesión de tu cuenta</string>
-    <string name="account_details">Detalles de la cuenta</string>
+  <string name="login_btn">Iniciar sesión</string>
+  <string name="register_btn">Registrarse</string>
+  <string name="username">Nombre de usuario</string>
+  <string name="email_username">Correo electrónico o nombre de usuario</string>
+  <string name="password">Contraseña</string>
+  <string name="emailAddress">Correo electrónico</string>
+  <string name="confirmpassword">Confirma la contraseña</string>
+  <string name="logout">Cerrar sesión</string>
+  <string name="logout_description">Cierra la sesión de tu cuenta</string>
     <string name="LoginActivityName">Te damos la bienvenida</string>
-    <string name="string_revive">Revivir</string>
-    <string name="please_connect">Antes de usar un widget, conéctate a través de la aplicación</string>
-    <string name="about.title">Información</string>
-    <string name="about.libraries">Bibliotecas</string>
-    <string name="about.versionhistory">Historial de versiones</string>
-    <string name="about.habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
-    <string name="about.rate_our_app">Califica nuestra aplicación</string>
-    <string name="about.give_us_feedback">¡Envíanos tus comentarios!</string>
-    <string name="about.bugreport">Notificar un error</string>
-    <string name="about.source_code">Código fuente</string>
-    <string name="repeatEvery">Repite Cada</string>
+    <string name="about_title">Información</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
+  <string name="about_rate_our_app">Califica nuestra aplicación</string>
+  <string name="about_give_us_feedback">¡Envíanos tus comentarios!</string>
+  <string name="about_bugreport">Notificar un error</string>
+  <string name="about_source_code">Código fuente</string>
     <!--Network Errors-->
-    <string name="network_error_title">Error de conexión</string>
-    <string name="network_error_no_network_body">No tienes conexión a Internet.</string>
-    <string name="internal_error_api">Conexión con el servidor perdida</string>
-    <string name="authentication_error_title">Error de autenticación</string>
-    <string name="authentication_error_body">Tu usuario y/o contraseña es incorrecto.</string>
+    <string name="internal_error_api">Parece que hay un problema con el servidor. Vuelve a intentarlo más tarde.</string>
+  <string name="authentication_error_title">Error de autenticación</string>
     <string name="login_validation_error_title">Error de validación</string>
-    <string name="login_validation_error_fieldsmissing">Tienes que rellenar todos los campos.</string>
-    <string name="save_changes">Guardar</string>
-    <string name="copy">Copiar</string>
-    <string name="notes">Notas</string>
-    <string name="text">Texto</string>
+  <string name="login_validation_error_fieldsmissing">Tienes que rellenar todos los campos.</string>
+  <string name="save_changes">Guardar</string>
+  <string name="copy">Copiar</string>
+  <string name="notes">Notas</string>
     <string name="difficulty">Dificultad</string>
-    <string name="tags">Etiquetas</string>
-    <string name="trivial">Trivial</string>
-    <string name="easy">Fácil</string>
-    <string name="medium">Intermedia</string>
-    <string name="hard">Difícil</string>
-    <string name="start_date">Fecha de inicio</string>
-    <string name="positive_habit_form">Positivo</string>
-    <string name="negative_habit_form">Negativo</string>
-    <string name="checklist">Listado</string>
-    <string name="reminders">Recordatorios</string>
-    <string name="actions">Acciones</string>
+  <string name="tags">Etiquetas</string>
+  <string name="trivial">Trivial</string>
+  <string name="easy">Fácil</string>
+  <string name="medium">Intermedia</string>
+  <string name="hard">Difícil</string>
+  <string name="start_date">Fecha de inicio</string>
+  <string name="positive_habit_form">Positivo ( + )</string>
+  <string name="negative_habit_form">Negativo ( - )</string>
+  <string name="checklist">Listado</string>
+  <string name="reminders">Recordatorios</string>
     <string name="attributes">Atributos</string>
-    <string name="physical">Fuerza</string>
-    <string name="mental">Inteligencia</string>
-    <string name="social">Constitución</string>
-    <string name="other">Percepción</string>
-    <string name="frequency">Frecuencia</string>
-    <string name="frequency_weekly">Ciertos días de la semana</string>
-    <string name="frequency_daily">Cada X días</string>
-    <string name="repeatables_summary_title">Resumen</string>
-    <string name="repeatables_title">Repeticiones</string>
-    <string name="repeatables_on_title">Repeticiones activadas</string>
     <string name="repeatables_frequency_daily">Diario</string>
-    <string name="repeatables_frequency_weekly">Semanalmente</string>
-    <string name="repeatables_frequency_monthly">Mensualmente</string>
-    <string name="repeatables_frequency_yearly">Anualmente</string>
-    <string name="repeatables_frequency_day_of_month">Día del mes</string>
-    <string name="repeatables_frequency_day_of_week">Día de la semana</string>
-    <string name="monday">Lunes</string>
-    <string name="tuesday">Martes</string>
-    <string name="wednesday">Miércoles</string>
-    <string name="thursday">Jueves</string>
-    <string name="friday">Viernes</string>
-    <string name="saturday">Sábado</string>
-    <string name="sunday">Domingo</string>
-    <string name="levelup_header">¡Has llegado al Nivel %1$d!</string>
-    <string name="levelup_detail">¡Cumpliendo tus metas en la vida real, has subido de nivel y tu salud está restaurada!</string>
-    <string name="onwards">¡Hurra!</string>
-    <string name="faint_subtitle">¡No desesperes!</string>
-    <string name="faint_penalty_body">Has perdido un Nivel, todo tu Oro y una pieza de tu Equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
-    <string name="faint_header">¡Te has quedado sin salud!</string>
-    <string name="faint_button">Recuperar toda la salud y volver a intentarlo</string>
-    <string name="filter">Filtro</string>
-    <string name="profile_image">Imagen de perfil</string>
-    <string name="mana_price_button">%d PM</string>
-    <string name="used_skill">Has usado %1$s por %2$d de maná.</string>
+  <string name="repeatables_frequency_weekly">Semanalmente</string>
+  <string name="repeatables_frequency_monthly">Mensualmente</string>
+  <string name="repeatables_frequency_yearly">Anualmente</string>
+  <string name="repeatables_frequency_day_of_month">Día del mes</string>
+  <string name="repeatables_frequency_day_of_week">Día de la semana</string>
+  <string name="monday">Lunes</string>
+  <string name="tuesday">Martes</string>
+  <string name="wednesday">Miércoles</string>
+  <string name="thursday">Jueves</string>
+  <string name="friday">Viernes</string>
+  <string name="saturday">Sábado</string>
+  <string name="sunday">Domingo</string>
+  <string name="levelup_header">¡Has llegado al Nivel %1$d!</string>
+  <string name="levelup_detail">¡Cumpliendo tus metas en la vida real, has subido de nivel y tu salud está restaurada!</string>
+  <string name="onwards">¡Hurra!</string>
+  <string name="faint_subtitle">¡No desesperes!</string>
+  <string name="faint_penalty_body">Has perdido un Nivel, todo tu Oro y una pieza de tu Equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
+  <string name="faint_header">¡Te has quedado sin salud!</string>
+  <string name="faint_button">Recuperar toda la salud y volver a intentarlo</string>
+  <string name="filter">Filtro</string>
     <string name="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="new_checklist_item">nuevo elemento de lista</string>
     <string name="reminder_title">Acuérdate de marcar tus tareas completadas</string>
-    <string name="skill_progress_title">Usando habilidad</string>
-    <string name="coming_soon">Próximamente</string>
-    <string name="chat_flag_confirmation">¿Seguro que quieres informar de que este mensaje incumple las normas?</string>
-    <string name="flag_confirm">Denunciar mensaje</string>
     <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
-    <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
     <string name="forgot_pw_btn">He olvidado la contraseña</string>
-    <string name="tavern.inn.checkOut">Reactivar tareas diarias</string>
-    <string name="tavern.inn.rest">Pausar tareas diarias</string>
-    <string name="reward.dialog.buy">Comprar</string>
-    <string name="reward.dialog.dismiss">Descartar</string>
-    <string name="party">Equipo</string>
-    <string name="chat">Conversación</string>
-    <string name="members">Miembros</string>
-    <string name="habits">Hábitos</string>
-    <string name="dailies">Tareas diarias</string>
-    <string name="todos">Tareas</string>
-    <string name="rewards">Recompensas</string>
-    <string name="taskform.delete.title">¿Seguro?</string>
-    <string name="taskform.delete.message">¿Seguro que quieres borrarlo?</string>
+  <string name="tavern_inn_checkOut">Reactivar tareas diarias</string>
+  <string name="tavern_inn_rest">Pausar tareas diarias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Descartar</string>
+  <string name="party">Equipo</string>
+  <string name="chat">Conversación</string>
+  <string name="members">Miembros</string>
+  <string name="habits">Hábitos</string>
+  <string name="dailies">Tareas diarias</string>
+  <string name="todos">Tareas</string>
+  <string name="rewards">Recompensas</string>
     <string name="yes">Sí</string>
-    <string name="no">No</string>
-    <string name="quest">Misión</string>
-    <string name="avatar_body">Cuerpo</string>
-    <string name="avatar_hair">Cabello</string>
-    <string name="avatar_shirt">Camisa</string>
-    <string name="avatar_skin">Piel</string>
-    <string name="avatar_ears">Orejas de animales</string>
+  <string name="no">No</string>
+  <string name="quest">Misión</string>
+  <string name="avatar_body">Cuerpo</string>
+  <string name="avatar_hair">Cabello</string>
+  <string name="avatar_shirt">Camisa</string>
+  <string name="avatar_skin">Piel</string>
     <string name="avatar_base">Base</string>
-    <string name="avatar_color">Color</string>
-    <string name="avatar_beard">Barba</string>
-    <string name="avatar_mustache">Bigote</string>
-    <string name="avatar_flower">Flor</string>
-    <string name="avatar_bangs">Flequillo</string>
-    <string name="avatar_nothing">Nada seleccionado</string>
+  <string name="avatar_color">Color</string>
+  <string name="avatar_beard">Barba</string>
+  <string name="avatar_mustache">Bigote</string>
+  <string name="avatar_flower">Flor</string>
+  <string name="avatar_bangs">Flequillo</string>
     <string name="avatar_size">Talla</string>
-    <string name="avatar_size_slim">Delgado</string>
-    <string name="avatar_size_broad">Ancho</string>
-    <string name="avatar_background">Fondo</string>
-    <string name="purchase_customization">Comprar personalización</string>
-    <string name="purchase_set_button">Desbloquear el conjunto por %d gemas</string>
-    <string name="purchase_button">Comprar</string>
-    <string name="purchase_set_title">Comprar conjunto %s</string>
-    <string name="due_date">Fecha límite</string>
-    <string name="quest.accept">Aceptar</string>
-    <string name="quest.reject">Rechazar</string>
-    <string name="quest.begin">Comenzar misión</string>
-    <string name="quest.cancel">Cancelar invitación</string>
-    <string name="quest.abort">Anular misión</string>
-    <string name="quest.leave">Abandonar misión</string>
-    <string name="quest.pending">Pendiente</string>
-    <string name="quest.accepted">Aceptada</string>
-    <string name="quest.rejected">Rechazada</string>
-    <string name="quest.participants">Participantes</string>
+  <string name="avatar_size_slim">Delgado</string>
+  <string name="avatar_size_broad">Ancho</string>
+  <string name="avatar_background">Fondo</string>
+  <string name="purchase_customization">Comprar personalización</string>
+  <string name="purchase_set_button">Desbloquear el conjunto por %d gemas</string>
+  <string name="purchase_button">Comprar</string>
+  <string name="purchase_set_title">Comprar conjunto %s</string>
+  <string name="due_date">Fecha límite</string>
+  <string name="quest_accept">Aceptar</string>
+  <string name="quest_reject">Rechazar</string>
+  <string name="quest_begin">Comenzar misión</string>
+  <string name="quest_cancel">Cancelar invitación</string>
+  <string name="quest_abort">Anular misión</string>
     <string name="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_subtitle">Te damos la bienvenida a</string>
-    <string name="intro_1_title">Habitica</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_subtitle">Te damos la bienvenida a</string>
     <string name="intro_1_description">Es hora de divertirse mientras realizas tareas. Únete a más de %s personas que han mejorado su vida realizando tareas.</string>
-    <string name="intro_2_subtitle">Progreso en el juego</string>
-    <string name="intro_2_title">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_subtitle">Luchar con monstruos</string>
-    <string name="intro_3_title">Socialízate</string>
-    <string name="intro_3_description">No pierdas de vista tus objetivos y deja que te ayuden tus amigos. ¡Apoyaos mutuamente en la vida y en la lucha para mejorar juntos!</string>
-    <string name="intro_finish_button">¡Empezar!</string>
-    <string name="previous_button">Anterior</string>
+  <string name="intro_2_subtitle">Progreso en el juego</string>
+  <string name="intro_2_title">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_subtitle">Luchar con monstruos</string>
+  <string name="intro_3_title">Socialízate</string>
+  <string name="intro_3_description">No pierdas de vista tus objetivos y deja que te ayuden tus amigos. ¡Apoyaos mutuamente en la vida y en la lucha para mejorar juntos!</string>
+  <string name="intro_finish_button">¡Empezar!</string>
     <string name="next_button">Siguiente</string>
-    <string name="skip_button">Omitir</string>
-    <string name="setup_welcome_description">Te damos la bienvenida a Habitica, donde al progresar dentro del juego, mejorarás en la vida real. A medida que cumplas tus objetivos del mundo real, desbloquearás piezas de equipamiento, mascotas, misiones y mucho más.</string>
-    <string name="setup_welcome_title">Te damos la bienvenida</string>
+  <string name="skip_button">Omitir</string>
     <string name="avatar_setup_description">Bien, ¿cómo te gustaría verte? No te preocupes, puedes cambiar ésto más tarde.</string>
-    <string name="task_setup_description">¡Genial! Ahora, ¿en qué estás interesado en trabajar a lo largo de este viaje?</string>
-    <string name="setup_group_work">Trabajo</string>
-    <string name="setup_group_exercise">Ejercicio</string>
-    <string name="setup_group_health">Salud</string>
-    <string name="setup_group_school">Clases</string>
-    <string name="setup_group_teams">Equipos</string>
-    <string name="setup_group_chores">Labores domésticas</string>
-    <string name="setup_group_creativity">Creatividad</string>
-    <string name="setup_task_work_1">Procesar correo</string>
-    <string name="setup_task_work_2">Tarea más importante</string>
-    <string name="setup_task_work_3">Proyecto profesional</string>
-    <string name="setup_task_exercise_1">10 minutos de ejercicio</string>
-    <string name="setup_task_exercise_2">Estiramientos</string>
-    <string name="setup_task_exercise_3">Decidir un plan de entrenamiento</string>
-    <string name="setup_task_healthWellness_1">Comer comida sana / comida basura</string>
-    <string name="setup_task_healthWellness_2">Usar hilo dental</string>
-    <string name="setup_task_healthWellness_3">Planificar reunión</string>
-    <string name="setup_task_school_1">Estudiar/vaguear</string>
-    <string name="setup_task_school_2">Hacer los deberes</string>
-    <string name="setup_task_school_3">Acabar trabajo para clase</string>
-    <string name="setup_task_teams_1">Quedar con el grupo</string>
-    <string name="setup_task_teams_2">Poner al día al grupo</string>
-    <string name="setup_task_teams_3">Acabar trabajo en equipo</string>
-    <string name="setup_task_chores_1">Limpiar 10 minutos</string>
-    <string name="setup_task_chores_2">Lavar los platos</string>
-    <string name="setup_task_chores_3">Ordenar el armario</string>
-    <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
-    <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
-    <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
-    <string name="gem.purchase.support">¿Quieres contribuir a que Habitica siga en funcionamiento? Puedes ayudar a los desarrolladores comprando gemas.\n\nLas gemas te permiten comprar artículos adicionales para tu cuenta, por ejemplo: \n\n - Fantásticos trajes para tu personaje\n - Increíbles fondos\n - Divertidas misiones que te recompensan con huevos de mascotas\n - La capacidad de cambiar de clase antes de llegar al nivel 100\n\nMuchísimas gracias por ayudarnos a hacer que Habitica sea lo mejor posible. ¡Valoramos enormemente vuestras contribuciones!</string>
+  <string name="task_setup_description">¡Genial! Ahora, ¿en qué estás interesado en trabajar a lo largo de este viaje?</string>
+  <string name="setup_group_work">Trabajo</string>
+  <string name="setup_group_exercise">Ejercicio</string>
+  <string name="setup_group_health">Salud</string>
+  <string name="setup_group_school">Clases</string>
+  <string name="setup_group_teams">Equipos</string>
+  <string name="setup_group_chores">Labores domésticas</string>
+  <string name="setup_group_creativity">Creatividad</string>
+  <string name="setup_task_work_1">Procesar correo</string>
+  <string name="setup_task_work_2">Tarea más importante</string>
+  <string name="setup_task_work_3">Proyecto profesional</string>
+  <string name="setup_task_exercise_1">10 minutos de ejercicio</string>
+  <string name="setup_task_exercise_2">Estiramientos</string>
+  <string name="setup_task_exercise_3">Decidir un plan de entrenamiento</string>
+  <string name="setup_task_healthWellness_1">Comer comida sana / comida basura</string>
+  <string name="setup_task_healthWellness_2">Usar hilo dental</string>
+  <string name="setup_task_healthWellness_3">Planificar reunión</string>
+  <string name="setup_task_school_1">Estudiar/vaguear</string>
+  <string name="setup_task_school_2">Hacer los deberes</string>
+  <string name="setup_task_school_3">Acabar trabajo para clase</string>
+  <string name="setup_task_teams_1">Quedar con el grupo</string>
+  <string name="setup_task_teams_2">Poner al día al grupo</string>
+  <string name="setup_task_teams_3">Acabar trabajo en equipo</string>
+  <string name="setup_task_chores_1">Limpiar 10 minutos</string>
+  <string name="setup_task_chores_2">Lavar los platos</string>
+  <string name="setup_task_chores_3">Ordenar el armario</string>
+  <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
+  <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
+  <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
     <string name="my_guilds">Mis Gremios</string>
-    <string name="public_guilds">Gremios públicos</string>
-    <string name="guild">Gremio</string>
-    <string name="leave">Abandonar</string>
-    <string name="join">Unirse</string>
-    <string name="leader">Líder</string>
+  <string name="public_guilds">Gremios públicos</string>
+  <string name="guild">Gremio</string>
+  <string name="leave">Abandonar</string>
+  <string name="join">Unirse</string>
     <string name="gems">Gemas</string>
-    <string name="copy_as_todo">Copiar como tarea pendiente</string>
-    <string name="send_pm">Enviar mensaje privado</string>
-    <string name="flag">Marcar</string>
     <string name="delete">Borrar</string>
-    <string name="name">Nombre</string>
-    <string name="description">Descripción</string>
-    <string name="add_tag">Añadir nueva etiqueta</string>
-    <string name="privacy">Privacidad</string>
-    <string name="write_message">Escribir mensaje</string>
-    <string name="post">Publicar</string>
+  <string name="name">Nombre</string>
+  <string name="description">Descripción</string>
+  <string name="add_tag">Añadir nueva etiqueta</string>
+  <string name="privacy">Privacidad</string>
+  <string name="write_message">Escribir mensaje</string>
     <string name="guild_search_hint">Buscar gremios</string>
-    <string name="todo_due">Para: %s</string>
-    <string name="daily_streak">racha actual: %d</string>
-    <string name="todo_has_duedate">La tarea tiene fecha límite</string>
     <string name="battle_gear">Equipo de batalla</string>
-    <string name="costume">Disfraz</string>
-    <string name="outfit_head">Cabeza</string>
-    <string name="outfit_headAccessory">Accesorio para la cabeza</string>
-    <string name="outfit_eyewear">Gafas</string>
-    <string name="outfit_armor">Armadura</string>
-    <string name="outfit_back">Espalda</string>
-    <string name="outfit_body">Cuerpo</string>
-    <string name="outfit_shield">Escudo</string>
-    <string name="outfit_weapon">Arma</string>
-    <string name="wear_costume">Llevar disfraz</string>
-    <string name="equipped">Equipado</string>
-    <string name="quest_cancel_message">¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino.</string>
-    <string name="quest.invitation">Invitación a misión</string>
+  <string name="costume">Disfraz</string>
+  <string name="outfit_head">Cabeza</string>
+  <string name="outfit_headAccessory">Accesorio para la cabeza</string>
+  <string name="outfit_eyewear">Gafas</string>
+  <string name="outfit_armor">Armadura</string>
+  <string name="outfit_back">Espalda</string>
+  <string name="outfit_body">Cuerpo</string>
+  <string name="outfit_shield">Escudo</string>
+  <string name="outfit_weapon">Arma</string>
+  <string name="wear_costume">Llevar disfraz</string>
+  <string name="equipped">Equipado</string>
+  <string name="quest_cancel_message">¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino.</string>
     <string name="quest_begin_message">¿Estás seguro? ¡Sólo %1$d de tus %2$d miembros de equipo se han unido a la misión! Las misiones comienzan automáticamente cuando todos los jugadores se han unido o rechazado la invitación.</string>
-    <string name="quest.invitation.text">¡Te han invitado a participar en una misión!</string>
     <string name="ago_1day">Hace 1d</string>
-    <string name="ago_days">Hace %dd</string>
-    <string name="ago_1Minute">Hace 1m</string>
-    <string name="ago_minutes">Hace %dm</string>
-    <string name="ago_hours">Hace %dh</string>
-    <string name="ago_1hour">Hace 1h</string>
-    <string name="today">Hoy</string>
-    <string name="sidebar_items">Artículos</string>
-    <string name="eggs">Huevos</string>
-    <string name="hatching_potions">Pociones de nacimiento</string>
-    <string name="food">Comida</string>
-    <string name="quests">Misiones</string>
-    <string name="pets">Mascotas</string>
-    <string name="mounts">Monturas</string>
-    <string name="armoireEquipment">Has encontrado %s en el Armario</string>
-    <string name="armoireFood">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
-    <string name="armoireExp">Te peleas con el Armario y ganas experiencia. ¡Ahí lo llevas!</string>
-    <string name="armoireNotesFull">Abre el Armario para recibir prendas especiales, experiencia o comida al azar. Prendas que te faltan por conseguir: %d.</string>
-    <string name="armoireLastItem">Has encontrado la última prenda insólita del Armario encantado.</string>
-    <string name="armoireNotesEmpty">El Armario dispondrá de nuevas prendas la primera semana de cada mes. ¡Hasta entonces, sigue haciendo clic en él para ganar Experiencia y Comida!</string>
+  <string name="ago_days">Hace %dd</string>
+  <string name="ago_1Minute">Hace 1m</string>
+  <string name="ago_minutes">Hace %dm</string>
+  <string name="ago_hours">Hace %dh</string>
+  <string name="ago_1hour">Hace 1h</string>
+  <string name="today">Hoy</string>
+  <string name="sidebar_items">Artículos</string>
+  <string name="eggs">Huevos</string>
+  <string name="hatching_potions">Pociones de nacimiento</string>
+  <string name="food">Comida</string>
+  <string name="quests">Misiones</string>
+  <string name="pets">Mascotas</string>
+  <string name="mounts">Monturas</string>
+  <string name="armoireEquipment">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
+  <string name="armoireFood">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
+  <string name="armoireExp">Te peleas con el Armario y ganas experiencia. ¡Ahí lo llevas!</string>
     <string name="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_with_potion">Mezclar con poción</string>
     <string name="hatch_egg">Mezclar con huevo</string>
-    <string name="invite_party">Invitar al equipo</string>
-    <string name="dialog_feeding">Dar de comer a %s:</string>
-    <string name="use_animal">Usar</string>
-    <string name="feed">Alimentar</string>
-    <string name="hatch_with">Criar mascota con %s</string>
-    <string name="hatched_pet_title">¡Ha nacido un/a %1$s %2$s!</string>
-    <string name="evolved_pet_title">Has domado %s, ¡vamos a dar un paseo!</string>
-    <string name="close">Cerrar</string>
-    <string name="share">Compartir</string>
-    <string name="notification_pet_fed">¡Tu %s ha comido!</string>
-    <string name="notification_purchase">Has comprado %s</string>
+  <string name="invite_party">Invitar al equipo</string>
+  <string name="dialog_feeding">Dar de comer a %s:</string>
+  <string name="use_animal">Usar</string>
+  <string name="feed">Alimentar</string>
+  <string name="hatch_with">Criar mascota con %s</string>
+  <string name="hatched_pet_title">¡Ha nacido un/a %1$s %2$s!</string>
+  <string name="evolved_pet_title">Has domado %s, ¡vamos a dar un paseo!</string>
+  <string name="close">Cerrar</string>
+  <string name="share">Compartir</string>
+  <string name="notification_pet_fed">¡Tu %s ha comido!</string>
     <string name="notification_purchase_reward">Has comprado una recompensa</string>
-    <string name="sectiondrop">Estandar</string>
-    <string name="sectionpremium">Poción Mágica</string>
-    <string name="sectionquest">Misión</string>
-    <string name="sectionspecial">Raro</string>
-    <string name="sectionmounts">Estandar</string>
-    <string name="sectionpremiumMounts">Poción Mágica</string>
-    <string name="sectionquestMounts">Misión</string>
-    <string name="sectionspecialMounts">Raro</string>
     <string name="world_quest">Misión mundial</string>
-    <string name="inn_description">¿Necesitas un descanso\? Visita la Posada de Daniel para pausar algunas de las mecánicas de juego más difíciles de Habitica:
-\n
-\n • Las Tareas Diarias que no completes no te harán daño
-\n • Las Tareas Pendientes no reiniciarán las rachas ni se degradarán de color
-\n • Los jefes no te harán daño por tus Tareas Diarias incompletas
-\n • El daño que inflija el jefe o los objetos de una misión de recolección permanecerán en el mismo estado hasta que salgas</string>
-    <string name="empty_items">No tienes %s</string>
-    <string name="user_level">Nivel %d</string>
-    <string name="user_level_with_class">Nivel %1$d %2$s</string>
-    <string name="warrior">Guerrero</string>
-    <string name="rogue">Pícaro</string>
-    <string name="mage">Mago</string>
-    <string name="healer">Sanador</string>
-    <string name="warrior_description">Los Guerreros consiguen más «golpes críticos» y hacen gran daño a los Jefes. ¡Juega como Guerrero si quieres derrotar monstruos fácilmente! Los Guerreros se benefician con un atributo de Fuerza elevado.</string>
-    <string name="mage_description">Los magos aprenden Habilidades que dañan a los Jefes y potencian la EXP y el Maná. ¡Juega como Mago si lo que te motiva es subir de nivel rápidamente! Los Magos se benefician con un atributo de Inteligencia elevado.</string>
-    <string name="rogue_description">Los Pícaros aprenden Habilidades que les permiten a ellos y su Equipo encontrar más Oro y botines aleatorios. ¡Juega como Pícaro si quieres muchos objetos y Oro! Los Pícaros se benefician con un atributo de Percepción elevado.</string>
-    <string name="healer_description">Los Sanadores aprenden Habilidades que curan y protegen a su Equipo y a sí mismos. ¡Juega como Sanador si disfrutas ayudar a los demás o evitar daño! Los Sanadores se benefician con un atributo de Constitución elevado.</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="inn_description">¿Necesitar un descanso? Visita la Posada de Daniel para pausar algunos de los mecánicos de juego más difíciles de Habitica:\n\n
+• Las Tareas Diarias perdidas no te harán daño\n
+• Las Tareas Pendientes no reiniciarán las rachas ni se degradarán en color\n
+• Los jefes no harán daño por tus Tareas Diarias perdidas\n
+• El daño que inflija el jefe o los objetos de una misión de recolección permanecerán pendientes hasta que salgas.</string>
+  <string name="empty_items">No tienes %s</string>
+  <string name="user_level">Nivel %d</string>
+  <string name="user_level_with_class">Nivel %1$d %2$s</string>
+  <string name="warrior">Guerrero</string>
+  <string name="rogue">Pícaro</string>
+  <string name="mage">Mago</string>
+  <string name="healer">Sanador</string>
+  <string name="warrior_description">Los Guerreros obtienen «golpes críticos» mejores y más frecuentes, que aportan Oro, Experiencia y Botín extras de forma aleatoria. También pueden hacer mucho daño a los jefes. Juega como Guerrero si lo que más te motiva es obtener recompensas aleatorias e impredecibles, o si disfrutas poniendo en su sitio a los jefes de las Misiones.</string>
+  <string name="mage_description">Los magos aprenden rápido y tardan menos que otras clases en ganar experiencia y subir de nivel. Además, disponen de una gran cantidad de maná para usar sus habilidades especiales. Juega como mago si disfrutas con los aspectos estratégicos de Habitica, o si lo que más te motiva es subir de nivel y desbloquear funciones avanzadas.</string>
+  <string name="rogue_description">A los pícaros les encanta acumular riquezas: ganan más oro que ninguna otra clase y son expertos en encontrar artículos por azar. Su habilidad más característica, la del sigilo, les permite eludir las consecuencias de no completar las tareas diarias. Juega como pícaro si lo que más te motiva es conseguir recompensas, logros, botines e insignias.</string>
+  <string name="healer_description">Los sanadores se mantienen impertérritos ante los daños y ofrecen esa protección a los demás. Las tareas diarias sin cumplir y los hábitos negativos no les quitan el sueño, y tienen maneras de recuperar la salud cuando algo va mal. Juega como sanador si te gusta ayudar a los otros miembros del equipo o si te atrae la idea de esquivar a la Muerte con tu esfuerzo.</string>
+  <string name="select_class">Elegir Clase</string>
+  <string name="opt_out_class">No elegir</string>
     <string name="class_confirmation">¿Seguro que quieres ser %s?</string>
-    <string name="class_changed">¡Ahora eres un %s!</string>
-    <string name="class_changed_description">¡Tienes un nuevo Equipo de Combate que puedes ponerte en tu Equipamiento!</string>
-    <string name="choose_class">Elegir clase</string>
-    <string name="dialog_go_back">Volver</string>
-    <string name="opt_out_confirmation">¿Seguro que no quieres elegir?</string>
-    <string name="change_class">Cambiar de clase</string>
-    <string name="change_class_description">Cambia tu clase y reembolsa tus puntos de atributo por 3 gemas.</string>
-    <string name="enable_class">Activar sistema de clases</string>
-    <string name="changing_class_progress">Cambio de clase</string>
-    <string name="by_email">Por correo electrónico</string>
-    <string name="invite_existing_users">Invitar a usuarios registrados</string>
-    <string name="send">Enviar</string>
-    <string name="invite">Invitar a amigos</string>
-    <string name="invite_id_description">Si tienes amigos que ya usan Habitica, invítalos desde aquí indicando su ID de usuario.</string>
+  <string name="class_changed">¡Ahora eres un %s!</string>
+  <string name="class_changed_description">¡Tienes un nuevo Equipo de Combate que puedes ponerte en tu Equipamiento!</string>
+  <string name="choose_class">Elegir clase</string>
+  <string name="dialog_go_back">Volver</string>
+  <string name="opt_out_confirmation">¿Seguro que no quieres elegir?</string>
+  <string name="change_class">Cambiar de clase</string>
+  <string name="change_class_description">Cambia tu clase y reembolsa tus puntos de atributo por 3 gemas.</string>
+  <string name="enable_class">Activar sistema de clases</string>
+  <string name="changing_class_progress">Cambio de clase</string>
+  <string name="by_email">Por correo electrónico</string>
+  <string name="invite_existing_users">Invitar a usuarios registrados</string>
+  <string name="send">Enviar</string>
+  <string name="invite">Invitar a amigos</string>
     <string name="invite_username_description">Si tienes amigos que ya usan Habitica, invítalos indicando su nombre de usuario aquí.</string>
-    <string name="invite_email_description">Si un amigo se apunta a Habitica a través del correo electrónico que le has enviado, ¡se le invitará automáticamente a tu equipo!</string>
-    <string name="add_invites">Añadir invitaciones</string>
-    <string name="user_id">ID de usuario</string>
+  <string name="invite_email_description">Si un amigo se apunta a Habitica a través del correo electrónico que le has enviado, se le invitará automáticamente a tu equipo.</string>
+  <string name="add_invites">Añadir invitaciones</string>
     <string name="email">Correo electrónico</string>
-    <string name="invite_users">Invitar al grupo</string>
     <string name="share_using">Compartir con</string>
-    <string name="share_levelup">¡He subido al nivel %d en Habitica mejorando mis hábitos en el mundo real!</string>
-    <string name="share_hatched">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
-    <string name="share_raised">¡He conseguido una montura de %1$s en Habitica realizando tareas en mi vida real!</string>
-    <string name="open_in_store">Abrir en Play Store</string>
-    <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
-    <string name="change_class_equipment_warning">Aviso: Ya no podrás comprar equipamiento para la clase %s.</string>
-    <string name="leaderMessage">Mensaje de %1$s</string>
-    <string name="leaderName">Líder: %1$s</string>
+  <string name="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 en Habitica realizando tareas en mi vida real!</string>
+  <string name="open_in_store">Abrir en Play Store</string>
+  <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
+  <string name="change_class_equipment_warning">Aviso: Ya no podrás comprar equipamiento para la clase %s</string>
     <string name="confirm">Confirmar</string>
-    <string name="market">Mercado</string>
-    <string name="timeTravelers">Viajeros del tiempo</string>
-    <string name="seasonalShop">Tienda estacional</string>
-    <string name="empty_inbox">No tienes ningún mensaje. ¡Puedes enviar un mensaje nuevo a un usuario desde los mensajes de chat públicos que hayan enviado!</string>
-    <string name="party_invite">Desbloquéala invitando a tus amigos</string>
-    <string name="login_incentive">Desbloquear iniciando sesión en Habitica regularmente</string>
-    <string name="create_account">Desbloquear creando una cuenta</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="market">Mercado</string>
+  <string name="timeTravelers">Viajeros del tiempo</string>
+  <string name="seasonalShop">Tienda estacional</string>
+  <string name="empty_inbox">No tienes ningún mensaje. ¡Puedes enviar un mensaje nuevo a un usuario desde los mensajes de chat públicos que hayan enviado!</string>
+  <string name="party_invite">Desbloquéala invitando a tus amigos</string>
+  <string name="login_incentive">Desbloquear iniciando sesión en Habitica regularmente</string>
+  <string name="create_account">Desbloquear creando una cuenta</string>
     <string name="successful_purchase">Has comprado %1$s</string>
-    <string name="purchase_confirmation_title">Confirmar la compra</string>
-    <string name="confirm_purchase_text">Comprar %1$s para %2$s %3$s</string>
-    <string name="gem">gema</string>
-    <string name="hourglass">reloj de arena</string>
-    <string name="hourglasses">relojes de arena</string>
-    <string name="gold_singular">oro</string>
     <string name="gold_plural">oro</string>
-    <string name="chat_message_copied">Mensaje copiado al portapapeles</string>
-    <string name="copy_chat_message">Copiar al portapapeles</string>
-    <string name="edit_tag_title">Editar etiqueta</string>
+  <string name="chat_message_copied">Mensaje copiado al portapapeles</string>
     <string name="edit_tag_btn_edit">Editar</string>
-    <string name="edit_tag_btn_done">Listo</string>
-    <string name="edit_tag_btn_delete">Eliminar</string>
     <string name="confirm_delete_tag_title">¿Seguro?</string>
-    <string name="confirm_delete_tag_message">¿Seguro que quieres realizar la eliminación?</string>
-    <string name="filter_drawer_edit_tags">Editar etiquetas</string>
-    <string name="filter_drawer_filter_tags">Filtrar por etiquetas</string>
+  <string name="confirm_delete_tag_message">¿Seguro que quieres realizar la eliminación?</string>
     <!--QR Strings-->
-    <string name="qr_section_title">Pídele a alguien que te invite con este código QR</string>
-    <string name="qr_save_message">Código QR guardado en</string>
-    <string name="qr_dialogue_title">Tu código QR</string>
-    <string name="download">Descargar</string>
-    <string name="send_new_message">Enviar un nuevo mensaje</string>
     <string name="choose_recipient_title">Elige el destinatario del mensaje</string>
-    <string name="action_continue">Continuar</string>
-    <string name="scan_qr_code">Leer código QR</string>
-    <string name="enter_recipient_uuid">Introduce el ID de usuario del destinatario</string>
+  <string name="action_continue">Continuar</string>
     <string name="invited_to_party">¡Te han invitado a un Equipo!</string>
-    <string name="stats_widget_label">Estadísticas de Habitica</string>
-    <string name="add_task">Añadir Tarea</string>
-    <string name="add_habit">Añadir Hábito</string>
-    <string name="add_daily">Añadir Tarea Diaria</string>
-    <string name="add_todo">Añadir Tarea Pendiente</string>
-    <string name="add_reward">Añadir recompensa</string>
-    <string name="all_dailies_completed">Ha completado todas tus tareas diarias. ¡Buen trabajo!</string>
-    <string name="widget_habit_button">Hábitos Habitica</string>
-    <string name="widget_dailies">Tareas Diarias Habitica</string>
-    <string name="widget_todo_list">Tareas Pendientes</string>
-    <string name="widget_add_task">Añadir Tarea Habitica</string>
+  <string name="stats_widget_label">Estadísticas de Habitica</string>
+  <string name="add_task">Añadir Tarea</string>
+  <string name="add_habit">Añadir Hábito</string>
+  <string name="add_daily">Añadir Tarea Diaria</string>
+  <string name="add_todo">Añadir Tarea Pendiente</string>
+  <string name="add_reward">Añadir recompensa</string>
+  <string name="all_dailies_completed">Ha completado todas tus tareas diarias. ¡Buen trabajo!</string>
+  <string name="widget_habit_button">Hábitos Habitica</string>
+  <string name="widget_dailies">Tareas Diarias Habitica</string>
+  <string name="widget_todo_list">Tareas Pendientes</string>
     <string name="google_services_missing">No pudieron encontrarse los servidores de Google Play.</string>
-    <string name="gem.purchase.toolbartitle">Compra</string>
-    <string name="gem.purchase.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-    <string name="gem.purchase.subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
-    <string name="gem.purchase.listitem1">Disfraces geniales para tu personaje</string>
-    <string name="gem.purchase.listitem2">Fondos increíbles</string>
-    <string name="gem.purchase.listitem3">Misiones que te recompensan con huevos de mascota</string>
-    <string name="gem.purchase.listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
-    <string name="support_habitica">Apoya Habitica</string>
-    <string name="skill_transformation_use">usa</string>
-    <string name="hatching_market_info">¿No consigues los objetos que necesitas? ¡Echa un vistazo al Mercado!</string>
-    <string name="feeding_market_info">¿Necesitas un alimento diferente? ¡Compra más en el Mercado!</string>
-    <string name="open_market">Abrir el Mercado</string>
-    <string name="cds_description">Tus Tareas Diarias serán reiniciadas la próxima vez que uses Habitica después de %1$s. ¡Asegúrate de completarlas todas antes de entonces!</string>
-    <string name="AudioTheme_title">Tema de audio</string>
-    <string name="AudioTheme_summary">Cambiar el tema de audio de Habitica</string>
-    <!--Login Incentives-->
-    <string name="see_you_tomorrow">¡Hasta mañana!</string>
-    <string name="belongs_to_challenge">Pertenece a un Desafío</string>
-    <string name="has_reminder">Tiene Recordatorio</string>
-    <string name="has_tag">Tiene Etiqueta</string>
-    <string name="subscribe.title">La suscripción apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-    <string name="subscribe_prompt">Conviértete en suscriptor y obtendrás estos útiles beneficios:</string>
-    <string name="subscribe.listitem1">Compra gemas con oro</string>
-    <string name="subscribe.listitem2">Exclusivos artículos mensuales</string>
-    <string name="subscribe.listitem3">Conservar entradas de historial adicionales</string>
-    <string name="subscribe.listitem4">Los límites diarios se duplicaron</string>
-    <string name="subscriptions">Suscripciones</string>
-    <string name="subscription_duration">Se repite cada %s</string>
-    <string name="subscription_duration_norenew">Por %s</string>
-    <string name="subscribe">Suscríbete</string>
-    <string name="subscribe.listitem1.description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
-    <string name="subscribe.listitem2.description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
-    <string name="subscribe.listitem3.description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
-    <string name="subscribe.listitem4.description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
-    <string name="subscribe1month.gemcap">Límite de 25 gemas</string>
-    <string name="subscribe3month.gemcap">Límite de 30 gemas</string>
-    <string name="subscribe6month.gemcap">Límite de 35 gemas</string>
-    <string name="subscribe12month.gemcap">Límite de 45 gemas</string>
-    <string name="subscription_hourglasses">+%d Relojes de Arena Místicos</string>
-    <string name="payment_method">Método de pago</string>
-    <string name="subscription">Suscripción</string>
-    <string name="active">Activa</string>
-    <string name="due">Vence</string>
-    <string name="cancel_subscription">Cancelar suscripción</string>
-    <string name="cancel_subscription_google.description">¿Ya no quieres suscribirte? Puedes encontrar la opción de cancelar la suscripción en la sección \"Mis aplicaciones\" de la Google Play Store.</string>
-    <string name="cancel_subscription_notgoogle.description">¿Ya no quieres suscribirte? Debido a tu método de pago, sólo puedes cancelar tu suscripción a través del sitio de ueb. Haga clic en el botón de abajo, para abrir el sitio en tu navegador!</string>
-    <string name="visit_habitica_website">Visitar la página de Habitica</string>
-    <string name="current_bonuses">Bonificaciones Actuales</string>
-    <string name="months_subscribed">Meses suscrito</string>
-    <string name="current_hourclasses">Relojes de Arena Místicos actuales</string>
-    <string name="monthly_gem_cap">Límite mensual de gemas</string>
-    <string name="inactive">Inactiva</string>
-    <string name="one_month">1 Mes</string>
-    <string name="months">Meses</string>
-    <string name="month">mes</string>
-    <string name="three_months">3 meses</string>
-    <string name="six_months">6 meses</string>
-    <string name="twelve_months">12 meses</string>
-    <string name="subscribe_prompt_thanks">Por Suscribirte disfrutas de estos útiles beneficios:</string>
-    <string name="subscription_status">Estado de Suscripción</string>
-    <string name="byLeader">por %s</string>
-    <string name="challenge_details">Detalles del Desafío</string>
+  <string name="gem_purchase_toolbartitle">Compra</string>
+  <string name="gem_purchase_title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="gem_purchase_subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
+  <string name="gem_purchase_listitem1">Disfraces geniales para tu personaje</string>
+  <string name="gem_purchase_listitem2">Fondos increíbles</string>
+  <string name="gem_purchase_listitem3">Misiones que te recompensan con huevos de mascota</string>
+  <string name="gem_purchase_listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
+  <string name="support_habitica">Apoya Habitica</string>
+  <string name="skill_transformation_use">usa</string>
+  <string name="hatching_market_info">¿No consigues los objetos que necesitas? ¡Echa un vistazo al Mercado!</string>
+  <string name="feeding_market_info">¿Necesitas un alimento diferente? ¡Compra más en el Mercado!</string>
+  <string name="open_market">Abrir el Mercado</string>
+  <string name="cds_description">Tus Tareas Diarias serán reiniciadas la próxima vez que uses Habitica después de %1$s. ¡Asegúrate de completarlas todas antes de entonces!</string>
+  <string name="AudioTheme_title">Tema de audio</string>
+  <string name="AudioTheme_summary">Cambiar el tema de audio de Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">¡Hasta mañana!</string>
+  <string name="belongs_to_challenge">Pertenece a un Desafío</string>
+  <string name="has_reminder">Tiene Recordatorio</string>
+  <string name="has_tag">Tiene Etiqueta</string>
+  <string name="subscribe_title">La suscripción apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="subscribe_prompt">Conviértete en suscriptor y obtendrás estos útiles beneficios:</string>
+  <string name="subscribe_listitem1">Compra gemas con oro</string>
+  <string name="subscribe_listitem2">Exclusivos artículos mensuales</string>
+  <string name="subscribe_listitem3">Conservar entradas de historial adicionales</string>
+  <string name="subscribe_listitem4">Los límites diarios se duplicaron</string>
+  <string name="subscriptions">Suscripciones</string>
+  <string name="subscription_duration">Se repite cada %s</string>
+  <string name="subscription_duration_norenew">Por %s</string>
+  <string name="subscribe">Suscríbete</string>
+  <string name="subscribe_listitem1_description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
+  <string name="subscribe_listitem2_description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
+  <string name="subscribe_listitem3_description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
+  <string name="subscribe_listitem4_description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
+  <string name="subscribe1month_gemcap">Límite de 25 gemas</string>
+  <string name="subscribe3month_gemcap">Límite de 30 gemas</string>
+  <string name="subscribe6month_gemcap">Límite de 35 gemas</string>
+  <string name="subscribe12month_gemcap">Límite de 45 gemas</string>
+  <string name="subscription_hourglasses">+%d Relojes de Arena Místicos</string>
+  <string name="payment_method">Método de pago</string>
+  <string name="subscription">Suscripción</string>
+  <string name="active">Activa</string>
+  <string name="due">Vence</string>
+  <string name="cancel_subscription">Cancelar suscripción</string>
+  <string name="cancel_subscription_google_description">¿Ya no quieres suscribirte? Puedes encontrar la opción de cancelar la suscripción en la sección \"Mis aplicaciones\" de la Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">¿Ya no quieres suscribirte? Debido a tu método de pago, sólo puedes cancelar tu suscripción a través del sitio de ueb. Haga clic en el botón de abajo, para abrir el sitio en tu navegador!</string>
+  <string name="visit_habitica_website">Visitar la página de Habitica</string>
+  <string name="current_bonuses">Bonificaciones Actuales</string>
+  <string name="months_subscribed">Meses suscrito</string>
+  <string name="current_hourclasses">Relojes de Arena Místicos actuales</string>
+  <string name="monthly_gem_cap">Límite mensual de gemas</string>
+  <string name="inactive">Inactiva</string>
+  <string name="one_month">1 Mes</string>
+  <string name="months">%d Meses</string>
+  <string name="month">mes</string>
+  <string name="three_months">3 meses</string>
+  <string name="six_months">6 meses</string>
+  <string name="twelve_months">12 meses</string>
+  <string name="subscribe_prompt_thanks">Por Suscribirte disfrutas de estos útiles beneficios:</string>
+  <string name="subscription_status">Estado de Suscripción</string>
     <string name="challenge_leave_title">Abandonar Desafío</string>
-    <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
-    <string name="challenge_remove_tasks_title">Eliminar tareas</string>
-    <string name="challenge_remove_tasks_text">¿Quieres eliminar las tareas?</string>
-    <string name="remove_tasks">Eliminar</string>
-    <string name="keep_tasks">Mantener</string>
-    <string name="my_challenges">Mis Desafíos</string>
-    <string name="public_challenges">Público</string>
-    <string name="challenges">Desafíos</string>
+  <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Eliminar tareas</string>
+  <string name="challenge_remove_tasks_text">¿Quieres eliminar las tareas?</string>
+  <string name="remove_tasks">Eliminar</string>
+  <string name="keep_tasks">Mantener</string>
+  <string name="my_challenges">Mis Desafíos</string>
     <string name="daily">Tarea diaria</string>
-    <string name="habit">Hábito</string>
-    <string name="reward">Recompensa</string>
-    <string name="todo">Tarea Pendiente</string>
-    <string name="official">Oficial</string>
-    <string name="participating">Participando</string>
+  <string name="habit">Hábito</string>
+  <string name="reward">Recompensa</string>
+  <string name="todo">Tarea Pendiente</string>
+  <string name="official">Oficial</string>
     <string name="challenge">Desafío</string>
-    <string name="go_to_challenge">Ir al Desafío</string>
     <string name="not_part_of_a_challenge">¡Ahora mismo no formas parte de ningún Desafío!</string>
-    <string name="join_a_challenge">Únete a un desafío para agregar un conjunto de tareas de comisariados a tu lista, luego compite contra otros Habiticanos para ganar logros e incluso joyas!</string>
-    <string name="check_the_public_challenge_tab">Toque la pestaña \"Público\" para encontrar los Desafíos creados por el usuario que son de tu preferencia!</string>
-    <string name="add_reminder">Añadir Recordatorio</string>
-    <string name="warning">Aviso</string>
-    <string name="open_settings">Abrir Ajustes</string>
-    <string name="dont_keep_activities_warning">Parece que tienes la opción de Desarrollador \ \"No mantener actividades \\" activa. Actualmente, esta opción causa problemas con la aplicación habitica, por lo que sugerimos desactivarla.</string>
+  <string name="join_a_challenge">Únete a un desafío para agregar un conjunto de tareas de comisariados a tu lista, luego compite contra otros Habiticanos para ganar logros e incluso joyas!</string>
+  <string name="check_the_public_challenge_tab">Toque la pestaña \"Público\" para encontrar los Desafíos creados por el usuario que son de tu preferencia!</string>
     <string name="inbox">Mensajes</string>
-    <string name="FAQ">Preguntas Frecuentes</string>
     <string name="special">Especial</string>
-    <string name="gem_for_gold_description">Por estar suscrito a Habitica, puedes comprar cierta cantidad de Gemas cada mes utilizando Oro.</string>
-    <string name="limited_count">%d restantes</string>
+  <string name="gem_for_gold_description">Por estar suscrito a Habitica, puedes comprar cierta cantidad de Gemas cada mes utilizando Oro.</string>
     <string name="gem_shop">Gema</string>
-    <string name="mystery_item">Objeto Misterioso</string>
-    <string name="myster_item_notes">Cada mes, los suscriptores recibirán un objeto misterioso. Suele entregarse una semana antes del final de mes.</string>
-    <string name="open">Abrir</string>
-    <string name="notification_mystery_item">¡Abres la caja y encuentras %s!</string>
+  <string name="mystery_item">Objeto Misterioso</string>
+  <string name="myster_item_notes">Cada mes, los suscriptores recibirán un objeto misterioso. Suele entregarse una semana antes del final de mes.</string>
+  <string name="open">Abrir</string>
     <string name="checkInRewardEarned">Ganaste %1$s como recompensa por tu devoción por mejorar tu vida. </string>
-    <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Próximo premio en %1$d Registros</string>
-    <string name="pending_approval">Esperando aprobación</string>
-    <string name="filters">Filtros</string>
-    <string name="done">Hecho</string>
-    <string name="group_tasks_edit_description">Las Tareas de Grupo no pueden editarse.</string>
-    <string name="group_tasks_edit_title">No se puede editar esta tarea</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Tu próximo premio se desbloqueará en %1$d Registros</string>
+  <string name="pending_approval">Esperando aprobación</string>
+  <string name="filters">Filtros</string>
+  <string name="done">Hecho</string>
     <string name="groups">Grupos</string>
-    <string name="all">Todo</string>
-    <string name="none">Ningún </string>
-    <string name="owned">Poseído</string>
-    <string name="not_owned">No poseído</string>
-    <string name="new_game">Nuevo Juego</string>
+  <string name="all">Todo</string>
+  <string name="none">Ningún </string>
+  <string name="owned">Poseído</string>
+  <string name="not_owned">No poseído</string>
     <string name="login_btn_fb">Iniciar sesión con Facebook</string>
-    <string name="login_btn_google">Iniciar sesión con Google</string>
-    <string name="action_back">Atrás</string>
-    <string name="welcome_text">Oh, debes ser nuevo aquí. Soy Justin, seré tu guía en Habitica.\n\nPara empezar, ¿cómo debemos llamarte? Siéntete libre de cambiar el nombre que he elegido. Cuando estés listo, ¡Vamos a crear tu avatar!</string>
-    <string name="randomize">Aleatorizar</string>
-    <string name="avatar_extras">Extras</string>
-    <string name="avatar_skin_color">Color de piel</string>
-    <string name="avatar_hair_color">Color de pelo</string>
-    <string name="avatar_hair_bangs">Flequillos</string>
-    <string name="avatar_hair_ponytail">Coleta</string>
-    <string name="avatar_glasses">Gafas</string>
-    <string name="avatar_wheelchair">Silla de ruedas</string>
-    <string name="weak">Débil</string>
-    <string name="strong">Fuerte</string>
-    <string name="gray">Gris</string>
-    <string name="dated">Programado</string>
-    <string name="completed">Completado</string>
-    <string name="setuP_group_other">Otro</string>
-    <string name="clear">Borrar</string>
-    <string name="empty_title_habits">No tienes ningún Hábito</string>
-    <string name="empty_description_habits">Los hábitos son tareas que no tienen un horario rígido. Puedes comprobar ellos fuera muchas veces al día, o no en absoluto.</string>
-    <string name="empty_title_dailies">No tienes ningún Tareas Diarios</string>
-    <string name="empty_description_dailies">Tareas Diarias son tareas que se repiten sobre una base regular. Elija el horario que funciona para ti!</string>
-    <string name="empty_title_todos">No tienes ninguna tarea</string>
-    <string name="empty_description_todos">Tareas son tareas que sólo se deben completar una vez. Añade listas a tus Tareas para aumentar su valor.</string>
-    <string name="empty_title_rewards">No tienes Premios</string>
-    <string name="reset_walkthrough">Restablecer Tutoriales</string>
-    <string name="read_community_guidelines">Revisa nuestras <u>Normas de la Comunidad</u> antes de publicar un mensaje</string>
-    <string name="maintenance">Mantenimiento</string>
-    <string name="reload_content">Recargar Contenido</string>
-    <string name="dailyDueDefaultView">Establecer Tareas Diarias por defecto en la pestaña \'debido\'</string>
-    <string name="dailyDueDefaultViewDescription">Con esta opción establecida, Tareas Diarias tendrán por defecto \'debido\' en lugar de \'todo\'</string>
-    <string name="repeat_summary">Repite %1$scada%2$s%3$s%4$s</string>
-    <string name="no_billing_gems">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si deseas comprar Gemas.</string>
-    <string name="no_billing_subscriptions">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si quieres comprar una suscripción.</string>
-    <string name="save">Guardar</string>
-    <string name="location">Sitio</string>
-    <string name="gem_reward">Premio en Gemas</string>
-    <string name="tasks">Tareas</string>
-    <string name="create_challenge">Crear Desafío</string>
-    <string name="edit_challenge">Editar</string>
+  <string name="login_btn_google">Iniciar sesión con Google</string>
+  <string name="action_back">Atrás</string>
+  <string name="welcome_text">Oh, debes ser nuevo aquí. Soy Justin, seré tu guía en Habitica.\n\nPara empezar, ¿cómo debemos llamarte? Siéntete libre de cambiar el nombre que he elegido. Cuando estés listo, ¡Vamos a crear tu avatar!</string>
+  <string name="randomize">Aleatorizar</string>
+  <string name="avatar_extras">Extras</string>
+  <string name="avatar_skin_color">Color de piel</string>
+  <string name="avatar_hair_color">Color de pelo</string>
+  <string name="avatar_hair_bangs">Flequillos</string>
+  <string name="avatar_hair_ponytail">Coleta</string>
+  <string name="avatar_glasses">Gafas</string>
+  <string name="avatar_wheelchair">Silla de ruedas</string>
+  <string name="weak">Débil</string>
+  <string name="strong">Fuerte</string>
+  <string name="gray">Gris</string>
+  <string name="dated">Programado</string>
+  <string name="completed">Completado</string>
+  <string name="setuP_group_other">Otro</string>
+  <string name="clear">Borrar</string>
+  <string name="empty_title_habits">No tienes ningún Hábito</string>
+  <string name="empty_description_habits">Los hábitos son tareas que no tienen un horario rígido. Puedes comprobar ellos fuera muchas veces al día, o no en absoluto.</string>
+  <string name="empty_title_dailies">No tienes ningún Tareas Diarios</string>
+  <string name="empty_description_dailies">Tareas Diarias son tareas que se repiten sobre una base regular. Elija el horario que funciona para ti!</string>
+  <string name="empty_title_todos">No tienes ninguna tarea</string>
+  <string name="empty_description_todos">Tareas son tareas que sólo se deben completar una vez. Añade listas a tus Tareas para aumentar su valor.</string>
+  <string name="empty_title_rewards">No tienes Premios</string>
+  <string name="reset_walkthrough">Restablecer el tutorial de Justin</string>
+  <string name="read_community_guidelines">Por favor, lea nuestras directrices de la Comunidad antes de publicar</string>
+  <string name="maintenance">Mantenimiento</string>
+  <string name="reload_content">Recargar Contenido</string>
+  <string name="dailyDueDefaultView">Establecer Tareas Diarias por defecto en la pestaña \'debido\'</string>
+  <string name="dailyDueDefaultViewDescription">Con esta opción establecida, Tareas Diarias tendrán por defecto \'debido\' en lugar de \'todo\'</string>
+  <string name="no_billing_gems">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si deseas comprar Gemas.</string>
+  <string name="no_billing_subscriptions">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si quieres comprar una suscripción.</string>
+  <string name="save">Guardar</string>
+  <string name="location">Sitio</string>
+  <string name="gem_reward">Premio en Gemas</string>
+  <string name="tasks">Tareas</string>
+  <string name="create_challenge">Crear Desafío</string>
     <string name="challenge_create_error_tavern_one_gem">Necesitas al menos 1 Gema para crear un Desafío público.</string>
-    <string name="challenge_create_error_enough_gems">No tienes Gemas suficientes para crear un Reto.</string>
-    <string name="identify_your_challenge_with_a_tag">Identifica tu desafío con un nombre corto</string>
-    <string name="challenge_create_error_tag">Necesitas un nombre corto para crear este Desafío.</string>
-    <string name="challenge_create_error_no_tasks">Necesitas añadir al menos una tarea para crear este Reto.</string>
-    <string name="challenge_create_error_title">Necesitas un título para crear este Reto.</string>
-    <string name="description_optional">Descripción (opcional)</string>
-    <string name="new_challenge_title">Nuevo título del Reto</string>
-    <string name="ownership">Propiedad</string>
-    <string name="inn">Posada</string>
-    <string name="system">Sistema</string>
+  <string name="challenge_create_error_enough_gems">No tienes Gemas suficientes para crear un Reto.</string>
+  <string name="identify_your_challenge_with_a_tag">Identifica tu desafío con un nombre corto</string>
+  <string name="challenge_create_error_tag">Necesitas un nombre corto para crear este Desafío.</string>
+  <string name="challenge_create_error_no_tasks">Necesitas añadir al menos una tarea para crear este Reto.</string>
+  <string name="challenge_create_error_title">Necesitas un título para crear este Reto.</string>
+  <string name="description_optional">Descripción (opcional)</string>
+  <string name="new_challenge_title">Nuevo título del Reto</string>
+  <string name="ownership">Propiedad</string>
+  <string name="inn">Posada</string>
     <string name="start_quest">Iniciar una nueva Búsqueda</string>
-    <string name="leave_party">Dejar Equipo</string>
-    <string name="party_description">Descripción del Equipo</string>
-    <string name="abort_confirmation">¿Estás seguro de que quieres abortar esta misión\? Se abortará para todos en el equipo y todo progreso se perderá. El Pergamino de Misión se devolverá al propietario de la misión.</string>
-    <string name="leave_quest_confirmation">¿Estás seguro de que quieres dejar la Misión activa\? Todo tu progreso de misión se perderá.</string>
+  <string name="leave_party">Dejar Equipo</string>
+  <string name="party_description">Descripción del Equipo</string>
     <string name="number_participants">%1$dParticipantes</string>
-    <string name="welcome_back">Bienvenido/a de vuelta</string>
-    <string name="yesterdaililes_prompt">Marca las Tareas Diarias que hiciste ayer:</string>
-    <string name="start_day">Empezar mi día</string>
-    <string name="leave_party_confirmation">¿Seguro que quieres salir del Equipo\?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Siguiente premio en %d Registros</string>
+  <string name="welcome_back">¡Bienvenido/a de vuelta!</string>
+  <string name="yesterdaililes_prompt">¿Has hecho alguno de estos Diarios ayer?</string>
+  <string name="start_day">Empezar mi día</string>
+  <string name="leave_party_confirmation">¿Seguro que quieres salir del Equipo\?</string>
     <string name="pending">Pendiente</string>
-    <string name="accepted">Aceptado</string>
-    <string name="declined">Rechazado</string>
-    <string name="participants">Participantes</string>
-    <string name="invitations">Invitaciones</string>
-    <string name="quest_leader_header" formatted="false">Comenzado por %s</string>
-    <string name="quest_abort_message">¿Estás seguro de que quieres abortar esta misión\? Se abortará para todos en el equipo y todo progreso se perderá. El Pergamino de Misión será devuelto al propietario de la misión.</string>
-    <string name="loading">Cargando…</string>
+  <string name="accepted">Aceptado</string>
+  <string name="declined">Rechazado</string>
+  <string name="participants">Participantes</string>
+  <string name="invitations">Invitaciones</string>
+  <string name="quest_leader_header">Comenzado por %s</string>
+  <string name="quest_abort_message">¿Estás seguro de que quieres abortar esta misión\? Se abortará para todos en el equipo y todo progreso se perderá. El Pergamino de Misión será devuelto al propietario de la misión.</string>
     <string name="reloading_content">Recargando Contenido</string>
-    <string name="thousand_abbrev">k</string>
-    <string name="million_abbrev">m</string>
-    <string name="billion_abbrev">b</string>
-    <string name="your_balance">Tu saldo:</string>
-    <string name="available_until" formatted="false">Disponible hasta %s</string>
-    <string name="gems_left_max" formatted="false">Gemas Mensuales:%1$d/%2$d Restante</string>
-    <string name="gems_left_nomax" formatted="false">Gemas Mensuales: %d Restante</string>
-    <string name="health">Salud</string>
-    <string name="collect">Recoger</string>
-    <string name="rage_meter">Metro de Rabia</string>
-    <string name="boss_quest">Búsqueda del Capo</string>
-    <string name="collection_quest">Búsqueda de Recaudación</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-    <string name="experience_reward" formatted="false">%d Puntos de Experiencia</string>
-    <string name="gold_reward" formatted="false">%d Oro</string>
-    <string name="quest_owner_rewards">Premios de Propietario de la Búsqueda</string>
-    <string name="str_abbrv">Fue</string>
-    <string name="per_abbrv">Per</string>
-    <string name="int_abbrv">Int</string>
-    <string name="con_abbrv">Con</string>
-    <string name="reset_account">Restablecer Cuenta</string>
-    <string name="reset_account_description">¡ADVERTENCIA! Esta opción restablece muchas partes de tu cuenta. Esto es extremadamente desalentado, pero algunas personas lo encuentran útil al principio después de jugar con el sitio por un corto período de tiempo. Perderás todos sus niveles, oro y puntos de experiencia. Todas tus tareas (con la excepción de las de Retos) se eliminarán permanentemente y perderá todos sus datos históricos. Perderás todo tu equipo pero podrás comprarlo todo de nuevo, incluyendo todo el equipo de edición limitada o artículos Misteriosos abonado que ya posee (tendrá que estar en la clase correcta para volver a comprar equipo específico de la clase). Mantendrás tu clase actual y tus mascotas y monturas. Es posible que prefieras usar el Orbe de Renacimiento en su lugar, que es una opción mucho más segura y que preservará sus tareas y equipos.</string>
-    <string name="delete_account">Borrar Cuenta</string>
-    <string name="delete_account_description">¿Estás seguro? Esta opción eliminará tu cuenta para siempre, y nunca se puede restaurar! Tendrás que registrar una nueva cuenta para usar Habitica nuevamente. Las Gemas depositadas o gastadas no serán reembolsadas. Si estás absolutamente seguro, escriba tu contraseña en el cuadro de texto abajo. </string>
-    <string name="reset_account_confirmation">Reestablecer mi Cuenta</string>
-    <string name="delete_account_confirmation">Borrar mi Cuenta</string>
-    <string name="danger_zone">Zona Peligrosa</string>
-    <string name="nevermind">No importa</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+    <string name="available_until">Disponible hasta %s</string>
+  <string name="gems_left_max">Gemas Mensuales:%1$d/%2$d Restante</string>
+  <string name="gems_left_nomax">Gemas Mensuales: %d Restante</string>
+  <string name="health">Salud</string>
+  <string name="collect">Recoger</string>
+  <string name="rage_meter">Metro de Rabia</string>
+  <string name="boss_quest">Búsqueda del Capo</string>
+  <string name="collection_quest">Búsqueda de Recaudación</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Puntos de Experiencia</string>
+  <string name="gold_reward">%d Oro</string>
+  <string name="quest_owner_rewards">Premios de Propietario de la Búsqueda</string>
+  <string name="str_abbrv">Fue</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
+  <string name="reset_account">Restablecer Cuenta</string>
+  <string name="reset_account_description">¡ADVERTENCIA! Esta opción restablece muchas partes de tu cuenta. Esto es extremadamente desalentado, pero algunas personas lo encuentran útil al principio después de jugar con el sitio por un corto período de tiempo. Perderás todos sus niveles, oro y puntos de experiencia. Todas tus tareas (con la excepción de las de Retos) se eliminarán permanentemente y perderá todos sus datos históricos. Perderás todo tu equipo pero podrás comprarlo todo de nuevo, incluyendo todo el equipo de edición limitada o artículos Misteriosos abonado que ya posee (tendrá que estar en la clase correcta para volver a comprar equipo específico de la clase). Mantendrás tu clase actual y tus mascotas y monturas. Es posible que prefieras usar el Orbe de Renacimiento en su lugar, que es una opción mucho más segura y que preservará sus tareas y equipos.</string>
+  <string name="delete_account">Borrar Cuenta</string>
+  <string name="delete_account_description">¿Estás seguro? Esta opción eliminará tu cuenta para siempre, y nunca se puede restaurar! Tendrás que registrar una nueva cuenta para usar Habitica nuevamente. Las Gemas depositadas o gastadas no serán reembolsadas. Si estás absolutamente seguro, escriba tu contraseña en el cuadro de texto abajo. </string>
+  <string name="reset_account_confirmation">Reestablecer mi cuenta</string>
+  <string name="delete_account_confirmation">Borrar mi cuenta</string>
+  <string name="danger_zone">Zona Peligrosa</string>
     <string name="resetting_account">Reestableciendo cuenta</string>
-    <string name="deleting_account">Borrando cuenta</string>
-    <string name="insufficientGold">¡Debes completar más tareas antes de poder pagar este artículo!</string>
-    <string name="insufficientGoldTitle">Insuficiente oro</string>
-    <string name="insufficientGems">¡Necesitarás más gemas para comprar este objeto!</string>
-    <string name="purchase_gems">Comprar gemas</string>
-    <string name="insufficientHourglasses">¡Necesitarás más Relojes de Arena Místicos para comprar este objeto!</string>
-    <string name="get_hourglasses">Conseguir Relojes de Arena</string>
-    <string name="subscribe_for_hourglasses">Suscribir para conseguir Relojes de Arena</string>
-    <string name="timetravelers_closed_description">Consigue un Reloj de arena Místico por cada tres meses seguidos de suscripción. Podrás usarlo para desbloquear objetos exclusivos, mascotas o monturas del pasado... ¡y del futuro!</string>
-    <string name="want_to_subscribe">Quiero Suscribirme</string>
-    <string name="seasonal_closed_description">Las Grandes Galas ocurren cerca de los solsticios y equinoccios, ¡así que vuelve de vez en cuando para encontrar una interesante variedad de artículos especiales de temporada!</string>
-    <string name="come_back_soon">¡Vuelve pronto!</string>
-    <string name="level">Nivel</string>
-    <string name="streak_label">Racha de 21 Días</string>
-    <string name="stats">Atributos</string>
-    <string name="fix_character_description">Si has encontrado un error o has cometido un error que cambió a tu personaje injustamente, puedes corregir manualmente esos valores aquí.</string>
-    <string name="fix_character_values">Arreglar Valores del Personaje</string>
-    <string name="saving">Guardando</string>
-    <string name="forgot_password_title">Enviar un correo electrónico con un enlace para restablecer la contraseña</string>
-    <string name="forgot_password_description">Introduce la dirección de correo electrónico que usaste para registrarte en Habitica.</string>
-    <string name="forgot_password_confirmation">Si tenemos tu correo electrónico en el archivo, las instrucciones para establecer una nueva contraseña se han enviado al correo electrónico.</string>
-    <string name="ok">Vale</string>
-    <string name="profile">Perfil</string>
-    <string name="profile_summary">Editar tu perfil público.</string>
-    <string name="display_name">Mostrar Nombre</string>
-    <string name="photo_url">URL de foto</string>
-    <string name="login_name">Nombre de Inicio de sesión</string>
-    <string name="about">Información</string>
-    <string name="app_settings">Ajustes de la Aplicación</string>
-    <string name="authentication">Autentificación</string>
-    <string name="authentication_summary">Cambia tus opciones de autentificación.</string>
-    <string name="change_password">Cambia la contraseña</string>
-    <string name="change_email">Cambia dirección de correo</string>
-    <string name="change_login_name">Cambiar Nombre de Inicio de sesión</string>
+  <string name="deleting_account">Borrando cuenta</string>
+  <string name="insufficientGold">¡Debes completar más tareas antes de poder pagar este artículo!</string>
+  <string name="insufficientGoldTitle">Insuficiente oro</string>
+  <string name="insufficientGems">¡Necesitarás más gemas para comprar este objeto!</string>
+  <string name="purchase_gems">Comprar gemas</string>
+  <string name="insufficientHourglasses">¡Necesitarás más Relojes de Arena Místicos para comprar este objeto!</string>
+  <string name="get_hourglasses">Conseguir Relojes de Arena</string>
+  <string name="subscribe_for_hourglasses">Suscribir para conseguir Relojes de Arena</string>
+  <string name="timetravelers_closed_description">Consigue un Reloj de arena Místico por cada tres meses seguidos de suscripción. Podrás usarlo para desbloquear objetos exclusivos, mascotas o monturas del pasado... ¡y del futuro!</string>
+  <string name="want_to_subscribe">Quiero Suscribirme</string>
+  <string name="seasonal_closed_description">Las Grandes Galas ocurren cerca de los solsticios y equinoccios, ¡así que vuelve de vez en cuando para encontrar una interesante variedad de artículos especiales de temporada!</string>
+  <string name="come_back_soon">¡Vuelve pronto!</string>
+  <string name="level">Nivel</string>
+  <string name="streak_label">Racha de 21 Días</string>
+  <string name="stats">Atributos</string>
+  <string name="fix_character_description">Si has encontrado un error o has cometido un error que cambió a tu personaje injustamente, puedes corregir manualmente esos valores aquí.</string>
+  <string name="fix_character_values">Arreglar Valores del Personaje</string>
+  <string name="saving">Guardando</string>
+  <string name="forgot_password_title">Enviar un correo electrónico con un enlace para restablecer la contraseña</string>
+  <string name="forgot_password_description">Introduce la dirección de correo electrónico que usaste para registrarte en Habitica.</string>
+  <string name="forgot_password_confirmation">Si tenemos tu correo electrónico en el archivo, las instrucciones para establecer una nueva contraseña se han enviado al correo electrónico.</string>
+  <string name="ok">Vale</string>
+  <string name="profile">Perfil</string>
+  <string name="profile_summary">Editar tu perfil público.</string>
+  <string name="display_name">Mostrar Nombre</string>
+  <string name="photo_url">URL de foto</string>
+  <string name="login_name">Nombre de Inicio de sesión</string>
+  <string name="about">Información</string>
+  <string name="app_settings">Ajustes de la Aplicación</string>
+  <string name="authentication">Autentificación</string>
+  <string name="authentication_summary">Cambia tus opciones de autentificación.</string>
+  <string name="change_password">Cambia la contraseña</string>
+  <string name="change_email">Cambia dirección de correo</string>
     <string name="change_username">Cambiar Nombre de usuario</string>
-    <string name="change">Cambiar</string>
-    <string name="character_level">Nivel de Personaje</string>
-    <string name="auto_allocate_points">Asignar Puntos Automáticamente</string>
-    <string name="stat_guide">Guía de Atributos</string>
-    <string name="character_build">Construcción de Personaje</string>
-    <string name="character_build_description">Cada nivel te otorga un punto para asignar a un atributo a tu elección. Puedes hacerlo manualmente o dejar que el juego decida por ti usando la opción de Distribución Automática.</string>
-    <string name="strength">Fuerza</string>
-    <string name="strength_description">Incrementa la posibilidad de asestar golpes críticos al sumar puntos en una tarea. También aumenta el daño que reciben los Jefes.</string>
-    <string name="intelligence">Inteligencia</string>
-    <string name="intelligence_description">Aumenta la exp ganada por completar tareas. También aumenta tu capacidad de maná y lo rápido que se regenera el maná al cabo del tiempo.</string>
-    <string name="constitution">Constitución</string>
-    <string name="constitution_description">Disminuye la cantidad de daño recibido de tus tareas. No disminuye el daño recibido de los jefes.</string>
-    <string name="perception">Percepción</string>
-    <string name="perception_description">Aumenta la probabilidad de encontrar recompensas al completar Tareas, el límite máximo diario, las Bonificaciones de Racha y la cantidad de oro otorgada por las Tareas.</string>
-    <string name="buffs">Apoyos</string>
-    <string name="allocated">Asignado</string>
-    <string name="distribute_evenly">Distribuir uniformemente</string>
-    <string name="distribute_class">Distribuir según la clase</string>
-    <string name="distribute_task">Distribuir según la actividad de las tareas</string>
-    <string name="no_points_to_allocate">No hay puntos que asignar</string>
-    <string name="points_to_allocate" formatted="false">%d puntos por asignar</string>
-    <string name="distribute_evenly_help">Asigna el mismo número de puntos a cada atributo.</string>
-    <string name="distribute_class_help">Asigna más puntos a los atributos importantes para tu Clase.</string>
-    <string name="distribute_task_help">Asigna puntos según las categorías de Fuerza, Inteligencia, Constitución y Percepción asociadas con las tareas que cumples.</string>
-    <string name="allocating_points">Asignación de Puntos</string>
-    <string name="class_equipment">Equipamiento</string>
-    <string name="equipment_empty">¡Ya tienes todo el equipamiento! Se sacarán más durante las Grand Galas, cerca de los solsticios y equinoccios.</string>
-    <string name="classless">Sin Clase</string>
-    <string name="class_equipment_shop_dialog">Este objeto solo está disponible para una clase específica.\nPuedes cambiar tu clase desde Ajustes.</string>
-    <string name="class_gear_disclaimer">Solo puedes comprar equipo para tu clase actual</string>
-    <string name="available_stats" formatted="false">%d puntos</string>
-    <string name="toogle_emojis">Activar/desactivar emoticonos</string>
+  <string name="change">Cambiar</string>
+  <string name="character_level">Nivel de Personaje</string>
+  <string name="auto_allocate_points">Asignar Puntos Automáticamente</string>
+  <string name="stat_guide">Guía de Atributos</string>
+  <string name="character_build">Construcción de Personaje</string>
+  <string name="character_build_description">Cada nivel te otorga un punto para asignar a un atributo a tu elección. Puedes hacerlo manualmente o dejar que el juego decida por ti usando la opción de Distribución Automática.</string>
+  <string name="strength">Fuerza</string>
+  <string name="strength_description">Incrementa la posibilidad de asestar golpes críticos al sumar puntos en una tarea. También aumenta el daño que reciben los Jefes.</string>
+  <string name="intelligence">Inteligencia</string>
+  <string name="intelligence_description">Aumenta la exp ganada por completar tareas. También aumenta tu capacidad de maná y lo rápido que se regenera el maná al cabo del tiempo.</string>
+  <string name="constitution">Constitución</string>
+  <string name="constitution_description">Disminuye la cantidad de daño recibido de tus tareas. No disminuye el daño recibido de los jefes.</string>
+  <string name="perception">Percepción</string>
+  <string name="perception_description">Aumenta la probabilidad de encontrar recompensas al completar Tareas, el límite máximo diario, las Bonificaciones de Racha y la cantidad de oro otorgada por las Tareas.</string>
+  <string name="buffs">Apoyos</string>
+  <string name="allocated">Asignado</string>
+  <string name="distribute_evenly">Distribuir uniformemente</string>
+  <string name="distribute_class">Distribuir según la clase</string>
+  <string name="distribute_task">Distribuir según la actividad de las tareas</string>
+  <string name="no_points_to_allocate">No hay puntos que asignar</string>
+  <string name="points_to_allocate">%d puntos por asignar</string>
+  <string name="distribute_evenly_help">Asigna el mismo número de puntos a cada atributo.</string>
+  <string name="distribute_class_help">Asigna más puntos a los atributos importantes para tu Clase.</string>
+  <string name="distribute_task_help">Asigna puntos según las categorías de Fuerza, Inteligencia, Constitución y Percepción asociadas con las tareas que cumples.</string>
+  <string name="allocating_points">Asignación de Puntos</string>
+  <string name="class_equipment">Equipamiento</string>
+  <string name="equipment_empty">¡Ya tienes todo el equipamiento! Se sacarán más durante las Grand Galas, cerca de los solsticios y equinoccios.</string>
+  <string name="classless">Sin Clase</string>
+  <string name="class_equipment_shop_dialog">Este objeto solo está disponible para una clase específica.\nPuedes cambiar tu clase desde Ajustes.</string>
+  <string name="class_gear_disclaimer">Solo puedes comprar equipo para tu clase actual</string>
     <string name="tavern_description">¡Bienvenido a la posada! Trae una silla para conversar, o toma un descanso de sus tareas.</string>
-    <string name="check_into_inn">Entrar en la Posada</string>
-    <string name="community_guidelines">Normas de la comunidad</string>
-    <string name="view_community_guidelines">Ver las Normas de la comunidad</string>
-    <string name="guidelines_description">Habitica intenta crear un ambiente acogedor para usuarios de todas las edades y entornos, especialmente en espacios públicos como la Taberna. Si tienes alguna pregunta, consulta nuestras pautas, por favor.</string>
-    <string name="helpful_links">Enlaces útiles</string>
-    <string name="view_faq">Ver Preguntas Frecuentes</string>
-    <string name="report_bug">Notificar un error</string>
-    <string name="player_tiers">Rangos de Jugador</string>
-    <string name="staff_moderators">Miembros del personal y Moderadores</string>
-    <string name="tiers_descriptions">Los nombres de usuario coloreados que ves en el chat representan el escalafón de colaborador de una persona. ¡Cuanto más alto sea el escalafón, más ha contribuido la persona a habitica a través de arte, codificación, la comunidad o incluso más!</string>
-    <string name="navigation_drawer_open">Abrir panel de navegación</string>
-    <string name="navigation_drawer_close">Cerrar panel de navegación</string>
-    <string name="world_boss">Jefe Mundial</string>
-    <string name="world_boss_art">Imagen del jefe</string>
+  <string name="check_into_inn">Entrar en la Posada</string>
+  <string name="community_guidelines">Normas de la comunidad</string>
+  <string name="view_community_guidelines">Ver las Normas de la comunidad</string>
+  <string name="guidelines_description">Habitica intenta crear un ambiente acogedor para usuarios de todas las edades y entornos, especialmente en espacios públicos como la Taberna. Si tienes alguna pregunta, consulta nuestras pautas, por favor.</string>
+  <string name="helpful_links">Enlaces útiles</string>
+  <string name="view_faq">Ver Preguntas Frecuentes</string>
+  <string name="report_bug">Notificar un error</string>
+  <string name="player_tiers">Rangos de Jugador</string>
+  <string name="staff_moderators">Miembros del personal y Moderadores</string>
+  <string name="tiers_descriptions">Los nombres de usuario coloreados que ves en el chat representan el escalafón de colaborador de una persona. ¡Cuanto más alto sea el escalafón, más ha contribuido la persona a habitica a través de arte, codificación, la comunidad o incluso más!</string>
+  <string name="navigation_drawer_open">Abrir panel de navegación</string>
+  <string name="navigation_drawer_close">Cerrar panel de navegación</string>
+  <string name="world_boss">Jefe Mundial</string>
     <string name="boss_art">Imagen del jefe</string>
-    <string name="world_boss_description">Descripción del Jefe Mundial</string>
-    <string name="rage_strike_count" formatted="false">Ataque de ira: %d/%d</string>
-    <string name="pending_strike_description">¡Este ataque aún no ha ocurrido!\nEl Jefe Mundial arremeterá y atacará a uno de nuestros amigables tenderos una vez que su barra de ira se llene. ¡Mantente al día con tus Tareas Diarias para evitar que suceda!</string>
+  <string name="world_boss_description">Descripción del Jefe Mundial</string>
+  <string name="rage_strike_count">Ataque de ira: %d/%d</string>
     <string name="pending_strike_title">Ataque pendiente</string>
-    <string name="strike_description_title">¿Qué es un Ataque de Ira?</string>
-    <string name="strike_description_subtitle">Hay 3 posibles Ataques de Ira</string>
-    <string name="strike_description_description">Este indicador se llena cuando los Habiticanos fallan en sus Tareas Diarias. Si se llena, el Descorazonador desencadenará su ataque Congoja Devastadora sobre uno de los tenderos de Habitica, ¡así que asegúrate de hacer tus tareas!</string>
-    <string name="pending_strike_subtitle">¡Todavía no ha ocurrido ningún ataque!</string>
-    <string name="strike_active_title" formatted="false">¡El %s ha sido atacado!</string>
-    <string name="strike_active_subtitle" formatted="false">¡A %s se le ha roto el corazón!</string>
-    <string name="strike_active_description" formatted="false">Nuestro querido %s fue destrozado cuando el %s desmenuzó el %s. ¡¡Rápido, enfréntate a tus tareas para derrotar al monstruo y ayudar con la reconstrucción!!</string>
-    <string name="questShop">Tienda de Misiones</string>
-    <string name="market_owner_long">Alex el Mercader</string>
-    <string name="tavern_owner_long">Daniel el posadero</string>
-    <string name="stable_owner_long">Matt el maestro de las bestias</string>
-    <string name="hide_boss_art">Ocultar la Imagen del Jefe</string>
-    <string name="active_world_boss">Jefe Mundial Activo</string>
-    <string name="no_party_description">Realiza misiones con amigos o por tu cuenta. Combate monstruos, crea retos y ayúdate a ser responsable a través de los Equipos.</string>
-    <string name="no_party_title">Juega a Habitica en un Equipo</string>
-    <string name="join_party_description">Dale el nombre de usuario que hay abajo al un miembro del Equipo y ellos podrán mandarte una invitación</string>
-    <string name="join_party_description_id">Dales tu ID de Usuario o haz que escaneen tu código QR cuando te inviten</string>
+  <string name="strike_description_title">¿Qué es un Ataque de Ira?</string>
+    <string name="strike_active_title">¡El %s ha sido atacado!</string>
+    <string name="strike_active_description">Nuestro querido %s fue destrozado cuando el %s desmenuzó el %s. ¡¡Rápido, enfréntate a tus tareas para derrotar al monstruo y ayudar con la reconstrucción!!</string>
+  <string name="questShop">Tienda de Misiones</string>
+  <string name="market_owner_long">Alex el Mercader</string>
+  <string name="tavern_owner_long">Daniel el posadero</string>
+  <string name="stable_owner_long">Matt el maestro de las bestias</string>
+  <string name="hide_boss_art">Ocultar la Imagen del Jefe</string>
+  <string name="active_world_boss">Jefe Mundial Activo</string>
+  <string name="no_party_description">Realiza misiones con amigos o por tu cuenta. Combate monstruos, crea retos y ayúdate a ser responsable a través de los Equipos.</string>
+  <string name="no_party_title">Juega a Habitica en un Equipo</string>
+  <string name="join_party_description">Dale el nombre de usuario que hay abajo al un miembro del Equipo y ellos podrán mandarte una invitación</string>
     <string name="join_party_title">¿Quieres unirte a un equipo?</string>
-    <string name="create_party_website">Abrir página web para crear un equipo</string>
-    <string name="id_copied">ID copiada en el portapapeles</string>
     <string name="insufficientSubscriberGems">Has comprado todas las gemas que puedes este mes. Habrá más disponibles durante los primeros tres días de cada mes. ¡Gracias por suscribirte!</string>
-    <string name="insufficientSubscriberGemsTitle">Alcanzada la capacidad mensual de gemas</string>
-    <string name="chat_message">Mensaje de chat</string>
     <string name="world_boss_description_title">¿Qué es un Jefe Mundial?</string>
-    <string name="world_boss_description_description">¡Un Jefe Mundial es un evento especial donde toda la comunidad trabaja en conjunto para derrotar a un poderoso monstruo con sus tareas!\nCompleta tareas para hacer daño al Jefe\nEl Jefe no te hará daño por tareas sin hacer, pero su medidor de Ira aumentará. ¡Si la barra se llena, el Jefe atacará a uno de los tenderos!\nPuedes continuar enfrentándote a Jefes de misión normales, el daño se aplicará a ambos\nComprueba la Taberna para ver el progreso del Jefe y los ataques de Ira</string>
     <string name="world_boss_description_intro">¡Un Jefe Mundial es un evento especial donde toda la comunidad trabaja en conjunto para derrotar a un poderoso monstruo con sus tareas!</string>
-    <string name="world_boss_description_1">Completa tareas para hacer daño al Jefe</string>
-    <string name="world_boss_description_2">El Jefe no te hará daño por tareas sin hacer, pero su medidor de Ira aumentará. ¡Si la barra se llena, el Jefe atacará a uno de los tenderos!</string>
-    <string name="world_boss_description_3">Puedes continuar enfrentándote a Jefes de misión normales, el daño se aplicará a ambos</string>
-    <string name="world_boss_description_4">Comprueba la Taberna para ver el progreso del Jefe y los ataques de Ira</string>
-    <string name="world_boss_action_prompt" formatted="false">¡Derrota al Jefe para ganar recompensas especiales y salvar a Habitica del terror de %s!</string>
-    <string name="world_boss_description_subtitle">¡ %s ataca!</string>
+  <string name="world_boss_description_1">Completa tareas para hacer daño al Jefe</string>
+  <string name="world_boss_description_2">El Jefe no te hará daño por tareas sin hacer, pero su medidor de Ira aumentará. ¡Si la barra se llena, el Jefe atacará a uno de los tenderos!</string>
+  <string name="world_boss_description_3">Puedes continuar enfrentándote a Jefes de misión normales, el daño se aplicará a ambos</string>
+  <string name="world_boss_description_4">Comprueba la Taberna para ver el progreso del Jefe y los ataques de Ira</string>
+  <string name="world_boss_action_prompt">¡Derrota al Jefe para ganar recompensas especiales y salvar a Habitica del terror de %s!</string>
     <string name="questShop_owner_long">Ian el guía de misiones</string>
-    <string name="seasonalShop_owner_long">Hechicera de Temporada</string>
-    <string name="rage_attack">Ataque de ira:</string>
-    <string name="tavern_description_world_boss">Ay por favor, no prestes atención a ese monstruo. Este es aún un refugio seguro para conversar durante tus descansos.</string>
-    <string name="report">Reportar</string>
-    <string name="like">Me gusta</string>
+  <string name="seasonalShop_owner_long">Hechicera de Temporada</string>
+  <string name="rage_attack">Ataque de ira:</string>
+  <string name="tavern_description_world_boss">Ay por favor, no prestes atención a ese monstruo. Este es aún un refugio seguro para conversar durante tus descansos.</string>
+  <string name="report">Reportar</string>
     <string name="reply">Contestar</string>
-    <string name="challenge_prize">Premio del Desafío</string>
-    <string name="challenge_categories">Categoría del Desafío</string>
-    <string name="created_challenge">Desafío creado</string>
-    <string name="joined">Participando</string>
-    <string name="public_challenge">Desafío público</string>
-    <string name="short_name">Nombre corto</string>
-    <string name="unlock_attribute_points">La distribución de puntos de Atributos se desbloquea en el nivel 10</string>
-    <string name="same_day_reminder_title">¿Ya has añadido tus tareas?</string>
-    <string name="same_day_reminder_text">Cuantas más añadas, más recompensas tendrás. Incluso los hábitos pequeños contribuyen a un gran cambio.</string>
-    <string name="next_day_reminder_title">¿Marcaste tus tareas completadas hoy?</string>
-    <string name="next_day_reminder_text">Conforme vas subiendo de nivel hay muchas cosas para desbloquear y descubrir, ¡Mantente al día con tus tareas y diviértete! </string>
-    <string name="daily_tip_0">¿Quieres probar algo nuevo? ¡Únete a un Desafío para ampliar tu lista de tareas y ganar algunas Gemas!</string>
-    <string name="daily_tip_1">¡Añade listas a tus Tareas Pendientes para multiplicar las recompensas!</string>
-    <string name="daily_tip_2">Puedes cambiar cuán a menudo cada Tarea Diaria se repite. Incluso tareas poco frecuentes se pueden programar.</string>
-    <string name="daily_tip_3">Puedes programar recordatorios específicos también para las Tareas Diarias.</string>
-    <string name="daily_tip_4">Re-evaluar tus tareas de vez en cuando puede ayudarte a seguir por el buen camino. </string>
-    <string name="daily_tip_5">Respira hondo unas pocas veces para concentrarte. ¡Tú puedes conseguirlo!</string>
-    <string name="daily_tip_6">¡Prueba a utilizar un temporizador para ver cuánto trabajo consigues hacer en 10 minutos!</string>
-    <string name="daily_tip_7">¡Prueba pinchar objetos del Mercado en tus Recompensas para motivarte a conseguirlos!</string>
-    <string name="daily_tip_8">¡Puedes cambiar la dificultad de tus tareas para recibir mayores recompensas por las tareas más difíciles!</string>
-    <string name="daily_tip_9">Si se te hace difícil cumplir con tus tareas, prueba dividirlas en varias partes más pequeñas.</string>
-    <string name="moderator">Mod</string>
-    <string name="staff">Miembro del personal</string>
-    <string name="expand_notes">Leer más</string>
-    <string name="collapse_notes">Mostrar menos</string>
-    <string name="reset_streak">Reiniciar Racha</string>
-    <string name="week_reminder_title">¿Cómo te va con tus tareas?</string>
-    <string name="week_reminder_text">Hacer pausas es bueno, ¡pero aun así puedes ganar puntos por actividades sencillas para subir de nivel y conseguir equipo guay!</string>
-    <string name="last_login">Última Entrada</string>
-    <string name="total_checkins">Total de Entradas</string>
-    <string name="two_handed">A dos manos</string>
-    <string name="usernamePromptTitle">¡Hora de establecer tu nombre de usuario!</string>
-    <string name="usernamePromptBody">Los nombre de inicio de sesión ahora son nombres de usuario únicos, que se mostrarán al lado de tu nombre público y se usará para invitaciones, @menciones en los chats, y mensajes. </string>
-    <string name="usernamePromptWiki">Si quieres saber más de este cambio, <a href="https://habitica.wikia.com/wiki/Player_Names">visita nuestra wiki.</a>
-    </string>
-    <string name="confirmUsername">Confirma tu Nombre de usuario</string>
-    <string name="usernamePromptDisclaimer">Los nombres de usuario deben conformarse a nuestros <a href="https://habitica.com/static/terms">Términos de Servicio</a> y <a href="https://habitica.com/static/community-guidelines">Normas de Comunidad</a>. Si no habías establecido previamente un nombre de inicio de sesión, tu nombre de usuario ha sido autogenerado.</string>
-    <string name="confirm_username_title">¿Estás seguro de que quieres confirmar tu nombre de usuario actual?</string>
-    <string name="confirm_username_description">Confirmar tu nombre de usuario lo hará público para invitations, @menciones y mensajes. Puedes cambiar tu nombre de usuario en los ajustes en cualquier momento.</string>
-    <string name="cancel">Cancelar</string>
-    <string name="confirm_username">Confirmar Nombre de usuario</string>
-    <string name="username_not_confirmed">Nombre de usuario no confirmado</string>
-    <string name="username_confirmed">Nombre de usuario Confirmado</string>
-    <string name="username_level">\@%s ・Nvl %d</string>
+  <string name="challenge_prize">Premio del Desafío</string>
+  <string name="challenge_categories">Categoría del Desafío</string>
+  <string name="created_challenge">Desafío creado</string>
+  <string name="joined">Participando</string>
+  <string name="public_challenge">Desafío público</string>
+  <string name="short_name">Nombre corto</string>
+  <string name="unlock_attribute_points">La distribución de puntos de Atributos se desbloquea en el nivel 10</string>
+  <string name="same_day_reminder_title">¿Ya has añadido tus tareas?</string>
+  <string name="same_day_reminder_text">Cuantas más añadas, más recompensas tendrás. Incluso los hábitos pequeños contribuyen a un gran cambio.</string>
+  <string name="next_day_reminder_title">¿Marcaste tus tareas completadas hoy?</string>
+  <string name="next_day_reminder_text">Conforme vas subiendo de nivel hay muchas cosas para desbloquear y descubrir, ¡Mantente al día con tus tareas y diviértete! </string>
+  <string name="daily_tip_0">¿Quieres probar algo nuevo? ¡Únete a un Desafío para ampliar tu lista de tareas y ganar algunas Gemas!</string>
+  <string name="daily_tip_1">¡Añade listas a tus Tareas Pendientes para multiplicar las recompensas!</string>
+  <string name="daily_tip_2">Puedes cambiar cuán a menudo cada Tarea Diaria se repite. Incluso tareas poco frecuentes se pueden programar.</string>
+  <string name="daily_tip_3">Puedes programar recordatorios específicos también para las Tareas Diarias.</string>
+  <string name="daily_tip_4">Re-evaluar tus tareas de vez en cuando puede ayudarte a seguir por el buen camino. </string>
+  <string name="daily_tip_5">Respira hondo unas pocas veces para concentrarte. ¡Tú puedes conseguirlo!</string>
+  <string name="daily_tip_6">¡Prueba a utilizar un temporizador para ver cuánto trabajo consigues hacer en 10 minutos!</string>
+  <string name="daily_tip_7">¡Prueba pinchar objetos del Mercado en tus Recompensas para motivarte a conseguirlos!</string>
+  <string name="daily_tip_8">¡Puedes cambiar la dificultad de tus tareas para recibir mayores recompensas por las tareas más difíciles!</string>
+  <string name="daily_tip_9">Si se te hace difícil cumplir con tus tareas, prueba dividirlas en varias partes más pequeñas.</string>
+  <string name="moderator">Moderador</string>
+  <string name="staff">Miembro del personal</string>
+  <string name="expand_notes">Leer más</string>
+  <string name="collapse_notes">Mostrar menos</string>
+  <string name="reset_streak">Reiniciar Racha</string>
+  <string name="week_reminder_title">¿Cómo te va con tus tareas?</string>
+  <string name="week_reminder_text">Hacer pausas es bueno, pero aun así puedes ganar puntos por actividades sencillas para subir de nivel y para conseguir equipo guay.</string>
+  <string name="last_login">Última Entrada</string>
+  <string name="total_checkins">Total de Entradas</string>
+  <string name="two_handed">A dos manos</string>
+  <string name="usernamePromptTitle">¡Hora de establecer tu nombre de usuario!</string>
+  <string name="usernamePromptBody">Los nombre de inicio de sesión ahora son nombres de usuario únicos, que se mostrarán al lado de tu nombre público y se usará para invitaciones, @menciones en los chats, y mensajes. </string>
+  <string name="usernamePromptWiki">Si quieres saber más de este cambio, <a href="https://habitica.wikia_com/wiki/Player_Names">visita nuestra wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Los nombres de usuario deben conformarse a nuestros <a href="https://habitica.com/static/terms">Términos de Servicio</a> y <a href="https://habitica_com/static/community-guidelines">Normas de Comunidad</a>. Si no habías establecido previamente un nombre de inicio de sesión, tu nombre de usuario ha sido autogenerado.</string>
+  <string name="confirm_username_title">¿Estás seguro de que quieres confirmar tu nombre de usuario actual?</string>
+  <string name="confirm_username_description">Confirmar tu nombre de usuario lo hará público para invitations, @menciones y mensajes. Puedes cambiar tu nombre de usuario en los ajustes en cualquier momento.</string>
+  <string name="cancel">Cancelar</string>
+  <string name="confirm_username">Confirmar Nombre de usuario</string>
+  <string name="username_not_confirmed">Nombre de usuario no confirmado</string>
+  <string name="username_confirmed">Nombre de usuario Confirmado</string>
     <string name="enter_recipient_username">Entra el @ nombre de usuario del Receptor</string>
-    <string name="username_copied">Nombre de usuario copiado al portapapeles</string>
-    <string name="verification_pet">¡Una de estas Mascotas Veteranas estará esperándote cuando termines de confirmar!</string>
-    <string name="welcomeNameTitle">¿Cómo debemos llamarte?</string>
-    <string name="display_name_length_error">Los nombres públicos deben tener una longitud de entre 1 y 30 caracteres</string>
-    <string name="setup_task_join_habitica">Unirse a Habitica (¡Ya me puedes marcar!)</string>
-    <string name="setup_task_join_habitica_notes">Puedes completar esta Tarea pendiente, editarla o eliminarla.</string>
-    <string name="setup_task_reward">Recompénsate</string>
-    <string name="setup_task_reward_notes">Ve TV, juega algún juego, toma algún dulce, ¡lo que tú quieras!</string>
-    <string name="equipment_str">FUE:</string>
-    <string name="equipment_con">CON:</string>
-    <string name="equipment_int">INT:</string>
-    <string name="equipment_per">PER:</string>
-    <string name="visit_website">visita el sitio web</string>
-    <string name="subscribe_gift_description">¿Quieres regalar los benficios de una suscripción a otra persona?</string>
-    <string name="gift_subscription">Regala una Suscripción</string>
-    <string name="gift_one_get_one_description">¡El evento Regala una suscripción y recibe una suscripción gratis está activo ahora!</string>
-    <string name="gift_title">¿A quién quieres hacerle el regalo?</string>
-    <string name="gift_one_get_one">¡Regala una, Recibe una!</string>
-    <string name="gift_one_get_one_detailed_description">Mientras esta promoción esté activa, recibirás una suscripción equivalente automaticamente cuando envíes tu regalo.</string>
-    <string name="gift_subscription_subtitle">¡Escoge abajo la suscripción que quieres regalar! Esta compra no se renovará automaticamente.</string>
-    <string name="send_gift">Enviar Regalo</string>
-    <string name="server">Servidor</string>
-    <string name="gift_confirmation_title">¡Tu regalo se envió!</string>
-    <string name="gift_confirmation_text_g1g1">¡Has enviado a %s una suscripción de regalo (%s-meses) y también se ha aplicado a tu cuenta con nuestra promoción Regala Una Consigue Una!</string>
-    <string name="gift_confirmation_text">Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta.</string>
-    <string name="discover">Descubre</string>
-    <string name="damage_paused">Daño pausado</string>
-    <string name="opting_out_progress">optar por no</string>
-    <string name="delete_oauth_account_description">¿Estás seguro/a\? Esto eliminará tu cuenta permanentemente, ¡y no podrá ser restaurada! Necesitarás registrar una nueva cuenta para utilizar Habitica de nuevo. Las Gemas que hayas gastado o que tengas en el banco no serán reembolsadas. Si estás absolutamente seguro/a, escribe ELIMINAR en el cuadro de texto de abajo.</string>
-    <string name="preference_push_important_announcements">Anuncios Importantes</string>
-    <string name="only_leader_create_challenge">Sólo el/la líder puede crear Desafíos</string>
-    <string name="create_party">Crear Equipo</string>
-    <string name="create">Crear</string>
-    <string name="notifications">Notificaciones</string>
-    <string name="no_notifications_title">¡Estás al día!</string>
-    <string name="no_notifications_text">Las hadas de las notificaciones te aplauden atronadoramente. ¡Bien hecho!</string>
-    <string name="dismiss_all">Ignorar todas</string>
-    <string name="new_bailey_update">¡Nueva Actualización de Bailey!</string>
-    <string name="new_msg_guild"><![CDATA[<b>%1$s</b> tiene nuevos mensajes]]></string>
-    <string name="new_msg_party"><![CDATA[Tu Equipo, <b>%1$s</b>, tiene nuevos mensajes]]></string>
-    <string name="unallocated_stats_points">Tienes <b>%1$s Puntos de Atributo sin asignar</b>
-    </string>
-    <string name="new_subscriber_item"><![CDATA[Tienes <b>Objetos Misteriosos</b> nuevos]]></string>
-    <string name="invited_to_party_notification"><![CDATA[Has sido invitado a unirte al Equipo <b>%1$s</b>]]></string>
-    <string name="invited_to_private_guild"><![CDATA[Has sido invitado a unirte al Gremio privado <b>%1$s</b>]]></string>
-    <string name="invited_to_public_guild"><![CDATA[Has sido invitado a unirte al Gremio <b>%1$s</b>]]></string>
-    <string name="invited_to_quest"><![CDATA[Has sido invitado a la misión <b>%1$s</b>]]></string>
-    <string name="sectionwacky">Chiflado</string>
-    <string name="x_months">%d Meses</string>
-    <string name="join_party_description_guild">¡Dale el nombre de usuario que se encuentra debajo a un amigo o dirígete a la %s para conocer potenciales camaradas!</string>
-    <string name="defeat">Derrota</string>
-    <string name="add_local_authentication">Añadir Autenticación Local</string>
-    <string name="task_title">Título de la tarea</string>
-    <string name="old_password">Contraseña Anterior</string>
-    <string name="new_password">Nueva Contraseña</string>
-    <string name="new_password_repeat">Repetir nueva Contraseña</string>
-    <string name="adjust_streak">Ajustar Racha</string>
-    <string name="password_changed">Contraseña exitosamente modificada</string>
-    <string name="assigned_stat">Atributo Asignado</string>
-    <string name="monthly">Mensual</string>
-    <string name="weekly">Semanal</string>
-    <string name="repeats">Se repite</string>
-    <string name="every">Cada</string>
-    <string name="scheduling">Programación</string>
-    <string name="days">Días</string>
-    <string name="weeks">Semanas</string>
-    <string name="years">Años</string>
-    <string name="checklist_text">Texto de la Lista de Tareas</string>
-    <string name="new_reminder">Nuevo recordatorio</string>
-    <string name="streak">Racha</string>
-    <string name="update_available">Actualización disponible: %1$s (%2$d)</string>
-    <string name="need_help_header_description">Publica un mensaje en la %s para que otro jugador responda tus preguntas.</string>
-    <string name="need_more_help">¿Necesitas más ayuda\?</string>
-    <string name="become_x">Conviértete en un %s</string>
-    <string name="x_class">Clase %s</string>
-    <string name="report_explanation">**Únicamente** reporta un mensaje que viola las [Normas de la Comunidad](https://habitica.com/static/community-guidelines) y/o [Términos de Uso](https://habitica.com/static/terms). Denunciar un mensaje de manera inapropiada podría valerte una infracción.</string>
-    <string name="report_message_title">Denunciar a %s por incumplimiento:</string>
-    <string name="reason_for_report">Motivo de denuncia (opcional)</string>
-    <string name="mystery_sets">Conjuntos Misteriosos</string>
-    <string name="guild_description">Descripción del Gremio</string>
-    <string name="invite_to_guild">Invitar al Gremio</string>
-    <string name="join_guild">Entrar al Gremio</string>
-    <string name="garden">Jardín</string>
-    <string name="i_agree_to_follow_the_guidelines">Estoy de acuerdo con las normas</string>
-    <string name="report_violation">Denunciar Incumplimiento</string>
-    <string name="trillion_abbrev">t</string>
-    <string name="leave_guild">Abandonar Gremio</string>
-    <string name="left_guild">Has abandonado el gremio</string>
-    <string name="joined_guild">Has entrado al gremio</string>
-    <string name="cost">Costo</string>
-    <string name="setup_task_habit_1">Añadir una tarea a Habitica</string>
-    <string name="setup_task_habit_1_notes">Ya sea un Hábito, una Tarea Diaria o una Tarea Pendiente</string>
-    <string name="setup_task_habit_2">Pulsa aquí para cambiar esto por un mal hábito que te gustaría dejar</string>
-    <string name="setup_task_habit_2_notes">O elimínalo desde la pantalla de edición</string>
-    <string name="guild_summary">Resumen del Gremio</string>
-    <string name="guild_members">Miembros del Gremio</string>
-    <string name="guild_bank">Banco del Gremio</string>
-    <string name="invite_to_party">Invitar al Equipo</string>
-    <string name="are_you_sure">¿Estás seguro\?</string>
-    <string name="delete_task">Eliminar Tarea</string>
-    <string name="not_now">Por ahora no</string>
-    <string name="levelup_detail_10">Elige una clase que se ajuste a tu estilo de juego y desbloquea habilidades especiales y armaduras para ayudarte en tu aventura</string>
-    <string name="levelup_title_10">¡Sistema de Clases desbloqueado!</string>
-    <string name="pin">Marcar</string>
-    <string name="unpin">Desmarcar</string>
-    <string name="take_me_back">Regresar</string>
-    <string name="sidebar_achievements">Logros</string>
-    <string name="basic_achievements">Logros Básicos</string>
-    <string name="seasonal_achievements">Logros de Temporada</string>
-    <string name="special_achievements">Logros Especiales</string>
-    <string name="switch_to_list_view">Cambiar vista a lista</string>
-    <string name="switch_to_grid_view">Cambiar vista a cuadrícula</string>
-    <string name="confirm_deletion">Confirmar eliminación</string>
-    <string name="new_task">Nueva Tarea</string>
-    <string name="create_task">Crear %s</string>
-    <string name="details">Detalles</string>
-    <string name="share_challenge_with">Compartir Desafío con</string>
-</resources>
\ No newline at end of file
+  <string name="username_copied">Nombre de usuario copiado al portapapeles</string>
+  <string name="verification_pet">¡Una de estas Mascotas Veteranas estará esperándote cuando termines de confirmar!</string>
+  <string name="welcomeNameTitle">¿Cómo debemos llamarte?</string>
+  <string name="display_name_length_error">Los nombres públicos deben tener una longitud de entre 1 y 30 caracteres</string>
+  <string name="setup_task_join_habitica">Unirse a Habitica (¡Ya me puedes marcar!)</string>
+  <string name="setup_task_join_habitica_notes">Puedes completar esta Tarea pendiente, editarla o eliminarla.</string>
+  <string name="setup_task_reward">Recompénsate</string>
+  <string name="setup_task_reward_notes">Ve TV, juega algún juego, toma algún dulce, ¡lo que tú quieras!</string>
+  <string name="equipment_str">FUE:</string>
+  <string name="equipment_con">CON:</string>
+  <string name="equipment_int">INT:</string>
+  <string name="equipment_per">PER:</string>
+  <string name="visit_website">visita el sitio web</string>
+  <string name="subscribe_gift_description">¿Quieres regalar los benficios de una suscripción a otra persona?</string>
+  <string name="gift_subscription">Regala una Suscripción</string>
+  <string name="gift_one_get_one_description">¡El evento Regala una suscripción y recibe una suscripción gratis está activo ahora!</string>
+  <string name="gift_title">¿A quién quieres hacerle el regalo?</string>
+  <string name="gift_one_get_one">¡Regala una, Recibe una!</string>
+  <string name="gift_one_get_one_detailed_description">Mientras esta promoción esté activa, recibirás una suscripción equivalente automaticamente cuando envíes tu regalo.</string>
+  <string name="gift_subscription_subtitle">¡Escoge abajo la suscripción que quieres regalar! Esta compra no se renovará automaticamente.</string>
+  <string name="send_gift">Enviar Regalo</string>
+  <string name="server">Servidor</string>
+  <string name="gift_confirmation_title">¡Tu regalo se envió!</string>
+  <string name="gift_confirmation_text_g1g1">Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta.</string>
+  <string name="gift_confirmation_text">Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta.</string>
+  <string name="discover">Descubre</string>
+  <string name="damage_paused">Daño pausado</string>
+  <string name="opting_out_progress">optar por no</string>
+  <string name="delete_oauth_account_description">¿Estás seguro/a\? Esto eliminará tu cuenta permanentemente, ¡y no podrá ser restaurada! Necesitarás registrar una nueva cuenta para utilizar Habitica de nuevo. Las Gemas que hayas gastado o que tengas en el banco no serán reembolsadas. Si estás absolutamente seguro/a, escribe ELIMINAR en el cuadro de texto de abajo.</string>
+  <string name="preference_push_important_announcements">Anuncios Importantes</string>
+  <string name="only_leader_create_challenge">Sólo el/la líder puede crear Desafíos</string>
+  <string name="create_party">Crear Equipo</string>
+  <string name="create">Crear</string>
+  <string name="notifications">Notificaciones</string>
+  <string name="no_notifications_title">¡Estás al día!</string>
+  <string name="no_notifications_text">Las hadas de las notificaciones te aplauden atronadoramente. ¡Bien hecho!</string>
+  <string name="dismiss_all">Ignorar todas</string>
+  <string name="new_bailey_update">¡Nueva Actualización de Bailey!</string>
+  <string name="new_msg_guild"><![CDATA[<b>%1$s</b> tiene nuevos mensajes]]></string>
+  <string name="new_msg_party"><![CDATA[Tu Equipo, <b>%1$s</b>, tiene nuevos mensajes]]></string>
+  <string name="unallocated_stats_points"><![CDATA[Tienes <b>%1$s Puntos de Estadísticas sin asignar</b>]]></string>
+  <string name="new_subscriber_item"><![CDATA[Tienes <b>Objetos Misteriosos</b> nuevos]]></string>
+  <string name="invited_to_party_notification"><![CDATA[Has sido invitado a unirte al Equipo <b>%1$s</b>]]></string>
+  <string name="invited_to_private_guild"><![CDATA[Has sido invitado a unirte al Gremio privado <b>%1$s</b>]]></string>
+  <string name="invited_to_public_guild"><![CDATA[Has sido invitado a unirte al Gremio <b>%1$s</b>]]></string>
+  <string name="invited_to_quest"><![CDATA[Has sido invitado a la misión <b>%1$s</b>]]></string>
+</resources>
diff --git a/Habitica/res/values-fi/strings.xml b/Habitica/res/values-fi/strings.xml
new file mode 100755
index 000000000..e0fd46352
--- /dev/null
+++ b/Habitica/res/values-fi/strings.xml
@@ -0,0 +1,277 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Lataa uudelleen</string>
+  <string name="XP_default">Kokemuspisteet</string>
+  <string name="HP_default">Terveys</string>
+  <string name="MP_default">Voima</string>
+  <string name="ERR_pb_barcode">Asetuksien lataus epäonnistui</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Asetukset</string>
+  <string name="SP_address_hint">Asiakaspalvelu</string>
+  <string name="SP_userID_title">Käyttäjän tunnistus</string>
+  <string name="SP_userID_summary">Käyttäjäkoodisi</string>
+  <string name="SP_APIToken_title">API Valtuutus</string>
+  <string name="SP_APIToken_summary">Api valtuutuksesi</string>
+  <string name="Language_title">Kieli</string>
+  <string name="Language_summary">Vaihda Habitica-sovelluksen kieli</string>
+  <string name="SP_user_qr_code">QR-koodisi</string>
+  <string name="PS_contact_title">Yhteystiedot</string>
+  <string name="pref_account_header">Tili</string>
+  <string name="pref_first_day_of_the_week_title">Viikon ensimmäinen päivä</string>
+  <string name="pref_first_day_of_the_week_summary">Viikon ensimmäinen päivä kaikissa kalentereissa</string>
+  <string name="pref_reminder_header">Pävittäinen muistutus</string>
+  <string name="pref_reminder_checkbox">Aktivoi muistutus</string>
+  <string name="pref_reminder_picker">Aseta aika muistutukselle</string>
+  <string name="pref_cds_header">Mukautettu päivän alkamisaika</string>
+  <string name="pref_cds_picker">Aseta mukautettu päivän alkamisaika</string>
+  <string name="pref_push_notifications_checkbox">Käyttäjän Push-ilmoitukset</string>
+  <string name="push_notifications">Push-ilmoitukset</string>
+  <string name="push_notifications_sum">Säädä Push-ilmoitusasetuksiasi</string>
+  <string name="preference_push_you_won_challenge">Voitit haasteen!</string>
+  <string name="preference_push_received_a_private_message">Sait yksityisviestin</string>
+  <string name="preference_push_invited_to_party">Kutsuttu seurueeseen</string>
+  <string name="preference_push_your_quest_has_begun">Seikkailusi on alkanut</string>
+  <string name="preference_push_invited_to_quest">Kutsuttu seikkailulle</string>
+  <!--Adding tasks-->
+  <string name="task_value">Arvo</string>
+  <string name="action_edit">Muokkaa</string>
+  <string name="action_delete">Poista</string>
+  <string name="action_cancel">Peruuta</string>
+  <string name="login_btn">Kirjaudu</string>
+  <string name="register_btn">Rekisteröidy</string>
+  <string name="username">Käyttäjänimi</string>
+  <string name="email_username">Sähköposti tai käyttäjänimi</string>
+  <string name="password">Salasana</string>
+  <string name="emailAddress">Sähköpostiosoite</string>
+  <string name="confirmpassword">Vahvista salasana</string>
+  <string name="logout">Kirjaudu ulos</string>
+  <string name="logout_description">Kirjaudu ulos tililtäsi</string>
+  <string name="account_details">Tilin tiedot</string>
+  <string name="LoginActivityName">Tervetuloa</string>
+  <string name="string_revive">Herätä henkiin</string>
+  <string name="please_connect">Käytä widgettejä aplikaation kautta</string>
+  <string name="about.title">Tietoja</string>
+  <string name="about.libraries">Info-osiot</string>
+  <string name="about.versionhistory">Versiohistoria</string>
+  <string name="about.habitica_open_source">Habitica on löydettävissä avoimen koodin ohjelmana Githubista.</string>
+  <string name="about.rate_our_app">Arvostele sovelluksemme</string>
+  <string name="about.give_us_feedback">Lähetä meille palautetta!</string>
+  <string name="about.bugreport">Raportoi virheistä</string>
+  <string name="about.source_code">Lähdekoodi</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Yhteyshäiriö</string>
+  <string name="network_error_no_network_body">Internetyhteytesi ei toimi</string>
+  <string name="internal_error_api">Serverissä näyttäisi olevan ongelma. Yritä myöhemmin uudestaan.</string>
+  <string name="authentication_error_title">Authentication Error</string>
+  <string name="authentication_error_body">Käyttäjänimesi tai salasanasi ei täsmää.</string>
+  <string name="login_validation_error_title">Validation Error</string>
+  <string name="login_validation_error_fieldsmissing">Sinun tulee täyttää kaikki kohdat.</string>
+  <string name="save_changes">Tallenna</string>
+  <string name="copy">Kopioi</string>
+  <string name="notes">Huomiot</string>
+  <string name="text">Teksti</string>
+  <string name="difficulty">Vaikeustaso</string>
+  <string name="tags">Tägit</string>
+  <string name="trivial">Triviaali</string>
+  <string name="easy">Helppo</string>
+  <string name="medium">Keskivaikea</string>
+  <string name="hard">Vaikea</string>
+  <string name="start_date">Alkamispäivämäärä</string>
+  <string name="positive_habit_form">Positiivinen</string>
+  <string name="negative_habit_form">Negatiivinen</string>
+  <string name="checklist">Tarkistuslista</string>
+  <string name="reminders">Muistutukset</string>
+  <string name="actions">Toiminnot</string>
+  <string name="attributes">Ominaisuudet</string>
+  <string name="frequency">Tapahtumatiheys</string>
+  <string name="frequency_weekly">Tiettyinä päivinä viikossa</string>
+  <string name="frequency_daily">Joka X päivä</string>
+  <string name="monday">Maanantai</string>
+  <string name="tuesday">Tiistai</string>
+  <string name="wednesday">Keskiviikko</string>
+  <string name="thursday">Torstai</string>
+  <string name="friday">Perjantai</string>
+  <string name="saturday">Lauantai</string>
+  <string name="sunday">Sunnuntai</string>
+  <string name="levelup_button">Hienoa!</string>
+  <string name="faint_subtitle">Älä masennu!</string>
+  <string name="faint_header">Menetit terveytesi!</string>
+  <string name="faint_button">Täydennä terveys &amp; Yritä uudelleen</string>
+  <string name="filter">Suodatin</string>
+  <string name="profile_image">Profiilikuva</string>
+  <string name="mana_price_button">%d VP</string>
+  <string name="used_skill">Olet käyttänyt %1$s %2$d voimastasi.</string>
+  <string name="used_skill_without_mana">Käytit %1$s.</string>
+  <string name="new_checklist_item">Uusi asia muistilistaan</string>
+  <string name="add_checklist_item">Lisää</string>
+  <string name="skill_progress_title">Taidon käyttö</string>
+  <string name="coming_soon">Tulossa pian</string>
+  <string name="chat_flag_confirmation">Oletko varma, että haluat raportoida käytösrikkeen?</string>
+  <string name="flag_confirm">Merkitse viesti</string>
+  <string name="unlock_lvl_11">Avautuu tasolla 11</string>
+  <string name="no_party_message">Et kuulu vielä ryhmään. Liittyminen ryhmään tapahtuu nettisivuston kautta.</string>
+  <string name="forgot_pw_btn">Unohdin salasanan</string>
+  <string name="tavern.inn.checkOut">Uudelleenaktivoi päivittäiset</string>
+  <string name="tavern.inn.rest">Pysäytä päivittäiset</string>
+  <string name="reward.dialog.buy">Osta</string>
+  <string name="reward.dialog.dismiss">Hylkää</string>
+  <string name="party">Ryhmä</string>
+  <string name="chat">Chat</string>
+  <string name="members">Osallistujat</string>
+  <string name="habits">Tavat</string>
+  <string name="dailies">Päivittäiset tehtävät</string>
+  <string name="rewards">Palkinnot</string>
+  <string name="taskform.delete.title">Oletko varma?</string>
+  <string name="taskform.delete.message">Haluatko todella poistaa?</string>
+  <string name="yes">Kyllä</string>
+  <string name="no">Ei</string>
+  <string name="quest">Seikkailu</string>
+  <string name="avatar_body">Vartalo</string>
+  <string name="avatar_hair">Hiukset</string>
+  <string name="avatar_shirt">Paita</string>
+  <string name="avatar_skin">Iho</string>
+  <string name="avatar_ears">Eläinkorvat</string>
+  <string name="avatar_base">Pohja</string>
+  <string name="avatar_color">Väri</string>
+  <string name="avatar_beard">Parta</string>
+  <string name="avatar_mustache">Viikset</string>
+  <string name="avatar_flower">Kukka</string>
+  <string name="avatar_bangs">Saparot</string>
+  <string name="avatar_nothing">Riisuttu</string>
+  <string name="avatar_size">Koko</string>
+  <string name="avatar_size_slim">Hoikka</string>
+  <string name="avatar_size_broad">Roteva</string>
+  <string name="avatar_background">Tausta</string>
+  <string name="purchase_customization">Osta kustomointeja</string>
+  <string name="purchase_set_button">Avaa %d määrällä timantteja</string>
+  <string name="purchase_button">Osta</string>
+  <string name="purchase_set_title">Osta %s</string>
+  <string name="due_date">Eräpäivä</string>
+  <string name="quest.accept">Hyväksy</string>
+  <string name="quest.reject">Hylkää</string>
+  <string name="quest.begin">Aloita seikkailu</string>
+  <string name="quest.cancel">Peru kutsu</string>
+  <string name="quest.abort">Keskeytä seikkailu</string>
+  <string name="quest.leave">Luovu seikkailusta</string>
+  <string name="quest.pending">Odottaa</string>
+  <string name="quest.accepted">Hyväksytty</string>
+  <string name="quest.rejected">Hylätty</string>
+  <string name="quest.participants">Osallistujat</string>
+  <string name="sidebar_help">Apua &amp; UKK</string>
+  <string name="complete_tutorial">Selvä!</string>
+  <string name="dismiss_tutorial">Muistuta myöhemmin</string>
+  <string name="intro_3_description">Ystävien avulla voit pysyä asettamissasi tavoitteissa. Kannustakaa toisianne niin elämässä kuin vastustajia vastaan taistellessa, niin kehitytte yhdessä!</string>
+  <string name="previous_button">Taaksepäin</string>
+  <string name="next_button">Seuraava</string>
+  <string name="skip_button">Ohita</string>
+  <string name="setup_welcome_description">Tervetuloa Habiticaan, jossa elämäsi paranee samalla kun etenet pelissä! Kun onnistut oikean elämän tavoitteissasi, niin samalla sinulle avautuu pelissä tarvikkeita, lemmikkejä ja paljon muuta.</string>
+  <string name="setup_welcome_title">Tervetuloa</string>
+  <string name="setup_group_work">Työ</string>
+  <string name="setup_group_exercise">Harjoitus</string>
+  <string name="setup_group_school">Koulu</string>
+  <string name="setup_group_teams">Tiimit</string>
+  <string name="setup_group_chores">Askareet</string>
+  <string name="setup_group_creativity">Luovuus</string>
+  <string name="setup_task_work_1">Käy viestit läpi sähköpostissa</string>
+  <string name="setup_task_work_2">Kaikkein tärkeimmät tehtävät</string>
+  <string name="setup_task_work_3">Työprojektit</string>
+  <string name="setup_task_exercise_1">10 min kestävyysharjoittelu</string>
+  <string name="setup_task_exercise_2">Venyttele</string>
+  <string name="setup_task_exercise_3">Luo aikataulu liikunnalle</string>
+  <string name="setup_task_healthWellness_1">Syö terveellisesti/ epäterveellisesti</string>
+  <string name="setup_task_healthWellness_2">Käytä hammaslankaa</string>
+  <string name="setup_task_healthWellness_3">Varaa tarkistusaika</string>
+  <string name="setup_task_school_1">Opiskelu / Laiskottelu</string>
+  <string name="setup_task_school_2">Teen kotiläksyt</string>
+  <string name="setup_task_school_3">Sain koulutehtävän tehtyä</string>
+  <string name="setup_task_teams_1">Tarkistan tiimini tilanteen</string>
+  <string name="setup_task_teams_2">Päivitän tiimini ajantasalle</string>
+  <string name="setup_task_teams_3">Tiimiprojekti valmis</string>
+  <string name="setup_task_chores_1">10 minuuttia siivousta</string>
+  <string name="setup_task_chores_2">Pese astiat</string>
+  <string name="setup_task_chores_3">Järjestele kaapin sisältö</string>
+  <string name="setup_task_creativity_1">Hio taitojasi</string>
+  <string name="setup_task_creativity_2">Tee jotain luovaa</string>
+  <string name="setup_task_creativity_3">Sain luovan projektin valmiiksi</string>
+  <string name="gem.purchase.support">Haluatko, että Habitica pysyy käynnissä? Voit tukea tuotteen kehitystä ostamalla timantteja!\n\nTimateilla voit osaa kaikkea hauskaa pelissä, esimerkiksi: \n\n - Upeita asusteita hahmollesi\n - Hienoja taustoja\n - Hauskoja seikkailuja, joista palkintona lemmikkien munia\n - Mahdollisuus vaihtaa hahmoluokkaasi ennen tasoa 100\n\nIsot kiitokset kun autat meitä tekemään Habiticasta paremman. Tukesi on meille tärkeää!</string>
+  <string name="my_guilds">Minun killat</string>
+  <string name="public_guilds">Julkiset killat</string>
+  <string name="guild">Kilta</string>
+  <string name="leave">Poistu</string>
+  <string name="join">Liity</string>
+  <string name="leader">Johtaja</string>
+  <string name="gems">Jalokivet</string>
+  <string name="send_pm">Lähetä YV</string>
+  <string name="flag">Valinta</string>
+  <string name="delete">Poista</string>
+  <string name="name">Nimi</string>
+  <string name="description">Kuvaus</string>
+  <string name="privacy">Yksityisyys</string>
+  <string name="write_message">Kirjoita viesti</string>
+  <string name="post">Lähetä</string>
+  <string name="guild_search_hint">Hae kiltoja</string>
+  <string name="todo_due">Pvm: %s</string>
+  <string name="daily_streak">nykyinen putki: %d</string>
+  <string name="todo_has_duedate">Tehtävällä on valmistumispäivämäärä</string>
+  <string name="battle_gear">Taisteluvarustus</string>
+  <string name="costume">Asu</string>
+  <string name="outfit_head">Pää</string>
+  <string name="outfit_headAccessory">Päävarusteet</string>
+  <string name="outfit_eyewear">Silmälasit</string>
+  <string name="outfit_armor">Haarniska</string>
+  <string name="outfit_back">Selkä</string>
+  <string name="outfit_body">Vartalo</string>
+  <string name="outfit_shield">Kilpi</string>
+  <string name="outfit_weapon">Ase</string>
+  <string name="wear_costume">Pue asu</string>
+  <string name="equipped">Tarvikkeet</string>
+  <string name="quest_cancel_message">Haluatko varmasti perua tämän seikkailun? Kaikki hyväksytyt kutsut hävitetään. Seikkailun omistaja pitää seikkailukäärön hallussaan.</string>
+  <string name="quest.invitation">Seikkailukutsu</string>
+  <string name="quest.invitation.text">Sinut on kutsuttu osallistumaan jahtiin!</string>
+  <string name="today">tänään</string>
+  <string name="sidebar_items">Esineet</string>
+  <string name="eggs">Munat</string>
+  <string name="food">Ruoka</string>
+  <string name="quests">Seikkailut</string>
+  <string name="pets">Lemmikit</string>
+  <string name="mounts">Ratsut</string>
+  <string name="feed_to_pet">Syötä lemmikille</string>
+  <string name="use_animal">Käytä</string>
+  <string name="feed">Ruoki</string>
+  <string name="close">Sulje</string>
+  <string name="share">Jaa</string>
+  <string name="warrior">Soturi</string>
+  <string name="mage">Velho</string>
+  <string name="healer">Parantaja</string>
+  <string name="select_class">Valitse hahmoluokka</string>
+  <string name="choose_class">Valitse hahmoluokka</string>
+  <string name="dialog_go_back">Takaisin</string>
+  <string name="change_class">Muuta hahmoluokkaasi</string>
+  <string name="by_email">Sähköpostitse</string>
+  <string name="send">Lähetä</string>
+  <string name="invite">Kutsu kavereita</string>
+  <string name="add_invites">Lisää kutsuja</string>
+  <string name="user_id">Käyttäjätunnus</string>
+  <string name="email">Sähköposti</string>
+  <string name="invite_users">Kutsu seurueeseen</string>
+  <string name="share_using">Jaa käyttäen</string>
+  <string name="open_in_store">Avaa Play-kaupassa</string>
+  <string name="confirm">Vahvista</string>
+  <string name="market">Kauppa</string>
+  <string name="timeTravelers">Aikamatkailijat</string>
+  <string name="no_gold">Ei tarpeeksi Kultaa</string>
+  <string name="purchase_confirmation_title">Vahvista ostos</string>
+  <string name="gem">jalokivi</string>
+  <string name="hourglass">tiimalasi</string>
+  <string name="hourglasses">tiimalasit</string>
+  <string name="gold_singular">kulta</string>
+  <string name="gold_plural">kulta</string>
+  <string name="chat_message_copied">Kopioitu leikepöydälle</string>
+  <string name="copy_chat_message">Kopioi leikepöydälle</string>
+  <!--QR Strings-->
+  <string name="support_habitica">Tue Habitica-palvelua</string>
+  <string name="skill_transformation_use">käytä</string>
+  <string name="open_market">Avaa Kauppa</string>
+  <string name="AudioTheme_title">Ääniteema</string>
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 8dd3677ce..4b5934634 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_qrcode_close">Fermer</string>
 
 </resources>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index b757c2ad3..53ba7d73c 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tâches</string>
-  <string name="sidebar.skills">Compétences</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Messages</string>
-  <string name="sidebar.tavern">Auberge</string>
-  <string name="sidebar.party">Équipe</string>
-  <string name="sidebar.purchaseGems">Gemmes et abonnement</string>
-  <string name="sidebar.guilds">Guildes</string>
-  <string name="sidebar.challenges">Défis</string>
-  <string name="sidebar.section.inventory">Inventaire</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Équipement</string>
-  <string name="sidebar.stable">Écurie</string>
-  <string name="sidebar.news">Nouveautés</string>
-  <string name="sidebar.settings">Paramètres</string>
-  <string name="sidebar.about">À propos</string>
+  <string name="sidebar_tasks">Tâches</string>
+  <string name="sidebar_skills">Compétences</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_inbox">Messages</string>
+  <string name="sidebar_tavern">Auberge</string>
+  <string name="sidebar_party">Équipe</string>
+  <string name="sidebar_purchaseGems">Gemmes et abonnement</string>
+  <string name="sidebar_guilds">Guildes</string>
+  <string name="sidebar_challenges">Défis</string>
+  <string name="sidebar_section_inventory">Inventaire</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Équipement</string>
+  <string name="sidebar_stable">Écurie</string>
+  <string name="sidebar_news">Nouveautés</string>
+    <string name="sidebar_about">À propos</string>
   <string name="sidebar_shops">Magasins</string>
   <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.tutorial.xml b/Habitica/res/values-fr/strings.tutorial.xml
index e8841f209..9f5a5af97 100644
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Achetez de l\'équipement pour votre avatar avec l\'or que vous gagnez !</string>
   <string name="tutorial_rewards_2">Vous pouvez aussi créer des récompenses personnalisées en fonction de ce qui vous motive.</string>
   <string name="tutorial_tasks_complete">C\'est tout pour l\'instant. Si vous avez besoin d\'un rappel, consultez la section FAQ.</string>
-  <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
-  <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
-  <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
-  <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
+    <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
   <string name="tutorial_party">Voici l\'endroit où vos amis et vous pouvez vous tenir mutuellement responsables de vos buts et combattre des monstres grâce à vos tâches !</string>
   <string name="tutorial_tavern">Bienvenue à la Taverne, un salon de discussion public pour tous les âges ! Ici, vous pouvez discuter de productivité et poser des questions. Amusez-vous bien !</string>
-  <string name="tutorial_classes">Devenez, au choix, Guerrier, Mage, Guérisseur ou Voleur ! Chaque classe possède des équipements et des compétences uniques. Tapez sur (?) pour en savoir plus !</string>
-  <string name="tutorial_stats">Utilisez le bouton gris pour allouer plusieurs points à la fois, ou utilisez les flèches pour en ajouter un à la fois.</string>
+    <string name="tutorial_stats">Utilisez le bouton gris pour allouer plusieurs points à la fois, ou utilisez les flèches pour en ajouter un à la fois.</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index d7997a8a4..2ab1b64ba 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Expérience</string>
   <string name="HP_default">Santé</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Les préférences n\'ont pas pu être chargées depuis le QR Code</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Paramètres</string>
-  <string name="SP_address_hint">Votre serveur personnalisé</string>
-  <string name="SP_userID_title">Identifiant utilisateur</string>
-  <string name="SP_userID_summary">Votre identifiant utilisateur</string>
+    <string name="SP_userID_title">ID d\'utilisateur</string>
+  <string name="SP_userID_summary">Votre ID d\'utilisateur</string>
   <string name="SP_APIToken_title">Jeton d\'API</string>
   <string name="SP_APIToken_summary">Votre jeton d\'API</string>
-  <string name="Language_title">Langue</string>
+  <string name="Language_title">Langage</string>
   <string name="Language_summary">Changer la langue 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="PS_contact_title">Contactez-moi</string>
+    <string name="pref_account_header">Compte</string>
   <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
   <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
   <string name="pref_reminder_header">Rappel quotidien</string>
   <string name="pref_reminder_checkbox">Activer le rappel</string>
   <string name="pref_reminder_picker">Changer l\'heure du rappel</string>
   <string name="pref_cds_header">Heure personnalisée de début de journée</string>
-  <string name="pref_cds_picker">Définir l\'heure personnalisée de début de journée</string>
-  <string name="pref_push_notifications_checkbox">Notifications push de l\'utilisateur</string>
+    <string name="pref_push_notifications_checkbox">Notifications push de l\'utilisateur</string>
   <string name="push_notifications">Notifications push</string>
   <string name="push_notifications_sum">Paramétrez vos notifications push</string>
   <string name="preference_push_you_won_challenge">Vous avez gagné un défi !</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Votre quête a commencé</string>
   <string name="preference_push_invited_to_quest">Invitation à une quête</string>
   <!--Adding tasks-->
-  <string name="task_value">Valeur</string>
-  <string name="new_todo">Nouvelle tâche à faire</string>
-  <string name="new_reward">Nouvelle récompense</string>
-  <string name="new_daily">Nouvelle tâche quotidienne</string>
-  <string name="new_habit">Nouvelle habitude</string>
-  <string name="action_edit">Modifier</string>
-  <string name="action_delete">Supprimer</string>
-  <string name="action_cancel">Annuler</string>
+    <string name="action_edit">Modifier</string>
+    <string name="action_cancel">Annuler</string>
   <string name="login_btn">Se connecter</string>
   <string name="register_btn">Créer un compte</string>
   <string name="username">Nom d\'utilisateur</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Confirmez votre mot de passe</string>
   <string name="logout">Se déconnecter</string>
   <string name="logout_description">Déconnexion de votre compte</string>
-  <string name="account_details">Détails du compte</string>
-  <string name="LoginActivityName">Bienvenue</string>
-  <string name="string_revive">Résurrection</string>
-  <string name="please_connect">Veuillez vous connecter à l\'application avant d\'utiliser un widget</string>
-  <string name="about.title">À propos</string>
-  <string name="about.libraries">Librairies</string>
-  <string name="about.versionhistory">Historique des versions</string>
-  <string name="about.habitica_open_source">Habitica est disponible sur Github en open source </string>
-  <string name="about.rate_our_app">Notez notre application</string>
-  <string name="about.give_us_feedback">Envoyez nous votre avis !</string>
-  <string name="about.bugreport">Signaler un bug</string>
-  <string name="about.source_code">Code source</string>
-  <string name="repeatEvery">Répéter tous les</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erreur lors de la connexion</string>
-  <string name="network_error_no_network_body">Vous n\'êtes pas connecté·e à Internet.</string>
-  <string name="internal_error_api">Connexion au serveur perdue</string>
+    <string name="LoginActivityName">Bienvenue</string>
+    <string name="about_title">À propos</string>
+  <string name="about_libraries">Bibliothèques</string>
+    <string name="about_habitica_open_source">Habitica est disponible sur Github en open source </string>
+  <string name="about_rate_our_app">Notez notre application</string>
+  <string name="about_give_us_feedback">Envoyez nous votre avis !</string>
+  <string name="about_bugreport">Signaler un bug</string>
+  <string name="about_source_code">Code source</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Il semblerait qu\'il y ait un problème avec le serveur. Essayez plus tard.</string>
   <string name="authentication_error_title">Erreur d\'authentification</string>
-  <string name="authentication_error_body">Votre nom d\'utilisateur et/ou mot de passe est incorrect.</string>
-  <string name="login_validation_error_title">Erreur de validation</string>
+    <string name="login_validation_error_title">Erreur de validation</string>
   <string name="login_validation_error_fieldsmissing">Vous devez renseigner tous les champs.</string>
   <string name="save_changes">Enregistrer</string>
   <string name="copy">Copier</string>
   <string name="notes">Notes</string>
-  <string name="text">Texte</string>
-  <string name="difficulty">Difficulté</string>
+    <string name="difficulty">Difficulté</string>
   <string name="tags">Étiquettes</string>
   <string name="trivial">Banal</string>
   <string name="easy">Facile</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Négatif ( - )</string>
   <string name="checklist">Liste de vérification</string>
   <string name="reminders">Rappels</string>
-  <string name="actions">Instructions/Actions</string>
-  <string name="attributes">Attributs</string>
-  <string name="physical">Force</string>
-  <string name="mental">Intelligence</string>
-  <string name="social">Constitution</string>
-  <string name="other">Perception</string>
-  <string name="frequency">Répéter</string>
-  <string name="frequency_weekly">Certains jours de la semaine</string>
-  <string name="frequency_daily">Tous les X jours</string>
-  <string name="repeatables_summary_title">Résumé</string>
-  <string name="repeatables_title">Se répète</string>
-  <string name="repeatables_on_title">Se répète le</string>
-  <string name="repeatables_frequency_daily">Quotidiennement</string>
+    <string name="attributes">Attributs</string>
+    <string name="repeatables_frequency_daily">Quotidiennement</string>
   <string name="repeatables_frequency_weekly">Hebdomadairement</string>
   <string name="repeatables_frequency_monthly">Mensuellement</string>
   <string name="repeatables_frequency_yearly">Annuellement</string>
@@ -117,30 +86,20 @@
   <string name="sunday">Dimanche</string>
   <string name="levelup_header">Vous avez atteint le niveau %1$d !</string>
   <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez gagné un niveau et êtes maintenant complètement guéri !</string>
-  <string name="levelup_button">Bravo !</string>
   <string name="faint_subtitle">Ne désespérez pas !</string>
   <string name="faint_penalty_body">Vous avez perdu un niveau, votre or, et une pièce d\'équipement, mais vous pouvez tous les récupérer en travaillant dur ! Bonne chance—vous y arriverez.</string>
   <string name="faint_header">Vous n\'avez plus de points de vie !</string>
   <string name="faint_button">Reprendre des forces &amp; réessayer</string>
   <string name="filter">Filtrer</string>
-  <string name="profile_image">Image de profil</string>
-  <string name="mana_price_button">%d points de mana</string>
-  <string name="used_skill">Vous avez utilisé %1$s pour %2$d points de mana.</string>
-  <string name="used_skill_without_mana">Vous avez utilisé %1$s.</string>
+    <string name="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">Rappelez-vous de cocher vos tâches quotidiennes</string>
-  <string name="skill_progress_title">Utiliser une compétence</string>
-  <string name="coming_soon">Bientôt disponible</string>
-  <string name="chat_flag_confirmation">Confirmez-vous vouloir signaler ce message pour infraction ?</string>
-  <string name="flag_confirm">Signaler</string>
-  <string name="unlock_lvl_11">Disponible au niveau 11</string>
-  <string name="no_party_message">Vous ne faites pas partie d\'une équipe. Pour rejoindre une équipe, veuillez visiter le site.</string>
-  <string name="forgot_pw_btn">Mot de passe oublié</string>
-  <string name="tavern.inn.checkOut">Réactiver vos tâches quotidiennes</string>
-  <string name="tavern.inn.rest">Suspendre vos tâches quotidiennes</string>
-  <string name="reward.dialog.buy">Acheter</string>
-  <string name="reward.dialog.dismiss">Annuler</string>
+    <string name="reminder_title">Rappelez-vous de cocher vos tâches quotidiennes</string>
+    <string name="unlock_lvl_11">Disponible au niveau 11</string>
+    <string name="forgot_pw_btn">Mot de passe oublié</string>
+  <string name="tavern_inn_checkOut">Réactiver vos tâches quotidiennes</string>
+  <string name="tavern_inn_rest">Suspendre vos tâches quotidiennes</string>
+  <string name="reward_dialog_buy">Acheter</string>
+  <string name="reward_dialog_dismiss">Annuler</string>
   <string name="party">Équipe</string>
   <string name="chat">Discussion</string>
   <string name="members">Membres</string>
@@ -148,24 +107,20 @@
   <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>
-  <string name="yes">Oui</string>
+    <string name="yes">Oui</string>
   <string name="no">Non</string>
   <string name="quest">Quête</string>
   <string name="avatar_body">Corps</string>
   <string name="avatar_hair">Cheveux</string>
   <string name="avatar_shirt">Tunique</string>
   <string name="avatar_skin">Peau</string>
-  <string name="avatar_ears">Oreilles d\'animaux</string>
-  <string name="avatar_base">Nuque</string>
+    <string name="avatar_base">Nuque</string>
   <string name="avatar_color">Couleur</string>
   <string name="avatar_beard">Barbe</string>
   <string name="avatar_mustache">Moustache</string>
   <string name="avatar_flower">Fleur</string>
   <string name="avatar_bangs">Frange</string>
-  <string name="avatar_nothing">Sélection vide</string>
-  <string name="avatar_size">Taille</string>
+    <string name="avatar_size">Taille</string>
   <string name="avatar_size_slim">Mince</string>
   <string name="avatar_size_broad">Trapu</string>
   <string name="avatar_background">Arrière-plan</string>
@@ -174,23 +129,17 @@
   <string name="purchase_button">Acheter</string>
   <string name="purchase_set_title">Acheter le lot %s</string>
   <string name="due_date">Échéance</string>
-  <string name="quest.accept">Accepter</string>
-  <string name="quest.reject">Refuser</string>
-  <string name="quest.begin">Lancer la quête</string>
-  <string name="quest.cancel">Annuler l\'invitation</string>
-  <string name="quest.abort">Annuler la quête</string>
-  <string name="quest.leave">Abandonner la quête</string>
-  <string name="quest.pending">En attente</string>
-  <string name="quest.accepted">Acceptée</string>
-  <string name="quest.rejected">Rejetée</string>
-  <string name="quest.participants">Participants</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="quest_accept">Accepter</string>
+  <string name="quest_reject">Refuser</string>
+  <string name="quest_begin">Lancer la quête</string>
+  <string name="quest_cancel">Annuler l\'invitation</string>
+  <string name="quest_abort">Annuler la quête</string>
+    <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Aide &amp; FAQ</string>
   <string name="complete_tutorial">J\'ai compris !</string>
   <string name="dismiss_tutorial">Rappelez-le moi plus tard</string>
   <string name="intro_1_subtitle">Bienvenue sur</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
+    <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
   <string name="intro_2_subtitle">Progrès en jeu</string>
   <string name="intro_2_title">Progrès dans la vie</string>
   <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
@@ -198,12 +147,9 @@
   <string name="intro_3_title">Sociabilisez-vous</string>
   <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avec l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
   <string name="intro_finish_button">C\'est parti !</string>
-  <string name="previous_button">Précédent</string>
-  <string name="next_button">Suivant</string>
+    <string name="next_button">Suivant</string>
   <string name="skip_button">Passer</string>
-  <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’équipement, des animaux, des quêtes, et bien plus encore.</string>
-  <string name="setup_welcome_title">Bienvenue</string>
-  <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
+    <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
   <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
   <string name="setup_group_work">Travailler</string>
   <string name="setup_group_exercise">Faire de l\'exercice</string>
@@ -233,38 +179,20 @@
   <string name="setup_task_creativity_1">Étudier un maître de l\'art</string>
   <string name="setup_task_creativity_2">Travailler sur un projet créatif</string>
   <string name="setup_task_creativity_3">Finir un projet créatif</string>
-  <string name="gem.purchase.support">Vous voulez aider Habitica à continuer d\'exister \? Vous pouvez soutenir les développeurs en achetant des gemmes !
-\n
-\nLes gemmes vous permettent d\'acheter des éléments supplémentaires pour votre compte, comme : 
-\n
-\n - De super costumes pour votre avatar
-\n - Des arrière-plans géniaux
-\n - Des quêtes amusantes où vous gagnez des œufs de familiers
-\n - La possibilité de changer de classe avant le niveau 100
-\n
-\nMerci infiniment de nous aider à faire d\'Habitica le meilleur site possible. Votre soutien signifie beaucoup pour nous !</string>
-  <string name="my_guilds">Mes guildes</string>
+    <string name="my_guilds">Mes guildes</string>
   <string name="public_guilds">Guildes publiques</string>
   <string name="guild">Guilde</string>
   <string name="leave">Quitter</string>
   <string name="join">Rejoindre</string>
-  <string name="leader">Responsable</string>
-  <string name="gems">Gemmes</string>
-  <string name="copy_as_todo">Copier comme une tâche à faire</string>
-  <string name="send_pm">Envoyer un MP</string>
-  <string name="flag">Signaler</string>
-  <string name="delete">Supprimer</string>
+    <string name="gems">Gemmes</string>
+    <string name="delete">Supprimer</string>
   <string name="name">Nom</string>
   <string name="description">Description</string>
   <string name="add_tag">Ajouter une nouvelle étiquette</string>
   <string name="privacy">Sécurité</string>
   <string name="write_message">Écrire un message</string>
-  <string name="post">Envoyer</string>
-  <string name="guild_search_hint">Chercher des guildes</string>
-  <string name="todo_due">Échéance : %s</string>
-  <string name="daily_streak">combo actuel : %d</string>
-  <string name="todo_has_duedate">La tâche a une date d\'échéance</string>
-  <string name="battle_gear">Équipement de combat</string>
+    <string name="guild_search_hint">Chercher des guildes</string>
+    <string name="battle_gear">Équipement de combat</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Tête</string>
   <string name="outfit_headAccessory">Accessoire de tête</string>
@@ -277,10 +205,8 @@
   <string name="wear_costume">Porter un costume</string>
   <string name="equipped">Équipé</string>
   <string name="quest_cancel_message">Êtes-vous sûr·e de vouloir annuler cette quête ? Toutes les invitations ayant été acceptées seront perdues. Le lanceur de la quête gardera le parchemin de la quête en sa possession.</string>
-  <string name="quest.invitation">Invitation à une quête</string>
-  <string name="quest_begin_message">Voulez-vous commencer ? Seuls %1$d de vos %2$d partenaires d\'aventure on rejoint cette quête ! La quête démarre automatiquement une fois que tout le monde a accepté ou refusé l\'invitation.</string>
-  <string name="quest.invitation.text">Vous avez été invité·e à participer à une quête !</string>
-  <string name="ago_1day">Il y a 1j</string>
+    <string name="quest_begin_message">Voulez-vous commencer ? Seuls %1$d de vos %2$d partenaires d\'aventure on rejoint cette quête ! La quête démarre automatiquement une fois que tout le monde a accepté ou refusé l\'invitation.</string>
+    <string name="ago_1day">Il y a 1j</string>
   <string name="ago_days">Il y a %dj</string>
   <string name="ago_1Minute">Il y a 1m</string>
   <string name="ago_minutes">Il y a %dm</string>
@@ -297,13 +223,9 @@
   <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 une %1$s %2$s. Qu\'est-ce que ça fait là ?</string>
   <string name="armoireExp">Vous luttez contre l\'Armoire et gagnez de l\'expérience. Prends ça !</string>
-  <string name="armoireNotesFull">Ouvrez l\'Armoire pour recevoir au hasard de l\'équipement spécial, de l\'expérience ou de la nourriture ! Pièces d\'équipement restantes : %d</string>
-  <string name="armoireLastItem">Vous avez trouvé la dernière pièce d\'équipement rare dans l\'Armoire enchantée.</string>
-  <string name="armoireNotesEmpty">L\'Armoire contiendra de nouvelles pièces d\'équipement la première semaine de chaque mois. D\'ici là, continuez à cliquer pour obtenir de l\'expérience et de la nourriture !</string>
-  <string name="sell">Vendre (%d pièces d\'or)</string>
+    <string name="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="hatch_egg">Faire éclore avec l\'œuf</string>
   <string name="invite_party">Inviter l\'équipe</string>
   <string name="dialog_feeding">Nourrissez votre %s avec :</string>
   <string name="use_animal">Utiliser</string>
@@ -314,8 +236,7 @@
   <string name="close">Fermer</string>
   <string name="share">Partager</string>
   <string name="notification_pet_fed">Vous avez nourri votre %s !</string>
-  <string name="notification_purchase">Vous avez acheté %s</string>
-  <string name="notification_purchase_reward">Vous avez acheté une récompense</string>
+    <string name="notification_purchase_reward">Vous avez acheté une récompense</string>
   <string name="world_quest">Quête mondiale</string>
   <string name="inn_description">Besoin de repos \? Reposez vous à l\'Auberge de Daniel pour faire une pause des effets de jeu les plus compliqués :
 \n
@@ -330,14 +251,13 @@
   <string name="rogue">Voleur</string>
   <string name="mage">Mage</string>
   <string name="healer">Guérisseur</string>
-  <string name="warrior_description">Les Guerriers font plus de coups critiques et infligent également de lourds dégâts aux boss. Jouez un Guerrier si vous voulez vaincre les monstres facilement ou bénéficier de combos élevés.</string>
-  <string name="mage_description">Les mages apprennent des compétences qui infligent des dégâts aux boss et augmentent l\'expérience et le mana. Jouez un mage si vous voulez gagner rapidement en niveau ! Les mages bénéficient d\'une grande intelligence.</string>
-  <string name="rogue_description">Les voleurs apprennent des dégâts qui font gagner plus d\'or et de butin à leur équipe et à eux-mêmes. Jouez un voleur si vous voulez plein d\'or et d\'objets ! Les voleurs bénéficient d\'une perception accrue.</string>
-  <string name="healer_description">Les guérisseurs apprennent des compétences qui guérissent et protègent autant eux-même que leur équipe. Jouez un guérisseur si vous voulez éviter les dégâts ! Les guérisseurs ont une forte constitution.</string>
+  <string name="warrior_description">Les Guerriers font plus de \\"coups critiques\\" et ils sont plus puissants, tandis qu\'ils reçoivent aléatoirement des bonus d\'or, d\'expérience, et de chance d\'obtenir du butin en achevant une tâche. Ils infligent également de lourds dommages aux boss. Jouez un Guerrier si vous êtes motivé par des récompenses aléatoires de style jackpot, ou si vous voulez distribuez des gnons dans les quêtes de boss !</string>
+  <string name="mage_description">Les Mages apprennent vite, gagnant expérience et niveaux plus rapidement que les autres classes. Ils reçoivent également de grandes réserves de mana pour utiliser les capacités spéciales. Jouez un Mage si vous aimez l\'aspect tactique du jeu, ou si vous êtes très motivé à monter beaucoup de niveaux et débloquer des options avancées !</string>
+  <string name="rogue_description">Les Voleurs adorent amasser des richesses, récupérant plus d\'or que qui que ce soit d\'autre, et sont doués pour trouver des objets par hasard. Leur légendaire capacité de Furtivité leur permet d\'esquiver les conséquences des Quotidiennes manquées. Jouez un Voleur si vous êtes fortement motivé par les récompenses et les succès, à la recherche de butin et de badges !</string>
+  <string name="healer_description">Les Guérisseurs sont imperméable aux dégâts et étendent cette protection aux autres. Les Quotidiennes manquées et les mauvaises habitudes ne les affectent pas tant que ça, et ils ont des moyens pour retrouver la santé après un échec. Jouez un Guérisseur si vous aimez assister les membres de votre équipe, ou si l\'idée de tromper la mort par le dur labeur vous inspire !</string>
   <string name="select_class">Sélectionner une classe</string>
   <string name="opt_out_class">Désactiver</string>
-  <string name="opt_out_description">Les classes vous ennuient ? Vous voulez choisir plus tard ? Désactivez-les - vous serez un combattant sans capacités spéciales. Vous pouvez vous renseigner plus tard sur le système de classe sur le wiki et activer les classes à tout moment.</string>
-  <string name="class_confirmation">Êtes vous sûr de vouloir devenir un %s \?</string>
+    <string name="class_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>
@@ -351,23 +271,18 @@
   <string name="invite_existing_users">Inviter des utilisateurs•trices existant•e•s</string>
   <string name="send">Envoyer</string>
   <string name="invite">Inviter des proches</string>
-  <string name="invite_id_description">Si vous avez des proches qui jouent déjà à Habitica, invitez-les en utilisant leurs ID d\'utilisateur.</string>
-  <string name="invite_username_description">Si vous avez des amis qui utilisent déjà Habitica, invitez les ici avec leur nom d\'utilisateur.</string>
+    <string name="invite_username_description">Si vous avez des amis qui utilisent déjà Habitica, invitez les ici avec leur nom d\'utilisateur.</string>
   <string name="invite_email_description">Si un•e ami•e rejoint Habitica via votre email, il ou elle sera automatiquement invité•e à rejoindre votre équipe !</string>
   <string name="add_invites">Ajouter des invitations</string>
-  <string name="user_id">ID d\'utilisateur</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Inviter dans l\'équipe</string>
-  <string name="share_using">Partager avec</string>
+    <string name="email">Email</string>
+    <string name="share_using">Partager avec</string>
   <string name="share_levelup">J\'ai atteint le niveau %d à Habitica en améliorant mes habitudes dans le monde réel !</string>
-  <string name="share_hatched">Je viens de faire éclore un familier%1$s %2$s à Habitica en réalisant mes tâches quotidiennes !</string>
-  <string name="share_raised">Je viens de gagner un-e %1$s monture en réalisant mes tâches quotidiennes !</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 monture en réalisant mes tâches quotidiennes!</string>
   <string name="open_in_store">Ouvrir dans le Play Store</string>
   <string name="change_class_confirmation">Êtes-vous sûr·e de vouloir changer de classe ? Cela vous coûtera 3 gemmes.</string>
   <string name="change_class_equipment_warning">Attention : vous ne pourrez plus acheter l\'équipement de la classe %s.</string>
-  <string name="leaderMessage">Message de %1$s</string>
-  <string name="leaderName">Leader : %1$s</string>
-  <string name="confirm">Confirmer</string>
+    <string name="confirm">Confirmer</string>
   <string name="market">Marché</string>
   <string name="timeTravelers">Voyageurs temporels</string>
   <string name="seasonalShop">Boutique saisonnière</string>
@@ -375,37 +290,16 @@
   <string name="party_invite">Débloquer en invitant des ami•e•s</string>
   <string name="login_incentive">Débloquez en vous connectant régulièrement à Habitica</string>
   <string name="create_account">Débloquez en créant un compte</string>
-  <string name="no_gold">Pas assez d\'or</string>
-  <string name="no_potion">Vous n\'avez pas besoin d\'acheter une potion de santé</string>
-  <string name="successful_purchase">%1$s acheté</string>
-  <string name="purchase_confirmation_title">Confirmer l\'achat</string>
-  <string name="confirm_purchase_text">Acheter %1$s pour %2$s %3$s</string>
-  <string name="gem">gemme</string>
-  <string name="hourglass">sablier</string>
-  <string name="hourglasses">sabliers</string>
-  <string name="gold_singular">pièce d\'or</string>
-  <string name="gold_plural">pièces d\'or</string>
+    <string name="successful_purchase">%1$s acheté</string>
+    <string name="gold_plural">pièces d\'or</string>
   <string name="chat_message_copied">Message copié dans le presse-papier</string>
-  <string name="copy_chat_message">Copier dans le presse-papier</string>
-  <string name="edit_tag_title">Modifier l\'étiquette</string>
-  <string name="edit_tag_btn_edit">Modifier</string>
-  <string name="edit_tag_btn_done">Terminé</string>
-  <string name="edit_tag_btn_delete">Supprimer</string>
-  <string name="confirm_delete_tag_title">Confirmez-vous ?</string>
+    <string name="edit_tag_btn_edit">Modifier</string>
+    <string name="confirm_delete_tag_title">Confirmez-vous ?</string>
   <string name="confirm_delete_tag_message">Voulez-vous vraiment supprimer ceci \?</string>
-  <string name="filter_drawer_edit_tags">Modifier les étiquettes</string>
-  <string name="filter_drawer_filter_tags">Filtrer par étiquette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laissez quelqu\'un vous inviter avec ce QR code</string>
-  <string name="qr_save_message">QR code enregistré sous</string>
-  <string name="qr_dialogue_title">Votre QR code</string>
-  <string name="download">Télécharger</string>
-  <string name="send_new_message">Envoyer un nouveau message</string>
-  <string name="choose_recipient_title">Choisissez un destinataire</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Choisissez un destinataire</string>
   <string name="action_continue">Continuer</string>
-  <string name="scan_qr_code">Scanner le QR code</string>
-  <string name="enter_recipient_uuid">Saisissez l\'identifiant du destinataire</string>
-  <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
+    <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
   <string name="stats_widget_label">Statistiques d\'Habitica</string>
   <string name="add_task">Ajouter une tâche</string>
   <string name="add_habit">Ajouter une habitude</string>
@@ -416,15 +310,14 @@
   <string name="widget_habit_button">Réaliser une tâche Habitica</string>
   <string name="widget_dailies">Quotidiennes Habitica</string>
   <string name="widget_todo_list">Liste des tâches Habitica</string>
-  <string name="widget_add_task">Ajouter une tâche Habitica</string>
-  <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
-  <string name="gem.purchase.toolbartitle">Acheter</string>
-  <string name="gem.purchase.title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
-  <string name="gem.purchase.subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
-  <string name="gem.purchase.listitem1">Des costumes chouettes pour votre avatar</string>
-  <string name="gem.purchase.listitem2">De magnifiques arrière-plans</string>
-  <string name="gem.purchase.listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
-  <string name="gem.purchase.listitem4">La possibilité de changer de classe avant le niveau 100</string>
+    <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
+  <string name="gem_purchase_toolbartitle">Acheter</string>
+  <string name="gem_purchase_title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
+  <string name="gem_purchase_subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
+  <string name="gem_purchase_listitem1">Des costumes chouettes pour votre avatar</string>
+  <string name="gem_purchase_listitem2">De magnifiques arrière-plans</string>
+  <string name="gem_purchase_listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
+  <string name="gem_purchase_listitem4">La possibilité de changer de classe avant le niveau 100</string>
   <string name="support_habitica">Soutenir Habitica</string>
   <string name="skill_transformation_use">Utiliser</string>
   <string name="hatching_market_info">Vous ne recevez pas le bon butin ? Allez voir au marché !</string>
@@ -438,32 +331,32 @@
   <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_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="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="subscription_duration_norenew">Pour %s</string>
   <string name="subscribe">S\'abonner</string>
-  <string name="subscribe.listitem1.description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
-  <string name="subscribe.listitem2.description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
-  <string name="subscribe.listitem3.description">Rend l\'historique des tâches disponible plus longtemps.</string>
-  <string name="subscribe.listitem4.description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre écurie plus rapidement !</string>
-  <string name="subscribe1month.gemcap">Plafond de 25 gemmes</string>
-  <string name="subscribe3month.gemcap">Plafond de 30 gemmes</string>
-  <string name="subscribe6month.gemcap">Plafond de 35 gemmes</string>
-  <string name="subscribe12month.gemcap">Plafond de 45 gemmes</string>
+  <string name="subscribe_listitem1_description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
+  <string name="subscribe_listitem2_description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
+  <string name="subscribe_listitem3_description">Rend l\'historique des tâches disponible plus longtemps.</string>
+  <string name="subscribe_listitem4_description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre écurie plus rapidement !</string>
+  <string name="subscribe1month_gemcap">Plafond de 25 gemmes</string>
+  <string name="subscribe3month_gemcap">Plafond de 30 gemmes</string>
+  <string name="subscribe6month_gemcap">Plafond de 35 gemmes</string>
+  <string name="subscribe12month_gemcap">Plafond de 45 gemmes</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="due">Echéance</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="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>
@@ -478,56 +371,40 @@
   <string name="twelve_months">12 mois</string>
   <string name="subscribe_prompt_thanks">Pour votre abonnement, vous recevez ces bénéfices :</string>
   <string name="subscription_status">Etat de l\'abonnement</string>
-  <string name="byLeader">par %s</string>
-  <string name="challenge_details">Détails du défi</string>
-  <string name="challenge_leave_title">Quitter le défi</string>
+    <string name="challenge_leave_title">Quitter le défi</string>
   <string name="challenge_leave_text">Voulez-vous vraiment quitter le défi \"%s\" ?</string>
   <string name="challenge_remove_tasks_title">Supprimer les tâches</string>
   <string name="challenge_remove_tasks_text">Voulez-vous supprimer les tâches ?</string>
   <string name="remove_tasks">Supprimer</string>
   <string name="keep_tasks">Conserver</string>
   <string name="my_challenges">Mes défis</string>
-  <string name="public_challenges">Publique</string>
-  <string name="challenges">Défis</string>
-  <string name="daily">Quotidienne</string>
+    <string name="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="challenge">Défi</string>
+    <string name="not_part_of_a_challenge">Vous ne faites pas encore partie de ce défi !</string>
   <string name="join_a_challenge">Rejoignez un défi pour ajouter une sélection de tâches à votre liste, puis affrontez les autres participants pour gagner des succès ou même des gemmes !</string>
   <string name="check_the_public_challenge_tab">Sélectionnez l\'onglet \"Publique\" pour trouver les défi créés par la communauté qui vous sont le plus adaptés !</string>
-  <string name="add_reminder">Ajouter un rappel</string>
-  <string name="warning">Attention</string>
-  <string name="open_settings">Ouvrir les paramètres</string>
-  <string name="dont_keep_activities_warning">Il semblerait que vous ayez l\'option développeur \\"Ne pas conserver les activités\\" activées. Actuellement, cette option provoque des problèmes avec l\'application Habitica, nous vous suggérons de la désactiver.</string>
-  <string name="inbox">Messages</string>
-  <string name="FAQ">Questions fréquentes (FAQ)</string>
-  <string name="special">Spécial</string>
+    <string name="inbox">Messages</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="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="checkInRewardEarned">Vous avez mérité cette récompense : %1$s pour votre dévotion à améliorer votre vie.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Votre prochain prix sera débloqué à %1$d connexions</string>
   <string name="pending_approval">En attente de validation</string>
   <string name="filters">Filtres</string>
   <string name="done">Terminer</string>
-  <string name="group_tasks_edit_description">Les tâches de groupe ne peuvent pas être modifiées.</string>
-  <string name="group_tasks_edit_title">Tâche non modifiable</string>
-  <string name="groups">Groupes</string>
+    <string name="groups">Groupes</string>
   <string name="all">Tous</string>
   <string name="none">Aucun</string>
   <string name="owned">Possédé</string>
   <string name="not_owned">Non possédé</string>
-  <string name="new_game">Nouvelle\nPartie</string>
-  <string name="login_btn_fb">Se connecter via Facebook</string>
+    <string name="login_btn_fb">Se connecter via Facebook</string>
   <string name="login_btn_google">Se connecter via Google</string>
   <string name="action_back">Retour</string>
   <string name="welcome_text">Oh, vous devez débuter. Je m\'appelle Justin et je vais vous guider dans Habitica.
@@ -556,12 +433,11 @@
   <string name="empty_description_todos">Les tâches à faire sont des tâches qui ne doivent être validées qu\'une seule fois. Ajoutez des listes de vérifications pour augmenter leur valeur.</string>
   <string name="empty_title_rewards">Vous n\'avez aucune récompense</string>
   <string name="reset_walkthrough">Recommencer la visite de Justin</string>
-  <string name="read_community_guidelines">Veuillez lire nos <u>règles de vie en communauté</u> avant de publier un message</string>
+  <string name="read_community_guidelines">Veuillez lire nos règles de vie en communauté avant de publier un message</string>
   <string name="maintenance">Maintenance</string>
   <string name="reload_content">Recharger le contenu</string>
   <string name="dailyDueDefaultView">Passez le quotidiennes sur l\'onglet \'échéance\' par défaut</string>
   <string name="dailyDueDefaultViewDescription">Une fois cette option définie, les quotidiennes seront par défait sur l\'onglet \'échéance\' à la place de \'toutes\'</string>
-  <string name="repeat_summary">Se répète %1$s chaque %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Votre appareil ne dispose pas de méthode de paiement supportée. Veuillez utiliser le site habitica si vous voulez acheter des gemmes.</string>
   <string name="no_billing_subscriptions">Votre appareil ne dispose pas de méthode de paiement supportée. Veuillez utiliser le site habitica si vous voulez payer un abonnement.</string>
   <string name="save">Enregistrer</string>
@@ -569,8 +445,7 @@
   <string name="gem_reward">Récompense en gemmes</string>
   <string name="tasks">Tâches</string>
   <string name="create_challenge">Créer un défi</string>
-  <string name="edit_challenge">Modifier</string>
-  <string name="challenge_create_error_tavern_one_gem">Il vous faut au moins 1 gemme pour créer un défi public.</string>
+    <string name="challenge_create_error_tavern_one_gem">Il vous faut au moins 1 gemme pour créer un défi public.</string>
   <string name="challenge_create_error_enough_gems">Vous ne possédez pas assez de gemmes pour créer un défi.</string>
   <string name="identify_your_challenge_with_a_tag">Identifiez votre défi avec une étiquette</string>
   <string name="challenge_create_error_tag">Il vous faut un nom nom court pour créer ce défi.</string>
@@ -580,42 +455,36 @@
   <string name="new_challenge_title">Nouveau titre du défi</string>
   <string name="ownership">Propriété</string>
   <string name="inn">Auberge</string>
-  <string name="system">Système</string>
-  <string name="start_quest">Démarrer une nouvelle quête</string>
+    <string name="start_quest">Démarrer une nouvelle quête</string>
   <string name="leave_party">Quitter l\'équipe</string>
   <string name="party_description">Description de l\'équipe</string>
-  <string name="abort_confirmation">Voulez-vous vraiment abandonner cette mission ? Elle sera abandonnée pour tout le monde dans votre équipe, et tout progrès sera perdu. Le parchemin de quête sera renvoyé au propriétaire de la quête.</string>
-  <string name="leave_quest_confirmation">Voulez-vous vraiment quitter la quête en cours ? Tout vos progrès dans la quête seront perdu.</string>
-  <string name="number_participants">%1$d participants</string>
+    <string name="number_participants">%1$d participants</string>
   <string name="welcome_back">Bienvenue à nouveau</string>
-  <string name="yesterdaililes_prompt">Avez-vous réalisé une de ces quotidiennes hier :</string>
+  <string name="yesterdaililes_prompt">Avez-vous réalisé une de ces quotidiennes hier ?</string>
   <string name="start_day">Démarrer ma journée</string>
   <string name="leave_party_confirmation">Voulez-vous vraiment quitter l\'équipe ?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Prochaine récompense dans %d connexions</string>
-  <string name="pending">En cours</string>
+    <string name="pending">En cours</string>
   <string name="accepted">Accepté</string>
   <string name="declined">Refusé</string>
   <string name="participants">Participants</string>
   <string name="invitations">Invitations</string>
-  <string name="quest_leader_header" formatted="false">Lancé par %s</string>
+  <string name="quest_leader_header">Lancé par %s</string>
   <string name="quest_abort_message">Voulez-vous vraiment annuler cette mission ? Cela l\'annulera pour tout le   monde dans l\'équipe et toute avancée sera perdue. Le parchemin de quête retournera à son propriétaire. </string>
-  <string name="loading">Chargement…</string>
-  <string name="reloading_content">Recharger le contenu</string>
+    <string name="reloading_content">Recharger le contenu</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mo</string>
   <string name="billion_abbrev">ma</string>
-  <string name="your_balance">Votre solde :</string>
-  <string name="available_until" formatted="false">Disponible jusqu\'au %s</string>
-  <string name="gems_left_max" formatted="false">Gemmes mensuelles : %1$d/%2$d restantes</string>
-  <string name="gems_left_nomax" formatted="false">Gemmes mensuelles : %d restantes</string>
+    <string name="available_until">Disponible jusqu\'au %s</string>
+  <string name="gems_left_max">Gemmes mensuelles : %1$d/%2$d restantes</string>
+  <string name="gems_left_nomax">Gemmes mensuelles : %d restantes</string>
   <string name="health">Santé</string>
   <string name="collect">Réunir</string>
   <string name="rage_meter">Barre de rage</string>
   <string name="boss_quest">Quête de boss</string>
   <string name="collection_quest">Quête de collecte</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d points d\'expérience</string>
-  <string name="gold_reward" formatted="false">%d pièces d\'or</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d points d\'expérience</string>
+  <string name="gold_reward">%d pièces d\'or</string>
   <string name="quest_owner_rewards">Récompenses du propriétaire de la quête</string>
   <string name="str_abbrv">For</string>
   <string name="per_abbrv">Per</string>
@@ -628,8 +497,7 @@
   <string name="reset_account_confirmation">réinitialiser mon compte</string>
   <string name="delete_account_confirmation">supprimer mon compte</string>
   <string name="danger_zone">Zone de danger</string>
-  <string name="nevermind">Peu importe</string>
-  <string name="resetting_account">Réinitialisation du compte</string>
+    <string name="resetting_account">Réinitialisation du compte</string>
   <string name="deleting_account">Suppression du compte</string>
   <string name="insufficientGold">Vous devez compléter plus de taches avant de pouvoir vous offrir cet objet ! </string>
   <string name="insufficientGems">Vous n\'avez pas assez de gemmes pour acheter cet objet !</string>
@@ -662,8 +530,7 @@
   <string name="authentication_summary">Modifiez vos options d\'authentification.</string>
   <string name="change_password">Changer le mot de passe</string>
   <string name="change_email">Changer votre adresse de courriel</string>
-  <string name="change_login_name">Changer votre pseudo de connexion </string>
-  <string name="change_username">Changer son Nom d\'Utilisateur</string>
+    <string name="change_username">Changer son Nom d\'Utilisateur</string>
   <string name="change">Changer</string>
   <string name="character_level">Niveau du personnage</string>
   <string name="auto_allocate_points">Attribuer automatiquement les points</string>
@@ -684,7 +551,7 @@
   <string name="distribute_class">Répartir selon la classe</string>
   <string name="distribute_task">Répartir suivant l\'activité des tâches</string>
   <string name="no_points_to_allocate">Aucun point à répartir</string>
-  <string name="points_to_allocate" formatted="false">%d points à répartir</string>
+  <string name="points_to_allocate">%d points à répartir</string>
   <string name="distribute_evenly_help">Assigner le même nombre de point à chaque attribut.</string>
   <string name="distribute_class_help">Assigner plus de points aux attributs importants pour votre classe.</string>
   <string name="distribute_task_help">Assigner les points en fonction des catégories de force, intelligence, constitution et perception associées aux tâches que vous réalisez.</string>
@@ -694,9 +561,7 @@
   <string name="classless">Sans classe</string>
   <string name="class_equipment_shop_dialog">Cet objet n\'est disponible que pour une classe spécifique.\nVous pouvez changer de classe depuis les paramètres.</string>
   <string name="class_gear_disclaimer">Vous ne pouvez acheter de l\'équipement que pour votre classe actuelle</string>
-  <string name="available_stats" formatted="false">%d points</string>
-  <string name="toogle_emojis">Activer les émojis</string>
-  <string name="tavern_description">Bienvenu à l\'auberge ! Prenez une chaise pour vous joindre à la conversation, ou faite une pause de vos tâches.</string>
+    <string name="tavern_description">Bienvenu à l\'auberge ! Prenez une chaise pour vous joindre à la conversation, ou faite une pause de vos tâches.</string>
   <string name="check_into_inn">Se reposer à l\'auberge</string>
   <string name="community_guidelines">Règles de vie en communauté</string>
   <string name="view_community_guidelines">Voir les règles de vie en communauté</string>
@@ -710,19 +575,13 @@
   <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
   <string name="navigation_drawer_close">Fermer le volet de navigation</string>
   <string name="world_boss">Boss mondial</string>
-  <string name="world_boss_art">Représentation du boss</string>
-  <string name="boss_art">Représentation du boss</string>
+    <string name="boss_art">Représentation du boss</string>
   <string name="world_boss_description">Description du boss mondial</string>
-  <string name="rage_strike_count" formatted="false">Attaques de rage : %d/%d</string>
-  <string name="pending_strike_description">Cette attaque n\'a pas encore eu lieu !\nLe boss mondial se déchaînera et attaquera un de nos bons commerçants lorsque sa jauge de rage sera remplie. Restez à jour avec vos quotidiennes pour empêcher que cela se produise !</string>
-  <string name="pending_strike_title">Attaque en cours</string>
+  <string name="rage_strike_count">Attaques de rage : %d/%d</string>
+    <string name="pending_strike_title">Attaque en cours</string>
   <string name="strike_description_title">Qu\'est-ce qu\'une attaque de rage ?</string>
-  <string name="strike_description_subtitle">Il y a potentiellement 3 attaques de rage</string>
-  <string name="strike_description_description">La jauge se remplit lorsque quelqu\'un rate ses quotidiennes. Si la jauge est pleine, la Décœurageante lancera son attaque Coup de cœur fracassant sur un des commerçants d\'Habitica, alors faites attention à bien réaliser vos tâches !</string>
-  <string name="pending_strike_subtitle">Cette attaque n\'a pas encore eu lieu !</string>
-  <string name="strike_active_title" formatted="false">%s a été attaqué !</string>
-  <string name="strike_active_subtitle" formatted="false">%s a reçu un coup de cœur !</string>
-  <string name="strike_active_description" formatted="false">Notre %s a eu le cœur brisé lorsque %s a fracassé %s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire !!</string>
+    <string name="strike_active_title">%s a été attaqué !</string>
+    <string name="strike_active_description">Notre %s a eu le cœur brisé lorsque %s a fracassé %s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire !!</string>
   <string name="questShop">Magasin de quêtes</string>
   <string name="market_owner_long">Alex le marchand</string>
   <string name="tavern_owner_long">Daniel l\'aubergiste</string>
@@ -732,33 +591,21 @@
   <string name="no_party_description">Partez en quête avec des amis ou en solitaire. combattez des monstres, créez des défis et rendez vous responsable dans une équipe.</string>
   <string name="no_party_title">Jouer à Habitica dans une équipe</string>
   <string name="join_party_description">Donnez le nom d\'utilisateur ci-dessous à un membre de l\'équipe pour pouvoir recevoir l\'invitation</string>
-  <string name="join_party_description_id">Donnez leur votre identifiant utilisateur ou faites leur scanner votre QR code pour vous inviter</string>
-  <string name="join_party_title">Vous voulez rejoindre une équipe ?</string>
-  <string name="create_party_website">Ouvrir le site pour créer une équipe</string>
-  <string name="id_copied">ID copié dans le presse-papier</string>
-  <string name="insufficientSubscriberGems">Vous avez acheté toutes les gemmes possibles de ce mois. D\'autres seront disponibles dans les trois premiers jours de chaque mois. Merci pour votre abonnement !</string>
-  <string name="insufficientSubscriberGemsTitle">Limite de gemmes mensuelle atteinte</string>
-  <string name="chat_message">Discussion</string>
-  <string name="world_boss_description_title">Qu\'est-ce qu\'un boss mondial ?</string>
-  <string name="world_boss_description_description">Un boss mondial est un événement spécial où toute la communauté travaille ensemble pour combattre avec ses tâches un puissant monstre !
-\nRéalisez vos tâches pour infliger des dégâts au boss.
-\nLe boss ne vous infligera pas de dégâts pour les tâches non réalisées, mais sa jauge de rage augmentera. Lorsque la barre se remplit, le boss attaquera l\'un des marchands !
-\nVous pouvez continuer à faire vos quêtes de boss habituelles, vos dégâts s\'appliqueront aux deux
-\nVisitez la taverne pour voir l\'avancée du combat et la jauge de rage</string>
-  <string name="world_boss_description_intro">Un boss mondial est un événement spécial où toute la communauté travaille ensemble pour combattre avec ses tâches un puissant monstre !</string>
+    <string name="join_party_title">Vous voulez rejoindre une équipe ?</string>
+    <string name="insufficientSubscriberGems">Vous avez acheté toutes les gemmes possibles de ce mois. D\'autres seront disponibles dans les trois premiers jours de chaque mois. Merci pour votre abonnement !</string>
+    <string name="world_boss_description_title">Qu\'est-ce qu\'un boss mondial ?</string>
+    <string name="world_boss_description_intro">Un boss mondial est un événement spécial où toute la communauté travaille ensemble pour combattre avec ses tâches un puissant monstre !</string>
   <string name="world_boss_description_1">Réalisez vos tâches pour infliger des dégâts au boss</string>
   <string name="world_boss_description_2">Le boss ne vous infligera pas de dégâts pour les tâches non réalisées, mais sa jauge de rage augmentera. Si la barre se remplit, le boss attaquera l\'un des marchands !</string>
   <string name="world_boss_description_3">Vous pouvez continuer à faire vos quêtes de boss habituelles, vos dégâts s\'appliqueront aux deux</string>
   <string name="world_boss_description_4">Visitez la taverne pour voir l\'avancée du combat et la jauge de rage</string>
-  <string name="world_boss_action_prompt" formatted="false">Combattez le boss pour obtenir une récompense spéciale et sauver Habitica de la terreur de %s !</string>
-  <string name="world_boss_description_subtitle">%s attaque !</string>
-  <string name="questShop_owner_long">Ian le guide des quêtes</string>
+  <string name="world_boss_action_prompt">Combattez le boss pour obtenir une récompense spéciale et sauver Habitica de la terreur de %s !</string>
+    <string name="questShop_owner_long">Ian le guide des quêtes</string>
   <string name="seasonalShop_owner_long">Sorcière saisonnière</string>
   <string name="rage_attack">Attaque de rage :</string>
   <string name="tavern_description_world_boss">Oh, ne faites pas attention au monstre ci-dessous -- c\'est toujours un endroit sûr pour discuter pendant vos pauses.</string>
   <string name="report">Signaler</string>
-  <string name="like">Apprécier</string>
-  <string name="reply">Répondre</string>
+    <string name="reply">Répondre</string>
   <string name="challenge_prize">Récompense du défi</string>
   <string name="challenge_categories">Catégories du défi</string>
   <string name="created_challenge">Défi créé</string>
@@ -792,17 +639,15 @@
   <string name="two_handed">Deux mains</string>
   <string name="usernamePromptTitle">Il est temps de choisir votre nom d\'utilisateur !</string>
   <string name="usernamePromptBody">Les noms de connexion sont maintenant uniques, seront visibles à côté de votre nom affiché, et seront utilisés pour les invitations, les @mentions et les discussions.</string>
-  <string name="usernamePromptWiki">Si vous souhaitez en savoir plus sur ce changement, <a href="https://habitica.wikia.com/wiki/Player_Names">visitez notre wiki.</a></string>
-  <string name="confirmUsername">Confirmer le Nom d\'Utilisateur</string>
-  <string name="usernamePromptDisclaimer">Les Noms d\'Utilisateurs doivent respecter nos <a href="https://habitica.com/static/terms">Conditions d\'Utilisation</a> et nos <a href="https://habitica.com/static/community-guidelines">règles de vie en communauté</a>. Si vous n\'avez pas choisi un pseudo de connexion précédemment, votre nom d\'utilisateur a été généré automatiquement.</string>
+  <string name="usernamePromptWiki">Si vous souhaitez en savoir plus sur ce changement, <a href="https://habitica.wikia_com/wiki/Player_Names">visitez notre wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Les Noms d\'Utilisateurs doivent respecter nos <a href="https://habitica.com/static/terms">Conditions d\'Utilisation</a> et nos <a href="https://habitica_com/static/community-guidelines">règles de vie en communauté</a>. Si vous n\'avez pas choisi un pseudo de connexion précédemment, votre nom d\'utilisateur a été généré automatiquement.</string>
   <string name="confirm_username_title">Êtes-vous sûr(e) de vouloir confirmer votre nom d\'utilisateur actuel ?</string>
   <string name="confirm_username_description">Confirmer votre nom d\'utilisateur le rendra public pour les invitations, les @mentions et les messages. Vous pouvez changer votre nom d\'utilisateur depuis les paramètres à n\'importe quel moment.</string>
   <string name="cancel">Annuler</string>
   <string name="confirm_username">Confirmer le Nom d\'Utilisateur</string>
   <string name="username_not_confirmed">Nom d\'Utilisateur non confirmé</string>
   <string name="username_confirmed">Nom d\'utilisateur confirmé</string>
-  <string name="username_level">\@%s ・Niv %d</string>
-  <string name="enter_recipient_username">Entrez le @ nom d\'utilisateur du destinataire</string>
+    <string name="enter_recipient_username">Entrez le @ nom d\'utilisateur du destinataire</string>
   <string name="username_copied">Nom d\'utilisateur copié dans le presse papier</string>
   <string name="verification_pet">Un de ces Familiers Vétérans vous attendra une fois la confirmation effectuée !</string>
   <string name="welcomeNameTitle">Comment devrions-nous vous appeler \?</string>
@@ -849,82 +694,4 @@
   <string name="invited_to_private_guild"><![CDATA[Vous avez reçu une invitation à rejoindre la guilde privée <b>%1$s</b>]]></string>
   <string name="invited_to_public_guild"><![CDATA[Vous avez reçu une invitation à rejoindre la guilde <b>%1$s</b>]]></string>
   <string name="invited_to_quest"><![CDATA[On vous invite à rejoindre la quête <b>%1$s</b>]]></string>
-<string name="onwards">En avant !</string>
-
-    <string name="sectiondrop">Standard</string>
-    <string name="sectionpremium">Potion magique</string>
-    <string name="sectionquest">Quête</string>
-    <string name="sectionspecial">Spécial</string>
-    <string name="sectionwacky">Farfelus</string>
-    <string name="x_months">%d mois</string>
-    <string name="insufficientGoldTitle">Pas assez d\'Or</string>
-    <string name="join_party_description_guild">Donnez le nom d\'utilisateur ci-dessous à un ami ou rendez vous sur %s pour rencontrer des camarades !</string>
-    <string name="defeat">Vaincre</string>
-    <string name="add_local_authentication">Ajouter l\'authentification locale</string>
-    <string name="task_title">Titre de la tâche</string>
-
-    <string name="old_password">Ancien mot de passe</string>
-    <string name="new_password">Nouveau mot de passe</string>
-    <string name="new_password_repeat">Ré-entrez le nouveau mot de passe</string>
-    <string name="adjust_streak">Ajuster le combo</string>
-    <string name="password_changed">Mot de passe changé avec succès</string>
-    <string name="assigned_stat">Attribut assigné</string>
-    <string name="monthly">Mensuel</string>
-    <string name="weekly">Hebdomadaire</string>
-    <string name="repeats">Se répète</string>
-    <string name="every">Tous les</string>
-    <string name="scheduling">Planification</string>
-    <string name="days">Jours</string>
-    <string name="weeks">Semaines</string>
-    <string name="years">Années</string>
-    <string name="checklist_text">Texte de liste</string>
-    <string name="new_reminder">Nouveau rappel</string>
-    <string name="streak">Combo</string>
-    <string name="update_available">Mise à jour disponible : %1$s (%2$d)</string>
-    <string name="need_help_header_description">Publiez un message sur %s pour obtenir réponse à vos questions.</string>
-    <string name="need_more_help">Besoin d\'un peu plus d\'aide \?</string>
-    <string name="become_x">Devenez un %s</string>
-    <string name="x_class">Classe %s</string>
-    <string name="report_explanation">Ne signalez **que** les messages qui enfreignent les [règles de vie en communauté](https://habitica.com/static/community-guidelines) et/ou les [conditions de service](https://habitica.com/static/terms). Signaler des messages de façon inadéquate pourrait vous valoir une infraction.</string>
-    <string name="report_message_title">Signaler %s pour violation :</string>
-    <string name="reason_for_report">Motif du signalement (optionnel)</string>
-    <string name="mystery_sets">Ensembles mystère</string>
-    <string name="guild_description">Description de la guilde</string>
-    <string name="invite_to_guild">Inviter dans la guilde</string>
-    <string name="join_guild">Rejoindre la guilde</string>
-    <string name="garden">Botanique</string>
-    <string name="i_agree_to_follow_the_guidelines">J\'accepte de suivre les règles</string>
-    <string name="report_violation">Signaler une infraction</string>
-    <string name="trillion_abbrev">t</string>
-    <string name="leave_guild">Quitter la guilde</string>
-    <string name="left_guild">Vous avez quitté la guilde</string>
-    <string name="joined_guild">Vous avez rejoint la guilde</string>
-    <string name="cost">Prix</string>
-    <string name="setup_task_habit_1">Ajoutez une tâche à Habitica</string>
-    <string name="setup_task_habit_1_notes">Soit une habitude, soit une Quotidienne ou encore une tâche À faire</string>
-    <string name="setup_task_habit_2">Cliquez ici pour éditer ceci en une mauvaise habitude que vous voudriez perdre</string>
-    <string name="setup_task_habit_2_notes">ou supprimez ceci depuis la fenêtre d\'édition</string>
-    <string name="guild_summary">Description de la guilde</string>
-    <string name="guild_members">Membres de la guilde</string>
-    <string name="guild_bank">Banque de la guilde</string>
-    <string name="invite_to_party">Inviter dans l\'équipe</string>
-    <string name="are_you_sure">Confirmez-vous \?</string>
-    <string name="delete_task">Supprimer la tâche</string>
-    <string name="not_now">Pas maintenant</string>
-    <string name="levelup_detail_10">Choisissez une classe qui correspond à votre style de jeu, et débloquez des compétences et des armures pour vous aider dans votre aventure</string>
-    <string name="levelup_title_10">Le système de classe est débloqué !</string>
-    <string name="pin">Épingler</string>
-    <string name="unpin">Des-épingler</string>
-    <string name="take_me_back">Revenir en arrière</string>
-    <string name="sidebar_achievements">Succès</string>
-    <string name="basic_achievements">Succès de base</string>
-    <string name="seasonal_achievements">Succès saisonniers</string>
-    <string name="special_achievements">Succès exceptionnels</string>
-    <string name="switch_to_list_view">Changer en vue par liste</string>
-    <string name="switch_to_grid_view">Changer en vue par grille</string>
-    <string name="confirm_deletion">Confirmer la suppression</string>
-    <string name="new_task">Nouvelle tâche</string>
-    <string name="create_task">Créer %s</string>
-    <string name="details">Détails</string>
-    <string name="share_challenge_with">Partager le défi avec</string>
 </resources>
diff --git a/Habitica/res/values-hi/strings.xml b/Habitica/res/values-hi/strings.xml
new file mode 100755
index 000000000..71fa9f073
--- /dev/null
+++ b/Habitica/res/values-hi/strings.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">ताज़ा करें</string>
+  <string name="XP_default">अनुभव</string>
+  <string name="HP_default">स्वास्थ्य</string>
+  <string name="MP_default">माना</string>
+  <string name="ERR_pb_barcode">बारकोड से प्राथमिकताओं को लोड नहीं किया जा सका</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">परिस्थितियां</string>
+  <string name="SP_address_hint">आपका अनुकूलित परिसेवक</string>
+  <string name="SP_userID_title">उपयोगकर्ता आईडी</string>
+  <string name="SP_userID_summary">आपकी उपयोगकर्ता आईडी</string>
+  <string name="SP_APIToken_title">एपीआई टोकन</string>
+  <string name="SP_APIToken_summary">आपका एपीआई टोकन</string>
+  <string name="Language_title">भाषा</string>
+  <string name="Language_summary">हैबीटिका की भाषा बदलें</string>
+  <string name="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>
+  <!--Adding tasks-->
+  <!--Network Errors-->
+  <!--QR Strings-->
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-hr-rHR/strings.profile.xml b/Habitica/res/values-hr-rHR/strings.profile.xml
index 2c5685c8a..29b59cc00 100644
--- a/Habitica/res/values-hr-rHR/strings.profile.xml
+++ b/Habitica/res/values-hr-rHR/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Bonus klase</string>
     <string name="profile_allocated">Raspodijeljeno:</string>
-    <string name="profile_boosts">Ojačanja:</string>
     <string name="profile_private_message">Privatna poruka</string>
     <string name="profile_achievements">Postignuća</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Zatvori</string>
 
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.sidebar.xml b/Habitica/res/values-hr-rHR/strings.sidebar.xml
index ef42b6fef..fa0ad28d0 100644
--- a/Habitica/res/values-hr-rHR/strings.sidebar.xml
+++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Zadaci</string>
-  <string name="sidebar.skills">Vještine</string>
-  <string name="sidebar.section.social">Društvo</string>
-  <string name="sidebar.inbox">Poruke</string>
-  <string name="sidebar.tavern">Krčma</string>
-  <string name="sidebar.party">Družina</string>
-  <string name="sidebar.purchaseGems">Dragulji &amp; Pretplata</string>
-  <string name="sidebar.guilds">Cehovi</string>
-  <string name="sidebar.challenges">Izazovi</string>
-  <string name="sidebar.section.inventory">Inventar</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Oprema</string>
-  <string name="sidebar.stable">Štala</string>
-  <string name="sidebar.news">Vijesti</string>
-  <string name="sidebar.settings">Postavke</string>
-  <string name="sidebar.about">O nama</string>
+  <string name="sidebar_tasks">Zadaci</string>
+  <string name="sidebar_skills">Vještine</string>
+  <string name="sidebar_section_social">Društvo</string>
+  <string name="sidebar_inbox">Poruke</string>
+  <string name="sidebar_tavern">Krčma</string>
+  <string name="sidebar_party">Družina</string>
+  <string name="sidebar_purchaseGems">Dragulji &amp; Pretplata</string>
+  <string name="sidebar_guilds">Cehovi</string>
+  <string name="sidebar_challenges">Izazovi</string>
+  <string name="sidebar_section_inventory">Inventar</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Oprema</string>
+  <string name="sidebar_stable">Štala</string>
+  <string name="sidebar_news">Vijesti</string>
+    <string name="sidebar_about">O nama</string>
   <string name="sidebar_shops">Dućani</string>
   <string name="sidebar_stats">Statistika</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.tutorial.xml b/Habitica/res/values-hr-rHR/strings.tutorial.xml
index 4eabd7926..78477e40c 100644
--- a/Habitica/res/values-hr-rHR/strings.tutorial.xml
+++ b/Habitica/res/values-hr-rHR/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Kupuj opremu za svoj avatar zlatnicima koje zaradiš!</string>
   <string name="tutorial_rewards_2">Također možeš stvarati stvarne Prilagođene Nagrade na osnovu onog što te motivira.</string>
   <string name="tutorial_tasks_complete">To je to za sada. Ako ti treba podsjetnik, pogledaj odjeljak Često postavljenih pitanja.</string>
-  <string name="tutorial_equipment">Kada kupiš opremu, pojavi se ovdje. Tvoja Ratna oprema utječe na tvoje statistike, a tvoj kostim (ako je omogućen) utječe na ono što tvoj avatar nosi.</string>
-  <string name="tutorial_items">Zaradi predmete izvršavanjem zadataka i podizanjem levela. Klikni na predmet da ga iskoristiš!</string>
-  <string name="tutorial_pets">Kako izvršavaš zadatke u stvarnom svijetu, tako imaš nasumičnu šansu za pronalazak jaja i napitaka. Kombiniraj ih kako bi izlegao/la ljubimce.</string>
-  <string name="tutorial_skills">Vještine su posebne sposobnosti koje imaju jake učinke! Klikni na sposobnost kako bi ju iskoristio/la. Koštat će te mane (plava traka), koju zaradiš prijavljujući se svaki dan i izvršavajući svoje zadatke u stvarnom životu. Provjeri Često Postavljena Pitanja u meniju za više informacija!</string>
+    <string name="tutorial_skills">Vještine su posebne sposobnosti koje imaju jake učinke! Klikni na sposobnost kako bi ju iskoristio/la. Koštat će te mane (plava traka), koju zaradiš prijavljujući se svaki dan i izvršavajući svoje zadatke u stvarnom životu. Provjeri Često Postavljena Pitanja u meniju za više informacija!</string>
   <string name="tutorial_party">Ovo je mjesto gdje se ti i tvoji prijatelji možete držati svojih ciljeva i boriti protiv čudovišta pomoću svojih zadataka!</string>
   <string name="tutorial_tavern">Dobrodošao/la u Krčmu, javni chat za ljude svih dobi! Ovdje možeš razgovarati o produktivnosti i postavljati pitanja. Zabavi se!</string>
-  <string name="tutorial_classes">OdmetnikOdmetnikIzaberi hoćeš li postati Ratnik, Čarobnjak, Iscjelitelj ili Lupež! Svaka klasa ima jedinstvenu opremu i vještine. Klikni na (?) da bi saznao/la više!</string>
-  <string name="tutorial_stats">Klikni na sivi gumb kako bi raspodijelio/la mnoštvo svojih statističkih bodova odjednom, ili klikni na strelice kako bi ih dodavao/la jednog po jednog.</string>
+    <string name="tutorial_stats">Klikni na sivi gumb kako bi raspodijelio/la mnoštvo svojih statističkih bodova odjednom, ili klikni na strelice kako bi ih dodavao/la jednog po jednog.</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 4f52b1c7a..bf0e98564 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Iskustvo</string>
   <string name="HP_default">Zdravlje</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Opcije nisu mogle biti učitane iz barkoda</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Postavke</string>
-  <string name="SP_address_hint">Tvoj prilagođeni server</string>
-  <string name="SP_userID_title">Korisnikov ID</string>
+    <string name="SP_userID_title">Korisnikov ID</string>
   <string name="SP_userID_summary">Tvoj Korisnički ID</string>
   <string name="SP_APIToken_title">SPA token</string>
   <string name="SP_APIToken_summary">Tvoj SPA token</string>
   <string name="Language_title">Jezik</string>
   <string name="Language_summary">Promijeni jezik na Habitici</string>
-  <string name="SP_user_qr_code">Tvoj QR kod</string>
-  <string name="PS_contact_title">Kontaktiraj me</string>
-  <string name="unknown_error">Došlo je do greške...</string>
-  <string name="pref_account_header">Račun</string>
+    <string name="PS_contact_title">Kontaktiraj me</string>
+    <string name="pref_account_header">Račun</string>
   <string name="pref_first_day_of_the_week_title">Prvi dan u tjednu</string>
   <string name="pref_first_day_of_the_week_summary">Prvi dan u tjednu u svim kalendarima</string>
   <string name="pref_reminder_header">Dnevni podsjetnik</string>
   <string name="pref_reminder_checkbox">Aktiviraj podsjetnik</string>
   <string name="pref_reminder_picker">Postavi vrijeme podsjetnika</string>
   <string name="pref_cds_header">Prilagođeni početak dana</string>
-  <string name="pref_cds_picker">Postavi vrijeme Prilagođenog početka dana</string>
-  <string name="pref_push_notifications_checkbox">Push notifikacije korisnika</string>
+    <string name="pref_push_notifications_checkbox">Push notifikacije korisnika</string>
   <string name="push_notifications">Push notifikacije</string>
   <string name="push_notifications_sum">Uredi postavke svojih push notifikacija</string>
   <string name="preference_push_you_won_challenge">Pobijedio/la si u Izazovu!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Tvoja Pustolovina je započela</string>
   <string name="preference_push_invited_to_quest">Pozvan/a na Pustolovinu</string>
   <!--Adding tasks-->
-  <string name="task_value">Vrijednost</string>
-  <string name="new_todo">Novi Zadatak</string>
-  <string name="new_reward">Nova Nagrada</string>
-  <string name="new_daily">Novi Svakodnevni zadatak</string>
-  <string name="new_habit">Nova Navika</string>
-  <string name="action_edit">Uredi</string>
-  <string name="action_delete">Izbriši</string>
-  <string name="action_cancel">Otkaži</string>
+    <string name="action_edit">Uredi</string>
+    <string name="action_cancel">Otkaži</string>
   <string name="login_btn">Prijavi se</string>
   <string name="register_btn">Registriraj se</string>
   <string name="username">Korisničko ime</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Potvrdi lozinku</string>
   <string name="logout">Odjavi se</string>
   <string name="logout_description">Odjavi se iz svog računa</string>
-  <string name="account_details">Detalji o računu</string>
-  <string name="LoginActivityName">Dobrodošao/la</string>
-  <string name="string_revive">Oživi</string>
-  <string name="please_connect">Molimo te da se spojiš putem aplikacije prije korištenja widgeta</string>
-  <string name="about.title">O nama</string>
-  <string name="about.libraries">Knjižnice</string>
-  <string name="about.versionhistory">Povijest verzija</string>
-  <string name="about.habitica_open_source">Habitica je dostupna u obliku otvorenog izvora na Githubu</string>
-  <string name="about.rate_our_app">Ocijeni našu Aplikaciju</string>
-  <string name="about.give_us_feedback">Pošalji nam povratnu informaciju!</string>
-  <string name="about.bugreport">Prijavi grešku</string>
-  <string name="about.source_code">Izvorni kod</string>
-  <string name="repeatEvery">Ponavljaj svaka/ih</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Greška u povezivanju</string>
-  <string name="network_error_no_network_body">Niste spojeni na Internet.</string>
-  <string name="internal_error_api">Čini se da postoji problem sa serverom. Pokušaj ponovno kasnije.</string>
+    <string name="LoginActivityName">Dobrodošao/la</string>
+    <string name="about_title">O nama</string>
+  <string name="about_libraries">Knjižnice</string>
+    <string name="about_habitica_open_source">Habitica je dostupna u obliku otvorenog izvora na Githubu</string>
+  <string name="about_rate_our_app">Ocijeni našu Aplikaciju</string>
+  <string name="about_give_us_feedback">Pošalji nam povratnu informaciju!</string>
+  <string name="about_bugreport">Prijavi grešku</string>
+  <string name="about_source_code">Izvorni kod</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Čini se da postoji problem sa serverom. Pokušaj ponovno kasnije.</string>
   <string name="authentication_error_title">Greška u provjeri autentičnosti</string>
-  <string name="authentication_error_body">Tvoje Korisničko ime i/ili Lozinku nisu ispravni.</string>
-  <string name="login_validation_error_title">Greška provjere valjanosti</string>
+    <string name="login_validation_error_title">Greška provjere valjanosti</string>
   <string name="login_validation_error_fieldsmissing">Morate ispuniti sva polja.</string>
   <string name="save_changes">Spremi</string>
   <string name="copy">Kopiraj</string>
   <string name="notes">Bilješke</string>
-  <string name="text">Tekst</string>
-  <string name="difficulty">Težina</string>
+    <string name="difficulty">Težina</string>
   <string name="tags">Oznake</string>
   <string name="trivial">Jako lagano</string>
   <string name="easy">Lagano</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativno ( - )</string>
   <string name="checklist">Lista</string>
   <string name="reminders">Podsjetnici</string>
-  <string name="actions">Radnje</string>
-  <string name="attributes">Atributi</string>
-  <string name="physical">Snaga</string>
-  <string name="mental">Inteligencija</string>
-  <string name="social">Konstitucija</string>
-  <string name="other">Percepcija</string>
-  <string name="frequency">Učestalost</string>
-  <string name="frequency_weekly">Na određene dane u tjednu</string>
-  <string name="frequency_daily">Svakih X dana</string>
-  <string name="repeatables_summary_title">Sažetak</string>
-  <string name="repeatables_title">Ponavlja se</string>
-  <string name="repeatables_on_title">Ponavlja se na</string>
-  <string name="repeatables_frequency_daily">Dnevno</string>
+    <string name="attributes">Atributi</string>
+    <string name="repeatables_frequency_daily">Dnevno</string>
   <string name="repeatables_frequency_weekly">Tjedno</string>
   <string name="repeatables_frequency_monthly">Mjesečno</string>
   <string name="repeatables_frequency_yearly">Godišnje</string>
@@ -125,24 +94,15 @@
  
  </string>
   <string name="filter">Filtriraj</string>
-  <string name="profile_image">Profilna slika</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Upotrijebio/la si %1$s za %2$d mane.</string>
-  <string name="used_skill_without_mana">Upotrijebio/la si %1$s.</string>
+    <string name="used_skill_without_mana">Upotrijebio/la si %1$s.</string>
   <string name="new_checklist_item">Nova stavka na listi</string>
-  <string name="add_checklist_item">Dodaj</string>
-  <string name="reminder_title">Ne zaboravi prekrižiti svoje zadatke</string>
-  <string name="skill_progress_title">Koristi Vještinu</string>
-  <string name="coming_soon">Dolazi uskoro</string>
-  <string name="chat_flag_confirmation">Jesi li sugran/na da želiš prijaviti ovu poruku kao neprikladnu?</string>
-  <string name="flag_confirm">Označi poruku zastavom</string>
-  <string name="unlock_lvl_11">Otključava se na levelu 11</string>
-  <string name="no_party_message">Nisi u Družini. Kako bi se pridružio/la nekoj družini, podsjeti našu web stranicu.</string>
-  <string name="forgot_pw_btn">Zaboravio/la sam lozinku</string>
-  <string name="tavern.inn.checkOut">Reaktiviraj svoje Svakodnevne zadatke</string>
-  <string name="tavern.inn.rest">Pauziraj svoje Svakodnevne zadatke</string>
-  <string name="reward.dialog.buy">Kupi</string>
-  <string name="reward.dialog.dismiss">Zanemari</string>
+    <string name="reminder_title">Ne zaboravi prekrižiti svoje zadatke</string>
+    <string name="unlock_lvl_11">Otključava se na levelu 11</string>
+    <string name="forgot_pw_btn">Zaboravio/la sam lozinku</string>
+  <string name="tavern_inn_checkOut">Reaktiviraj svoje Svakodnevne zadatke</string>
+  <string name="tavern_inn_rest">Pauziraj svoje Svakodnevne zadatke</string>
+  <string name="reward_dialog_buy">Kupi</string>
+  <string name="reward_dialog_dismiss">Zanemari</string>
   <string name="party">Družina</string>
   <string name="chat">Chat</string>
   <string name="members">Članovi</string>
@@ -150,24 +110,20 @@
   <string name="dailies">Svakodnevni zadaci</string>
   <string name="todos">Zadaci</string>
   <string name="rewards">Nagrade </string>
-  <string name="taskform.delete.title">Jesi li siguran/na?</string>
-  <string name="taskform.delete.message">Želite li ovo stvarno izbrisati?</string>
-  <string name="yes">Da</string>
+    <string name="yes">Da</string>
   <string name="no">Ne</string>
   <string name="quest">Pustolovina</string>
   <string name="avatar_body">Tijelo</string>
   <string name="avatar_hair">Kosa</string>
   <string name="avatar_shirt">Majica</string>
   <string name="avatar_skin">Koža</string>
-  <string name="avatar_ears">Životinjske uši</string>
-  <string name="avatar_base">Baza</string>
+    <string name="avatar_base">Baza</string>
   <string name="avatar_color">Boja</string>
   <string name="avatar_beard">Brada</string>
   <string name="avatar_mustache">Brkovi</string>
   <string name="avatar_flower">Cvijet</string>
   <string name="avatar_bangs">Šiške</string>
-  <string name="avatar_nothing">Ništa nije postavljeno</string>
-  <string name="avatar_size">Veličina</string>
+    <string name="avatar_size">Veličina</string>
   <string name="avatar_size_slim">Vitko</string>
   <string name="avatar_size_broad">Široko</string>
   <string name="avatar_background">Pozadina</string>
@@ -176,23 +132,17 @@
   <string name="purchase_button">Kupi</string>
   <string name="purchase_set_title">Kupi set %s</string>
   <string name="due_date">Rok</string>
-  <string name="quest.accept">Prihvati </string>
-  <string name="quest.reject">Odbij</string>
-  <string name="quest.begin">Započni Pustolovinu</string>
-  <string name="quest.cancel">Otkaži Poziv</string>
-  <string name="quest.abort">Otkaži Pustolovinu</string>
-  <string name="quest.leave">Napusti Pustolovinu</string>
-  <string name="quest.pending">Čeka se</string>
-  <string name="quest.accepted">Prihvaćeno</string>
-  <string name="quest.rejected">Odbijeno</string>
-  <string name="quest.participants">Sudionici </string>
-  <string name="version_info">Verzija %1$s (%2$d)</string>
+  <string name="quest_accept">Prihvati </string>
+  <string name="quest_reject">Odbij</string>
+  <string name="quest_begin">Započni Pustolovinu</string>
+  <string name="quest_cancel">Otkaži Poziv</string>
+  <string name="quest_abort">Otkaži Pustolovinu</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>
   <string name="intro_1_subtitle">Dobrodošao/la na</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Vrijeme je za zabavljati se dok obavljaš stvari! Pridruži se preko %s ljudi koji poboljšavaju svoj život jednim po jednim zadatkom.</string>
+    <string name="intro_1_description">Vrijeme je za zabavljati se dok obavljaš stvari! Pridruži se preko %s ljudi koji poboljšavaju svoj život jednim po jednim zadatkom.</string>
   <string name="intro_2_subtitle">Napredak u igri</string>
   <string name="intro_2_title">Napredak u životu</string>
   <string name="intro_2_description">Otključaj mogućnosti u igri obavljanjem zadataka u stvarnom životu. Zaradi ratnu opremu, ljubimce i još mnogo toga kao nagrade za postizanje svojih ciljeva.</string>
@@ -200,12 +150,9 @@
   <string name="intro_3_title">Postani društven/a</string>
   <string name="intro_3_description">Postiži svoje ciljeve prema planu uz pomoć prijatelja. Podržavajte se međusobno u životu kao u bitci i tako napredujte zajedno!</string>
   <string name="intro_finish_button">Počnimo!</string>
-  <string name="previous_button">Prijašnje</string>
-  <string name="next_button">Sljedeće</string>
+    <string name="next_button">Sljedeće</string>
   <string name="skip_button">Preskoči</string>
-  <string name="setup_welcome_description">Dobrodošao/la u Habiticu, gdje će napredak u igri poboljšati tvoj stvarni život! Kako postižeš ciljeve u stvarnom svijetu, otključavat ćeš opremu, ljubimce, pustolovine i još mnogo toga.</string>
-  <string name="setup_welcome_title">Dobrodošao/la</string>
-  <string name="avatar_setup_description">Onda, kako bi htio/la izgledati? Ne boj se, ovo možeš mijenjati kasnije.</string>
+    <string name="avatar_setup_description">Onda, kako bi htio/la izgledati? Ne boj se, ovo možeš mijenjati kasnije.</string>
   <string name="task_setup_description">Odlično! Sad, na čemu želiiš raditi tijekom ovog putovanja?</string>
   <string name="setup_group_work">Posao</string>
   <string name="setup_group_exercise">Tjelovježba</string>
@@ -235,29 +182,20 @@
   <string name="setup_task_creativity_1">Uči od majstora vještine</string>
   <string name="setup_task_creativity_2">Radi na kreativnom projektu </string>
   <string name="setup_task_creativity_3">Završi kreativni projekt</string>
-  <string name="gem.purchase.support">Želiš nam pomoći u održavanju Habitice? Možeš podržati razvojne programere kupujući dragulje!\n\nDragulji ti omogućuju kupovinu zabavnih dodataka za tvoj račun, uključujući: \n\n - Kul kostime za tvog avatara\n - Zakon pozadine\n - Zabavne pustolovine koje te nagrađuju jajima ljubimaca\n - Sposobnost da promijeniš klasu prije levela 100\n\nHvala ti puno što pomažeš da Habiticu učinimo najboljom što može biti. Tvoja potpora nam znači puno!</string>
-  <string name="my_guilds">Moji Cehovi</string>
+    <string name="my_guilds">Moji Cehovi</string>
   <string name="public_guilds">Javni Cehovi</string>
   <string name="guild">Ceh</string>
   <string name="leave">Napusti</string>
   <string name="join">Pridruži se</string>
-  <string name="leader">Vođa</string>
-  <string name="gems">Dragulji</string>
-  <string name="copy_as_todo">Kopiraj kao Zadatak</string>
-  <string name="send_pm">Pošalji privatnu poruku</string>
-  <string name="flag">Označi zastavom</string>
-  <string name="delete">Izbriši</string>
+    <string name="gems">Dragulji</string>
+    <string name="delete">Izbriši</string>
   <string name="name">Ime</string>
   <string name="description">Opis</string>
   <string name="add_tag">Dodaj novu oznaku</string>
   <string name="privacy">Privatnost </string>
   <string name="write_message">Napiši poruku</string>
-  <string name="post">Objavi</string>
-  <string name="guild_search_hint">Pretraži cehove</string>
-  <string name="todo_due">Rok: %s</string>
-  <string name="daily_streak">trenutni niz: %d</string>
-  <string name="todo_has_duedate">Zadatak ima rok</string>
-  <string name="battle_gear">Borbena Oprema</string>
+    <string name="guild_search_hint">Pretraži cehove</string>
+    <string name="battle_gear">Borbena Oprema</string>
   <string name="costume">Kostim</string>
   <string name="outfit_head">Glava</string>
   <string name="outfit_headAccessory">Dodatak za glavu</string>
@@ -270,10 +208,8 @@
   <string name="wear_costume">Nosi Kostim </string>
   <string name="equipped">Opremljeno</string>
   <string name="quest_cancel_message">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Svi prihvaćeni pozivi će biti izgubljeni. Vlasnik pustolovine će zadržati pustolovni svitak u svom posjedu.</string>
-  <string name="quest.invitation">Poziv u Pustolovinu</string>
-  <string name="quest_begin_message">Jesi li siguran/na? Samo %1$d od ukupno %2$d članova tvoje družine se pridružilo ovoj pustolovini! Pustolovine počinju automatski kad su se svi igrači pridružili ili pak odbili poziv.</string>
-  <string name="quest.invitation.text">Pozvan/a si za sudjelovanje u pustolovini!</string>
-  <string name="ago_1day">Prije 1 d</string>
+    <string name="quest_begin_message">Jesi li siguran/na? Samo %1$d od ukupno %2$d članova tvoje družine se pridružilo ovoj pustolovini! Pustolovine počinju automatski kad su se svi igrači pridružili ili pak odbili poziv.</string>
+    <string name="ago_1day">Prije 1 d</string>
   <string name="ago_days">Prije %d d</string>
   <string name="ago_1Minute">Prije 1 m</string>
   <string name="ago_minutes">Prije %d m</string>
@@ -290,13 +226,9 @@
   <string name="armoireEquipment">Našao/la si komad rijetke Opreme u Ormaru: %s! Zakon!</string>
   <string name="armoireFood">Pretražuješ po ormaru i nađeš %1$s %2$s. Što to radi tu?</string>
   <string name="armoireExp">Hrvaš se s ormarom i dobivaš na iskustvu. Neka mu!</string>
-  <string name="armoireNotesFull">Otvori Ormar kako bi nasumično dobio/la posebnu Opremu, Iskustvo, ili hranu! Preostalo komada opreme: %d</string>
-  <string name="armoireLastItem">Našao si zadnji komad rijetke Opreme u Začaranom Ormaru.</string>
-  <string name="armoireNotesEmpty">Ormar će imati novu Opremu u prvom tjednu svakog mjeseca. Do tada, nastavi klikati za Iskustvo i Hranu!</string>
-  <string name="sell">Prodaj(%d Zlatnika) </string>
+    <string name="sell">Prodaj(%d Zlatnika) </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="hatch_egg">Izlegni s jajetom</string>
   <string name="invite_party">Pozovi družinu</string>
   <string name="dialog_feeding">Nahrani %s s:</string>
   <string name="use_animal">Koristi</string>
@@ -307,17 +239,8 @@
   <string name="close">Zatvori</string>
   <string name="share">Podijeli</string>
   <string name="notification_pet_fed">Nahranio/la si svoju/ga %s!</string>
-  <string name="notification_purchase">Kupio/la si %s</string>
-  <string name="notification_purchase_reward">Kupio/la si nagradu</string>
-  <string name="sectiondrop">Standardni</string>
-  <string name="sectionpremium">Čarobnih napitaka</string>
-  <string name="sectionquest">Pustolovni</string>
-  <string name="sectionspecial">Rijetki</string>
-  <string name="sectionmounts">Standardne</string>
-  <string name="sectionpremiumMounts">Čarobnih napitaka</string>
-  <string name="sectionquestMounts">Pustolovne</string>
-  <string name="sectionspecialMounts">Rijetke</string>
-  <string name="world_quest">Svjetska Pustolovina</string>
+    <string name="notification_purchase_reward">Kupio/la si nagradu</string>
+    <string name="world_quest">Svjetska Pustolovina</string>
   <string name="inn_description">Treba ti odmor? Prijavi se u Danijelovo Svratište kako bi pauzirao/la neke od težih mehaničkih aspekata igre:\n\n
 • Propušteni Svakodnevni zadaci ti neće nauditi\n
 • Zadacima se neće resetirati nizovi niti će im se pogoršati boja\n
@@ -336,8 +259,7 @@
   <string name="healer_description">Liječnici su zaštićeni od štetnih utjecaja i pružaju zaštitu tebi i drugima. Propušteni svakodnevni zadaci i loše navike ih ne uznemiravaju u tolikoj mjeri jer znaju kako nadoknaditi izgubljeno zdravlje. Igraj kao Iscjelitelj ako želite pomagati drugima u grupi ili ako te motivira ideja varanja Smrti marljivim radom!</string>
   <string name="select_class">Odaberi Klasu</string>
   <string name="opt_out_class">Izaberi kasnije</string>
-  <string name="opt_out_description">Ne da ti se baviti klasama? Želiš odabrati kasnije? I možeš odabrati kasnije - do tad ćeš biti Ratnik bez posebnih vještina. Možeš čitati o klasnom sustavu kasnije na wiki stranici Habitice i omogućiti klase bilo kada.</string>
-  <string name="class_confirmation">Jesi li siguran/na da želiš biti %s?</string>
+    <string name="class_confirmation">Jesi li siguran/na da želiš biti %s?</string>
   <string name="class_changed">Sada si %s!</string>
   <string name="class_changed_description">Imaš novu zadanu Ratnu Opremu koju možeš promijeniti pod Opremom!</string>
   <string name="choose_class">Odaberi Klasu </string>
@@ -351,23 +273,18 @@
   <string name="invite_existing_users">Pozovi postojeće korisnike</string>
   <string name="send">Pošalji</string>
   <string name="invite">Pozovi prijatelje</string>
-  <string name="invite_id_description">Ako već imaš prijatelje koji koriste Habiticu, pozovi ih preko Korisničkog ID-a ovdje.</string>
-  <string name="invite_username_description">Ako već imaš prijatelje koji koriste Habiticu, pozovi ih putem korisničkog imena ovdje.</string>
+    <string name="invite_username_description">Ako već imaš prijatelje koji koriste Habiticu, pozovi ih putem korisničkog imena ovdje.</string>
   <string name="invite_email_description">Ako se tvoj prijatelj pridruži Habitici preko tvog e-maila, onda će automatski biti pozvani u tvoju družinu!</string>
   <string name="add_invites">Dodaj Pozivnice</string>
-  <string name="user_id">Korisnikov ID</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Pozovi u Družinu</string>
-  <string name="share_using">Podijeli koristeći</string>
+    <string name="email">E-mail</string>
+    <string name="share_using">Podijeli koristeći</string>
   <string name="share_levelup">Došao/la sam do levela %d u Habitici poboljšavajući svoje navike u stvarnom životu! </string>
   <string name="share_hatched">Upravo sam izlegao/la %1$s %2$s ljubimca u Habitici izvršavajući svoje zadatke u stvarnom životu!</string>
   <string name="share_raised">Upravo sam dobio/la %1$s životinju za jahanje u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
   <string name="open_in_store">Otvori u Google Play trgovini</string>
   <string name="change_class_confirmation">Jesi li siguran/na da želiš promijeniti svoju klasu? Ovo će te koštati 3 dragulja.</string>
   <string name="change_class_equipment_warning">Upozorenje: više nećeš moći kupovati opremu iz klase %s.</string>
-  <string name="leaderMessage">Poruka od %1$s</string>
-  <string name="leaderName">Vođa: %1$s</string>
-  <string name="confirm">Potvrdi</string>
+    <string name="confirm">Potvrdi</string>
   <string name="market">Tržnica</string>
   <string name="timeTravelers">Vremenski putnici</string>
   <string name="seasonalShop">Sezonski dućan</string>
@@ -375,37 +292,16 @@
   <string name="party_invite">Otključaj pozivanjem prijatelja</string>
   <string name="login_incentive">Otključaj redovitim prijavljivanjem u Habiticu</string>
   <string name="create_account">Otključaj stvaranjem računa</string>
-  <string name="no_gold">Nema dovoljno Zlatnika</string>
-  <string name="no_potion">Ne trebaš kupiti čarobni napitak za izlijeganje</string>
-  <string name="successful_purchase">Kupljen %1$s</string>
-  <string name="purchase_confirmation_title">Potvrdi kupnju</string>
-  <string name="confirm_purchase_text">Kupi %1$s za %2$s %3$s</string>
-  <string name="gem">dragulj</string>
-  <string name="hourglass">pješčani sat</string>
-  <string name="hourglasses">pješčanih satova</string>
-  <string name="gold_singular">zlatnik</string>
-  <string name="gold_plural">zlatnika</string>
+    <string name="successful_purchase">Kupljen %1$s</string>
+    <string name="gold_plural">zlatnika</string>
   <string name="chat_message_copied">Poruka je kopirana u međuspremnik</string>
-  <string name="copy_chat_message">Kopiraj u međuspremnik</string>
-  <string name="edit_tag_title">Uredi Oznaku</string>
-  <string name="edit_tag_btn_edit">Uredi</string>
-  <string name="edit_tag_btn_done">Gotovo</string>
-  <string name="edit_tag_btn_delete">Izbriši</string>
-  <string name="confirm_delete_tag_title">Jesi li siguran/na?</string>
+    <string name="edit_tag_btn_edit">Uredi</string>
+    <string name="confirm_delete_tag_title">Jesi li siguran/na?</string>
   <string name="confirm_delete_tag_message">Žiliš li ovo stvarno izbrisati?</string>
-  <string name="filter_drawer_edit_tags">Uredi Oznake</string>
-  <string name="filter_drawer_filter_tags">Filtriraj po oznakama</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Neka te netko pozove s ovim QR kodom</string>
-  <string name="qr_save_message">QR kod spremljen na</string>
-  <string name="qr_dialogue_title">Tvoj QR kod</string>
-  <string name="download">Preuzmi</string>
-  <string name="send_new_message">Pošalji novu poruku</string>
-  <string name="choose_recipient_title">Odaberi primatelja poruke</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Odaberi primatelja poruke</string>
   <string name="action_continue">Nastavi</string>
-  <string name="scan_qr_code">Skeniraj QR kod</string>
-  <string name="enter_recipient_uuid">Unesi Korisnički ID primatelja</string>
-  <string name="invited_to_party">Pozvan/a si pridružiti se družini!</string>
+    <string name="invited_to_party">Pozvan/a si pridružiti se družini!</string>
   <string name="stats_widget_label">Statistike Habitice</string>
   <string name="add_task">Dodaj Zadatak</string>
   <string name="add_habit">Dodaj Naviku</string>
@@ -416,15 +312,14 @@
   <string name="widget_habit_button">Habitica Učvrsti Naviku</string>
   <string name="widget_dailies">Habitica Svakodnevni zadaci</string>
   <string name="widget_todo_list">Habitica Popis Zadataka</string>
-  <string name="widget_add_task">Habitica Dodaj Zadatak</string>
-  <string name="google_services_missing">Nije bilo moguće pronaći usluge Google Playa.</string>
-  <string name="gem.purchase.toolbartitle">Kupi</string>
-  <string name="gem.purchase.title">Kupovina Dragulja podržava razvojne programere i pomaže u održavanju Habitice</string>
-  <string name="gem.purchase.subtitle">Dragulji ti omogućuju kupovinu zabavnih dodataka za svoj račun, uključujući:</string>
-  <string name="gem.purchase.listitem1">Kul kostime za svog avatara</string>
-  <string name="gem.purchase.listitem2">Zakon pozadine</string>
-  <string name="gem.purchase.listitem3">Pustolovine koje te nagrađuju jajima ljubimaca</string>
-  <string name="gem.purchase.listitem4">Mogućnost promjene klase prije levela 100</string>
+    <string name="google_services_missing">Nije bilo moguće pronaći usluge Google Playa.</string>
+  <string name="gem_purchase_toolbartitle">Kupi</string>
+  <string name="gem_purchase_title">Kupovina Dragulja podržava razvojne programere i pomaže u održavanju Habitice</string>
+  <string name="gem_purchase_subtitle">Dragulji ti omogućuju kupovinu zabavnih dodataka za svoj račun, uključujući:</string>
+  <string name="gem_purchase_listitem1">Kul kostime za svog avatara</string>
+  <string name="gem_purchase_listitem2">Zakon pozadine</string>
+  <string name="gem_purchase.listitem3">Pustolovine koje te nagrađuju jajima ljubimaca</string>
+  <string name="gem_purchase.listitem4">Mogućnost promjene klase prije levela 100</string>
   <string name="support_habitica">Podrži Habiticu</string>
   <string name="skill_transformation_use">koristi</string>
   <string name="hatching_market_info">Ne dobivaš prave poklone? Poviri u Tržnicu!</string>
@@ -438,24 +333,24 @@
   <string name="belongs_to_challenge">Pripada Izazovu</string>
   <string name="has_reminder">Ima podsjetnik</string>
   <string name="has_tag">Ima oznaku</string>
-  <string name="subscribe.title">Pretplatama se podržavaju razvojni programeri i pomaže se u održavanju Habitice</string>
+  <string name="subscribe_title">Pretplatama se podržavaju razvojni programeri i pomaže se u održavanju Habitice</string>
   <string name="subscribe_prompt">Postani pretplatnik i dobit ćeš ove korisne prednosti:</string>
-  <string name="subscribe.listitem1">Kupovinu dragulja zlatnicima</string>
-  <string name="subscribe.listitem2">Ekskluzivne mjesečne predmete</string>
-  <string name="subscribe.listitem3">Zadržavanje dodatne povijesti unosa</string>
-  <string name="subscribe.listitem4">Udvostručen dnevni limit poklona</string>
+  <string name="subscribe_listitem1">Kupovinu dragulja zlatnicima</string>
+  <string name="subscribe_listitem2">Ekskluzivne mjesečne predmete</string>
+  <string name="subscribe_listitem3">Zadržavanje dodatne povijesti unosa</string>
+  <string name="subscribe_listitem4">Udvostručen dnevni limit poklona</string>
   <string name="subscriptions">Pretplate</string>
   <string name="subscription_duration">Ponavlja se svaku %s</string>
   <string name="subscription_duration_norenew">Za %s</string>
   <string name="subscribe">Pretplati se</string>
-  <string name="subscribe.listitem1.description">Trgovac Aleksandar će ti sada prodavati dragulje po cijeni od 20 zlatnika po dragulju!\n\nNjegove mjesečne pošiljke su ispočetka ograničene na 25 Dragulja po mjesecu, ali se ovaj broj može povećati na osnovu duljine tvoje pretplate.\n\nLimit se povećava za 5 Dragulja za svaka tri mjeseca uzastopne pretplate i tako sve do maksimuma od 50 Dragulja po mjesecu!</string>
-  <string name="subscribe.listitem2.description">Svaki mjesec ćeš dobiti jedinstveni kozmetički predmet za svog avatara!n\nUz to, za svaka tri mjeseca uzastopne pretplate, Mistični Vremenski Putnici će ti dozvoliti pristup povijesnim (i futurističkim) kozmetičkim predmetima.</string>
-  <string name="subscribe.listitem3.description">Čini izvršene Zadatke i povijest zadataka duže dostupnima.</string>
-  <string name="subscribe.listitem4.description">Udvostručeni limit poklona će ti omogućiti da dobivaš više predmeta za zadatke koje izvršiš svaki dan, što će ti pomoći upotpuniti tvoju štalu prije!</string>
-  <string name="subscribe1month.gemcap">Limit od 25 Dragulja</string>
-  <string name="subscribe3month.gemcap">Limit od 30 Dragulja</string>
-  <string name="subscribe6month.gemcap">Limit od 35 Dragulja</string>
-  <string name="subscribe12month.gemcap">Limit od 45 Dragulja</string>
+  <string name="subscribe_listitem1.description">Trgovac Aleksandar će ti sada prodavati dragulje po cijeni od 20 zlatnika po dragulju!\n\nNjegove mjesečne pošiljke su ispočetka ograničene na 25 Dragulja po mjesecu, ali se ovaj broj može povećati na osnovu duljine tvoje pretplate.\n\nLimit se povećava za 5 Dragulja za svaka tri mjeseca uzastopne pretplate i tako sve do maksimuma od 50 Dragulja po mjesecu!</string>
+  <string name="subscribe_listitem2.description">Svaki mjesec ćeš dobiti jedinstveni kozmetički predmet za svog avatara!n\nUz to, za svaka tri mjeseca uzastopne pretplate, Mistični Vremenski Putnici će ti dozvoliti pristup povijesnim (i futurističkim) kozmetičkim predmetima.</string>
+  <string name="subscribe_listitem3.description">Čini izvršene Zadatke i povijest zadataka duže dostupnima.</string>
+  <string name="subscribe_listitem4.description">Udvostručeni limit poklona će ti omogućiti da dobivaš više predmeta za zadatke koje izvršiš svaki dan, što će ti pomoći upotpuniti tvoju štalu prije!</string>
+  <string name="subscribe1month_gemcap">Limit od 25 Dragulja</string>
+  <string name="subscribe3month_gemcap">Limit od 30 Dragulja</string>
+  <string name="subscribe6month_gemcap">Limit od 35 Dragulja</string>
+  <string name="subscribe12month_gemcap">Limit od 45 Dragulja</string>
   <string name="subscription_hourglasses">+%d Mistični Pješčani sat</string>
   <string name="payment_method">Način plaćanja</string>
   <string name="subscription">Pretplata</string>
@@ -478,56 +373,40 @@
   <string name="twelve_months">12 mjeseci</string>
   <string name="subscribe_prompt_thanks">Za Pretplatu dobivaš ove korisne prednosti:</string>
   <string name="subscription_status">Status Pretplate</string>
-  <string name="byLeader">za %s</string>
-  <string name="challenge_details">Detalji Izazova</string>
-  <string name="challenge_leave_title">Napusti Izazov</string>
+    <string name="challenge_leave_title">Napusti Izazov</string>
   <string name="challenge_leave_text">Jesi li siguran/na da želiš napustiti Izazov \"%s\"?</string>
   <string name="challenge_remove_tasks_title">Ukloni zadatke</string>
   <string name="challenge_remove_tasks_text">Želiš li ukloniti zadatke?</string>
   <string name="remove_tasks">Ukloni</string>
   <string name="keep_tasks">Zadrži</string>
   <string name="my_challenges">Moji Izazovi</string>
-  <string name="public_challenges">Javni</string>
-  <string name="challenges">Zadaci</string>
-  <string name="daily">Svakodnevni zadatak</string>
+    <string name="daily">Svakodnevni zadatak</string>
   <string name="habit">Navika</string>
   <string name="reward">Nagrada</string>
   <string name="todo">Zadatak</string>
   <string name="official">Službeni</string>
-  <string name="participating">U kojima sudjeluješ</string>
-  <string name="challenge">U sklopu Izazova</string>
-  <string name="go_to_challenge">Idi do Izazova</string>
-  <string name="not_part_of_a_challenge">Ne sudjeluješ u nijednom Izazovu trenutno!</string>
+    <string name="challenge">U sklopu Izazova</string>
+    <string name="not_part_of_a_challenge">Ne sudjeluješ u nijednom Izazovu trenutno!</string>
   <string name="join_a_challenge">Pridruži se Izazovu kako bi dodao/la uređen niz izazova tvom popisu i onda se natječi protiv drugih Habitičana kako bi osvojio/la postignuća pa čak i dragulje!</string>
   <string name="check_the_public_challenge_tab">Klikni na karticu \"Javni\" kako bi pronašao/la Zadatke kreirane od strane drugih korisnika koji ti najbolje odgovaraju!</string>
-  <string name="add_reminder">Dodaj Podsjetnik</string>
-  <string name="warning">Upozorenje</string>
-  <string name="open_settings">Otvori Postavke</string>
-  <string name="dont_keep_activities_warning">Izgleda da ti je opcija Razvojnih programera \“Nemoj zadržati aktivnosti\” aktivna. Ova opcija trenutno uzrokuje probleme s aplikacijom Habitice pa preporučamo da je deaktiviraš.</string>
-  <string name="inbox">Poruke</string>
-  <string name="FAQ">Često postavljena pitanja</string>
-  <string name="special">Posebni</string>
+    <string name="inbox">Poruke</string>
+    <string name="special">Posebni</string>
   <string name="gem_for_gold_description">Jer si se pretplatio/la na Habiticu, svaki mjesec možeš kupiti određen broj Dragulja u zamjenu za Zlatnike.</string>
-  <string name="limited_count">%d preostalo</string>
-  <string name="gem_shop">Dragulj</string>
+    <string name="gem_shop">Dragulj</string>
   <string name="mystery_item">Tajni artikal</string>
   <string name="myster_item_notes">Pretplatnici će svaki mjesec dobiti tajni artikal, obično jedan tjedan prije kraja mjeseca.</string>
   <string name="open">Otvori</string>
-  <string name="notification_mystery_item">Otvoriš kutiju i nađeš %s!</string>
-  <string name="checkInRewardEarned">Dobio/la si %1$s kao nagradu za tvoju predanost poboljšanju svog života.</string>
+    <string name="checkInRewardEarned">Dobio/la si %1$s kao nagradu za tvoju predanost poboljšanju svog života.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Sljedeću nagradu dobivaš za %1$d prijava.</string>
   <string name="pending_approval">čeka odobrenje</string>
   <string name="filters">Filteri</string>
   <string name="done">Gotovo</string>
-  <string name="group_tasks_edit_description">Grupni zadaci se ne mogu uređivati.</string>
-  <string name="group_tasks_edit_title">Nije moguće urediti ovaj zadatak.</string>
-  <string name="groups">Grupe</string>
+    <string name="groups">Grupe</string>
   <string name="all">Sve</string>
   <string name="none">Nijedna</string>
   <string name="owned">Posjeduješ</string>
   <string name="not_owned">Ne posjeduješ</string>
-  <string name="new_game">Nova\nigra</string>
-  <string name="login_btn_fb">Prijavi se putem Facebook profila</string>
+    <string name="login_btn_fb">Prijavi se putem Facebook profila</string>
   <string name="login_btn_google">Prijavi se preko Google računa</string>
   <string name="action_back">Natrag</string>
   <string name="welcome_text">Bok! Vjerojatno si nov/a ovdje. Ja sam Justin i bit ću tvoj vodič po Habitici.\n\nZa početak, kako da te zovemo? Slobodno promijeni ono što sam ja odabrao. Kad si spreman/na, hajdemo napraviti tvog avatara!</string>
@@ -559,7 +438,6 @@
   <string name="reload_content">Ponovno učitaj sadržaj</string>
   <string name="dailyDueDefaultView">Automatski stavljaj Svakodnevne zadatke pod karticu \"Neizvršeni\"</string>
   <string name="dailyDueDefaultViewDescription">Kad je ova opcija odabrana, bit će prikazani svakodnevni zadaci koji su \"neizvršeni\" umjesto \"svi\".</string>
-  <string name="repeat_summary">Ponavlja se %1$s svaku %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Tvoj uređaj ne sadrži nijedan od podržanih načina plaćanja. Molimo te da odeš na web stranicu Habitice ako želiš kupiti dragulje.</string>
   <string name="no_billing_subscriptions">Tvoj uređaj ne sadrži nijedan od podržanih načina plaćanja. Molimo te da odeš na web stranicu Habitice ako želiš kupiti pretplatu.</string>
   <string name="save">Spremi</string>
@@ -567,8 +445,7 @@
   <string name="gem_reward">Nagrada Dragulja</string>
   <string name="tasks">Zadaci</string>
   <string name="create_challenge">Kreiraj Izazov</string>
-  <string name="edit_challenge">Uredi</string>
-  <string name="challenge_create_error_tavern_one_gem">Treba ti barem 1 dragulj kako bi kreirao/la javni izazov.</string>
+    <string name="challenge_create_error_tavern_one_gem">Treba ti barem 1 dragulj kako bi kreirao/la javni izazov.</string>
   <string name="challenge_create_error_enough_gems">Nemaš dovoljno dragulja za kreirati izazov.</string>
   <string name="identify_your_challenge_with_a_tag">Identificiraj svoj izazov kratkim nazivom</string>
   <string name="challenge_create_error_tag">Treba ti kratki naziv da bi kreirao/la ovaj Izazov.</string>
@@ -578,42 +455,36 @@
   <string name="new_challenge_title">Novi naslov izazova</string>
   <string name="ownership">Vlasništvo</string>
   <string name="inn">Svratište</string>
-  <string name="system">Sistem</string>
-  <string name="start_quest">Započni novu Pustolovinu</string>
+    <string name="start_quest">Započni novu Pustolovinu</string>
   <string name="leave_party">Napusti Družinu</string>
   <string name="party_description">Opis Družine</string>
-  <string name="abort_confirmation">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Ovo će je otkazati za sve u tvojoj družini i sav napredak će biti izgubljen. Pustolovni svitak će biti vraćen vlasniku pustolovine.</string>
-  <string name="leave_quest_confirmation">Jesi li siguran/na da želiš napustiti aktivnu pustolovinu? Sav tvoj napredak u pustolovini će biti izgubljen.</string>
-  <string name="number_participants">%1$d sudionika</string>
+    <string name="number_participants">%1$d sudionika</string>
   <string name="welcome_back">Dobrodošao/la natrag</string>
   <string name="yesterdaililes_prompt">Jesi li jučer obavio/la ikoji od ovih Svakodnevnih zadataka?</string>
   <string name="start_day">Započni dan</string>
   <string name="leave_party_confirmation">Jesi li siguran/na da želiš napustiti Družinu?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Sljedeća nagrada stiže za %d prijava</string>
-  <string name="pending">Na čekanju</string>
+    <string name="pending">Na čekanju</string>
   <string name="accepted">Prihvaćeno</string>
   <string name="declined">Odbijeno</string>
   <string name="participants">Sudionici</string>
   <string name="invitations">Pozivi</string>
-  <string name="quest_leader_header" formatted="false">Započeo/la %s</string>
+  <string name="quest_leader_header">Započeo/la %s</string>
   <string name="quest_abort_message">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Ovo će je otkazati za sve u tvojoj družini i sav napredak će biti izgubljen. Pustolovni svitak će biti vraćen vlasniku pustolovine.</string>
-  <string name="loading">Učitavanje...</string>
-  <string name="reloading_content">Sadržaj se ponovno učitava</string>
+    <string name="reloading_content">Sadržaj se ponovno učitava</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Tvoj saldo:</string>
-  <string name="available_until" formatted="false">Dostupno do %s</string>
-  <string name="gems_left_max" formatted="false">Mjesečni Dragulji: %1$d/%2$d preostalo</string>
-  <string name="gems_left_nomax" formatted="false">Mjesečni Dragulji: %d preostalo</string>
+    <string name="available_until">Dostupno do %s</string>
+  <string name="gems_left_max">Mjesečni Dragulji: %1$d/%2$d preostalo</string>
+  <string name="gems_left_nomax">Mjesečni Dragulji: %d preostalo</string>
   <string name="health">Zdravlje</string>
   <string name="collect">Skupi</string>
   <string name="rage_meter">Razina Bijesa</string>
   <string name="boss_quest">Pustolovina potjere Bosa</string>
   <string name="collection_quest">Pustolovina prikupljanja</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d bodova Iskustva</string>
-  <string name="gold_reward" formatted="false">%d Zlatnika</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d bodova Iskustva</string>
+  <string name="gold_reward">%d Zlatnika</string>
   <string name="quest_owner_rewards">Nagrade za Vlasnika Pustolovine</string>
   <string name="str_abbrv">SNA</string>
   <string name="per_abbrv">PER</string>
@@ -626,8 +497,7 @@
   <string name="reset_account_confirmation">resetiraj moj račun</string>
   <string name="delete_account_confirmation">izbriši moj račun</string>
   <string name="danger_zone">Zona Opasnosti</string>
-  <string name="nevermind">Nema veze</string>
-  <string name="resetting_account">Resetiranje računa</string>
+    <string name="resetting_account">Resetiranje računa</string>
   <string name="deleting_account">Brisanje računa</string>
   <string name="insufficientGold">Trebaš izvršiti više zadataka prije nego što ćeš moći sebi priuštiti ovaj predmet!</string>
   <string name="insufficientGems">Trebat će ti više Dragulja kako bi kupio/la ovaj predmet!</string>
@@ -660,8 +530,7 @@
   <string name="authentication_summary">Promijeni svoje postavke provjere autentičnosti.</string>
   <string name="change_password">Promijeni Lozinku</string>
   <string name="change_email">Promijeni e-mail adresu</string>
-  <string name="change_login_name">Promijeni korisničko ime</string>
-  <string name="change_username">Promijeni korisničko ime</string>
+    <string name="change_username">Promijeni korisničko ime</string>
   <string name="change">Promijeni</string>
   <string name="character_level">Level lika</string>
   <string name="auto_allocate_points">Automatska raspodjela bodova</string>
@@ -682,7 +551,7 @@
   <string name="distribute_class">Raspodijeli na osnovu klase</string>
   <string name="distribute_task">Raspodijeli na osnovu aktivnost zadataka</string>
   <string name="no_points_to_allocate">Nema bodova za raspodjelu</string>
-  <string name="points_to_allocate" formatted="false">%d bodova za raspodjelu</string>
+  <string name="points_to_allocate">%d bodova za raspodjelu</string>
   <string name="distribute_evenly_help">Dodijeli svakom atributu jednak broj bodova.</string>
   <string name="distribute_class_help">Dodjeljuje više bodova atributima koji su bitni za tvoju Klasu.</string>
   <string name="distribute_task_help">Dodjeljuje bodove na osnovu kategorija Snage, Inteligencije, Konstitucije i Percepcije koje su povezane sa zadacima koje obaviš.</string>
@@ -692,9 +561,7 @@
   <string name="classless">Bez klase</string>
   <string name="class_equipment_shop_dialog">Ovaj artikal je dostupan samo određenoj klasi.\nMožeš promijeniti svoju klasu u Postavkama.</string>
   <string name="class_gear_disclaimer">Možeš kupovati opremu samo za svoju trenutnu klasu</string>
-  <string name="available_stats" formatted="false">%d bodova</string>
-  <string name="toogle_emojis">Aktiviraj emotikone</string>
-  <string name="tavern_description">Dobrodošao/la u Svratište! Dovuci stolicu i priključi se chatu, ili se malo odmori od svojih zadataka.</string>
+    <string name="tavern_description">Dobrodošao/la u Svratište! Dovuci stolicu i priključi se chatu, ili se malo odmori od svojih zadataka.</string>
   <string name="check_into_inn">Prijavi se u Svratište</string>
   <string name="community_guidelines">Smjernice za zajednicu</string>
   <string name="view_community_guidelines">Pogledaj Smjernice za zajednicu</string>
@@ -708,19 +575,13 @@
   <string name="navigation_drawer_open">Otvori navigacijsku traku</string>
   <string name="navigation_drawer_close">Zatvori navigacijsku traku</string>
   <string name="world_boss">Svjetski Bos</string>
-  <string name="world_boss_art">Umjetnički prikazi Bosa</string>
-  <string name="boss_art">Umjetnički prikazi Bosa</string>
+    <string name="boss_art">Umjetnički prikazi Bosa</string>
   <string name="world_boss_description">Opis Svjetskog Bosa</string>
-  <string name="rage_strike_count" formatted="false">Udari Bijesa: %d/%d</string>
-  <string name="pending_strike_description">Ovaj Udarac još nije zadan!\nSvjetski bos će napasti i ispucati svoj bijes na jednom od naših prijateljskih trgovaca kad mu se napuni traka bijesa. Drži korak sa svojim Svakodnevnim zadacima kako bi pokušao/la spriječiti da dođe do ovoga!</string>
-  <string name="pending_strike_title">U iščekivanju Udarca</string>
+  <string name="rage_strike_count">Udari Bijesa: %d/%d</string>
+    <string name="pending_strike_title">U iščekivanju Udarca</string>
   <string name="strike_description_title">Što je Udar Bijesa?</string>
-  <string name="strike_description_subtitle">Postoje 3 potencijalna Udara Bijesa</string>
-  <string name="strike_description_description">Ova traka se napuni kad Habitičani propuste svoje Svakodnevne zadatke. Ako se napuni, Srceparatelj će izvršiti svoj napad Razaranja Srca na jednom od Habitičinih trgovaca. Stoga pripazi da obaviš svoje zadatke!</string>
-  <string name="pending_strike_subtitle">Ovaj Udarac još nije zadan!</string>
-  <string name="strike_active_title" formatted="false">%s je bio napadnut!</string>
-  <string name="strike_active_subtitle" formatted="false">%s ima slomljeno srce!</string>
-  <string name="strike_active_description" formatted="false">Naš dragi %s je bio razoren kad je %s razbio %s. Brzo, navali na svoje zadatke kako bi porazio/la čudovište i pomogao/la u obnovi!!</string>
+    <string name="strike_active_title">%s je bio napadnut!</string>
+    <string name="strike_active_description">Naš dragi %s je bio razoren kad je %s razbio %s. Brzo, navali na svoje zadatke kako bi porazio/la čudovište i pomogao/la u obnovi!!</string>
   <string name="questShop">Dućan pustolovina</string>
   <string name="market_owner_long">Alex Trgovac</string>
   <string name="tavern_owner_long">Danijel Gostioničar</string>
@@ -730,29 +591,21 @@
   <string name="no_party_description">Idi na pustolovine s prijateljima ili samostalno. Bori se protiv čudovišta, kreiraj Izazove i pomogni sebi zadržati odgovornost pomoću Družina.</string>
   <string name="no_party_title">Igraj Habiticu u Družini</string>
   <string name="join_party_description">Daj članu Družine korisničko ime ispod koje se nalazi ispod i oni će ti moći poslati pozivnicu</string>
-  <string name="join_party_description_id">Daj im svoj Korisnički ID ili da im daj da skeniraju tvoj QR kod prilikom slanja pozivnice</string>
-  <string name="join_party_title">Želiš se priključiti Družini?</string>
-  <string name="create_party_website">Otvori web stranicu kako bi napravio/la družinu</string>
-  <string name="id_copied">ID je kopiran u međuspremnik</string>
-  <string name="insufficientSubscriberGems">Kupio/la si sve Dragulje koje možeš za ovaj mjesec. Više ih postane dostupno unutar prva tri dana svakog mjeseca. Hvala na pretplati!</string>
-  <string name="insufficientSubscriberGemsTitle">Došao/la si do mjesečnog limita Dragulja</string>
-  <string name="chat_message">Poruka u chatu</string>
-  <string name="world_boss_description_title">Što je Svjetski Bos?</string>
-  <string name="world_boss_description_description">Svjetski Bos je posebni događaj u kojem cijela zajednica surađuje kako bi porazila moćno čudovište pomoću svojih zadataka!\nIzvršavaj zadatke kako bi nanio/la štetu Bosu\nBos neće tebi nanijeti štetu za propuštene zadatke, ali će se njegova traka Bijesapuniti. Ako se traka napuni, Bos će napasti jednog od trgovaca!\nMožeš se nastaviti boriti protiv normalnih Bosova Pustolovina i šteta će biti nanesena obojici\nPoviri u Krčmu kako bi vidio/la napredak u borbi protiv Bosa i broj Udara bijesa.</string>
-  <string name="world_boss_description_intro">Svjetski Bos je posebni događaj u kojem cijela zajednica surađuje kako bi porazila moćno čudovište pomoću svojih zadataka!</string>
+    <string name="join_party_title">Želiš se priključiti Družini?</string>
+    <string name="insufficientSubscriberGems">Kupio/la si sve Dragulje koje možeš za ovaj mjesec. Više ih postane dostupno unutar prva tri dana svakog mjeseca. Hvala na pretplati!</string>
+    <string name="world_boss_description_title">Što je Svjetski Bos?</string>
+    <string name="world_boss_description_intro">Svjetski Bos je posebni događaj u kojem cijela zajednica surađuje kako bi porazila moćno čudovište pomoću svojih zadataka!</string>
   <string name="world_boss_description_1">Izvršavaj zadatke kako bi nano/la štetu Bosu</string>
   <string name="world_boss_description_2">Bos neće tebi nanijeti štetu za propuštene zadatke, ali će se njegova traka Bijesa puniti. Ako se traka napuni, Bos će napasti jednog od trgovaca!</string>
   <string name="world_boss_description_3">Možeš se nastaviti boriti protiv normalnih Bosova Pustolovina i šteta će biti nanesena obojici</string>
   <string name="world_boss_description_4">Poviri u Krčmu kako bi vidio/la napredak u borbi protiv Bosa i broj udara Bijesa</string>
-  <string name="world_boss_action_prompt" formatted="false">Porazi Bosa kako bi dobio/la posebne nagrade i spasio/la Habiticu od terora %s.</string>
-  <string name="world_boss_description_subtitle">%s napada!</string>
-  <string name="questShop_owner_long">Ian, Vodič kroz Pustolovine</string>
+  <string name="world_boss_action_prompt">Porazi Bosa kako bi dobio/la posebne nagrade i spasio/la Habiticu od terora %s.</string>
+    <string name="questShop_owner_long">Ian, Vodič kroz Pustolovine</string>
   <string name="seasonalShop_owner_long">Sezonska Čarobnica</string>
   <string name="rage_attack">Napad Bijesa:</string>
   <string name="tavern_description_world_boss">Ajoj, ne obračaj pozornost na čudovište ispod - ovo je i dalje sigurno utočište za čavrljanje u pauzama.</string>
   <string name="report">Prijavi</string>
-  <string name="like">Lajkaj</string>
-  <string name="reply">Odgovori</string>
+    <string name="reply">Odgovori</string>
   <string name="challenge_prize">Nagrada za Izazov</string>
   <string name="challenge_categories">Kategorije Izazova</string>
   <string name="created_challenge">Napravljen Izazov</string>
@@ -787,16 +640,14 @@
   <string name="usernamePromptTitle">Vrijeme je za postaviti tvoje korisničko ime!</string>
   <string name="usernamePromptBody">Imena za prijavljivanje su sada jedinstvena korisnička imena koja će biti vidljiva pokraj tvog imena za prikazivanje i koja će biti korištena u pozivnicama, @spomenima u chatu i porukama.</string>
   <string name="usernamePromptWiki">Ako želiš naučiti više o ovoj promjeni, <a href="https://habitica.wikia.com/wiki/Player_Names">posjeti našu wiki stranicu.</a></string>
-  <string name="confirmUsername">Potvrdi korisničko ime</string>
-  <string name="usernamePromptDisclaimer">Korisnička imena se trebaju pridržavati naših <a href="https://habitica.com/static/terms">Uvjeta pružanja usluga</a> i <a href="https://habitica.com/static/community-guidelines">Smjernica za zajednicu</a>. Ako prethodno nisi postavio/la svoje korisničko ime, ono je automatski generirano.</string>
+    <string name="usernamePromptDisclaimer">Korisnička imena se trebaju pridržavati naših <a href="https://habitica.com/static/terms">Uvjeta pružanja usluga</a> i <a href="https://habitica.com/static/community-guidelines">Smjernica za zajednicu</a>. Ako prethodno nisi postavio/la svoje korisničko ime, ono je automatski generirano.</string>
   <string name="confirm_username_title">Jesi li siguran/na da želiš potvrditi svoje trenutno korisničko ime?</string>
   <string name="confirm_username_description">Potvrđivanje tvog korisničkog imena će ga učiniti javnim za pozivnice, @spomene i poruke. Možeš promijeniti svoje korisničko ime u postavkama bilo kada.</string>
   <string name="cancel">Otkaži</string>
   <string name="confirm_username">Potvrdi korisničko ime</string>
   <string name="username_not_confirmed">Korisničko ime nije potvrđeno</string>
   <string name="username_confirmed">Korisničko ime je potvrđeno</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
-  <string name="enter_recipient_username">Unesi @ korisničko ime primatelja</string>
+    <string name="enter_recipient_username">Unesi @ korisničko ime primatelja</string>
   <string name="username_copied">Korisničko ime je kopirano u međuspremnik</string>
   <string name="verification_pet">Jedan od ovih veteranskih ljubimaca će te čekati nakon što završiš proces potvrđivanja!</string>
   <string name="welcomeNameTitle">Kako te možemo zvati?</string>
diff --git a/Habitica/res/values-hu/strings.xml b/Habitica/res/values-hu/strings.xml
new file mode 100755
index 000000000..890d1f955
--- /dev/null
+++ b/Habitica/res/values-hu/strings.xml
@@ -0,0 +1,367 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Frissítés</string>
+  <string name="XP_default">Tapasztalat</string>
+  <string name="HP_default">Életerő</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">A beállításokat nem tudtuk leolvasni a vonalkódról</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Beállítások</string>
+  <string name="SP_address_hint">Az egyéni szervered</string>
+  <string name="SP_userID_title">Felhasználói azonosító</string>
+  <string name="SP_userID_summary">A felhasználói azonosítód</string>
+  <string name="SP_APIToken_title">API kulcs</string>
+  <string name="SP_APIToken_summary">API kulcsod</string>
+  <string name="Language_title">Nyelv</string>
+  <string name="Language_summary">A Habitica nyelvének megváltoztatása</string>
+  <string name="SP_user_qr_code">A QR kódod</string>
+  <string name="PS_contact_title">Kapcsolat</string>
+  <string name="unknown_error">Hiba történt...</string>
+  <string name="pref_account_header">Fiók</string>
+  <string name="pref_first_day_of_the_week_title">A hét első napja</string>
+  <string name="pref_first_day_of_the_week_summary">A hét első napja minden naptárban</string>
+  <string name="pref_reminder_header">Napi emlékeztető</string>
+  <string name="pref_reminder_checkbox">Emlékeztető aktiválása</string>
+  <string name="pref_reminder_picker">Emlékeztető idejének megadása</string>
+  <string name="pref_cds_header">Egyéni napkezdés</string>
+  <string name="pref_cds_picker">Egyéni napkezdés idejének beállítssa</string>
+  <string name="pref_push_notifications_checkbox">Felhasználói felugró értesítések</string>
+  <string name="push_notifications">Felugró értesítések</string>
+  <string name="push_notifications_sum">Felugró értesítések beállítása</string>
+  <string name="preference_push_you_won_challenge">Megnyertél egy kihívást!</string>
+  <string name="preference_push_received_a_private_message">Kaptál egy privát üzenetet</string>
+  <string name="preference_push_gifted_gems">Drágakövek ajándékozva</string>
+  <string name="preference_push_gifted_subscription">Előfizetés ajándékozva</string>
+  <string name="preference_push_invited_to_party">Meghívva egy csapatba</string>
+  <string name="preference_push_invited_to_guild">Meghívva egy céhbe</string>
+  <string name="preference_push_your_quest_has_begun">A küldetésed elkezdődött.</string>
+  <string name="preference_push_invited_to_quest">Meghívva egy küldetésre</string>
+  <!--Adding tasks-->
+  <string name="task_value">Érték</string>
+  <string name="new_todo">Új tennivaló</string>
+  <string name="new_reward">Új jutalom</string>
+  <string name="new_daily">Új napi feladat</string>
+  <string name="new_habit">Új szokás</string>
+  <string name="action_edit">Szerkesztés</string>
+  <string name="action_delete">Törlés</string>
+  <string name="action_cancel">Mégse</string>
+  <string name="login_btn">Bejelentkezés</string>
+  <string name="register_btn">Regisztráció</string>
+  <string name="username">Felhasználónév</string>
+  <string name="email_username">E-mail vagy felhasználónév</string>
+  <string name="password">Jelszó</string>
+  <string name="emailAddress">E-mail cím</string>
+  <string name="confirmpassword">Jelszó megerősítése</string>
+  <string name="logout">Kijelentkezés</string>
+  <string name="logout_description">Kijelentkezés a fiókodból</string>
+  <string name="account_details">Fiók adatai</string>
+  <string name="LoginActivityName">Üdvözlünk</string>
+  <string name="string_revive">Újraéledés</string>
+  <string name="please_connect">Kapcsolódj az alkalmazáson keresztül, egy widget használata előtt</string>
+  <string name="about.title">Rólunk</string>
+  <string name="about.libraries">Könyvtárak</string>
+  <string name="about.versionhistory">Előző verziók</string>
+  <string name="about.habitica_open_source">A Habitica elérhető, mint nyílt forráskódú szoftver a Githubon</string>
+  <string name="about.rate_our_app">Értékeld az alkalmazást!</string>
+  <string name="about.give_us_feedback">Küldj visszajelzést!</string>
+  <string name="about.bugreport">Hibajelentés</string>
+  <string name="about.source_code">Forráskód</string>
+  <string name="repeatEvery">Ismétlés minden</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Kapcsolódási hiba</string>
+  <string name="network_error_no_network_body">Nem kapcsolódtál az internethez.</string>
+  <string name="internal_error_api">Valamilyen probléma van a szerverrel. Próbáld újra később!</string>
+  <string name="authentication_error_title">Hitelesítési hiba</string>
+  <string name="authentication_error_body">A felhasználónév és/vagy a jelszó hibás.</string>
+  <string name="login_validation_error_title">Érvényesítési hiba</string>
+  <string name="login_validation_error_fieldsmissing">Minden mezőt ki kell töltened.</string>
+  <string name="save_changes">Mentés</string>
+  <string name="copy">Másolás</string>
+  <string name="notes">Jegyzetek</string>
+  <string name="text">Szöveg</string>
+  <string name="difficulty">Nehézség</string>
+  <string name="tags">Címkék</string>
+  <string name="trivial">Triviális</string>
+  <string name="easy">Könnyű</string>
+  <string name="medium">Közepes</string>
+  <string name="hard">Nehéz</string>
+  <string name="start_date">Kezdés dátuma</string>
+  <string name="positive_habit_form">Pozitív ( + )</string>
+  <string name="negative_habit_form">Negatív ( - )</string>
+  <string name="checklist">Feladatlista</string>
+  <string name="reminders">Emlékeztetők</string>
+  <string name="actions">Akciók</string>
+  <string name="attributes">Tulajdonságok</string>
+  <string name="physical">Erő</string>
+  <string name="mental">Intelligencia</string>
+  <string name="social">Szívósság</string>
+  <string name="other">Észlelés</string>
+  <string name="frequency">Gyakoriság</string>
+  <string name="frequency_weekly">A hét bizonyos napjain</string>
+  <string name="frequency_daily">X naponta</string>
+  <string name="repeatables_summary_title">Összefoglalás</string>
+  <string name="repeatables_title">Ismétlődik</string>
+  <string name="repeatables_on_title">Ismétlődik minden</string>
+  <string name="repeatables_frequency_daily">Naponta</string>
+  <string name="repeatables_frequency_weekly">Hetente</string>
+  <string name="repeatables_frequency_monthly">Havonta</string>
+  <string name="repeatables_frequency_yearly">Évente</string>
+  <string name="repeatables_frequency_day_of_month">Hónap napján</string>
+  <string name="repeatables_frequency_day_of_week">Hét napján</string>
+  <string name="monday">Hétfő</string>
+  <string name="tuesday">Kedd</string>
+  <string name="wednesday">Szerda</string>
+  <string name="thursday">Csütörtök</string>
+  <string name="friday">Péntek</string>
+  <string name="saturday">Szombat</string>
+  <string name="sunday">Vasárnap</string>
+  <string name="levelup_header">Elérted a %1$d. szintet!</string>
+  <string name="levelup_detail">A valós céljaid elvégzésével szintet léptél, és teljesen felgyógyultál!</string>
+  <string name="levelup_button">Hurrá!</string>
+  <string name="faint_subtitle">Ne ess kétségbe!</string>
+  <string name="faint_penalty_body">Elvesztettél egy szintet, az aranyad és egy darab felszerelési tárgyat, de mindet visszaszerezheted kemény munkával! Sok sikert, menni fog!</string>
+  <string name="faint_header">Elfogyott az életerőd!</string>
+  <string name="faint_button">Töltsd fel az életerődet és próbáld újra</string>
+  <string name="filter">Szűrő</string>
+  <string name="profile_image">Profilkép</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">%1$s-t használtál %2$d manáért.</string>
+  <string name="used_skill_without_mana">%1$s-t használtál.</string>
+  <string name="new_checklist_item">új feladat hozzáadása</string>
+  <string name="add_checklist_item">Hozzáadás</string>
+  <string name="reminder_title">Ne felejtsd el leellenőrizni a napi feladataidat</string>
+  <string name="skill_progress_title">Varázslat használata</string>
+  <string name="coming_soon">Hamarosan</string>
+  <string name="chat_flag_confirmation">Biztosan jelenteni szeretnéd ezt az üzenetet szabálysértés miatt?</string>
+  <string name="flag_confirm">Üzenet megjelölése</string>
+  <string name="unlock_lvl_11">A 11. Szintnél feloldódik</string>
+  <string name="no_party_message">Nem vagy egy csapat tagja. Ha be szeretnél lépni egy csapatba, látogasd meg a weboldalt.</string>
+  <string name="forgot_pw_btn">Elfelejtett Jelszó</string>
+  <string name="tavern.inn.checkOut">A napi feladataid reaktiválása</string>
+  <string name="tavern.inn.rest">A napi feladataid szüneteltetése</string>
+  <string name="reward.dialog.buy">Vásárlás</string>
+  <string name="reward.dialog.dismiss">Elutasítás</string>
+  <string name="party">Csapat</string>
+  <string name="chat">Beszélgetés</string>
+  <string name="members">Tagok</string>
+  <string name="habits">Szokások</string>
+  <string name="dailies">Napi feladatok</string>
+  <string name="todos">Tennivalók</string>
+  <string name="rewards">Jutalmak</string>
+  <string name="taskform.delete.title">Biztos vagy benne?</string>
+  <string name="taskform.delete.message">Biztosan törölni szeretnél?</string>
+  <string name="yes">Igen</string>
+  <string name="no">Nem</string>
+  <string name="quest">Küldetés</string>
+  <string name="avatar_body">Test</string>
+  <string name="avatar_hair">Haj</string>
+  <string name="avatar_shirt">Póló</string>
+  <string name="avatar_skin">Bőr</string>
+  <string name="avatar_ears">Állatfülek</string>
+  <string name="avatar_base">Alap</string>
+  <string name="avatar_color">Szín</string>
+  <string name="avatar_beard">Szakáll</string>
+  <string name="avatar_mustache">Bajusz</string>
+  <string name="avatar_flower">Virág</string>
+  <string name="avatar_bangs">Frufru</string>
+  <string name="avatar_nothing">Nincs kiválasztva</string>
+  <string name="avatar_size">Méret</string>
+  <string name="avatar_size_slim">Vékony</string>
+  <string name="avatar_size_broad">Testes</string>
+  <string name="avatar_background">Háttér</string>
+  <string name="purchase_button">Vásárlás</string>
+  <string name="due_date">Határidő</string>
+  <string name="quest.accept">Elfogadás</string>
+  <string name="quest.reject">Elutasítás</string>
+  <string name="quest.begin">Küldetés elkezdése</string>
+  <string name="quest.cancel">Meghívás Lemondása</string>
+  <string name="quest.abort">Küldetés megszakítása</string>
+  <string name="quest.leave">Küldetés elhagyása</string>
+  <string name="quest.pending">Függőben</string>
+  <string name="quest.accepted">Elfogadva</string>
+  <string name="quest.rejected">Elutasítva</string>
+  <string name="quest.participants">Résztvevők</string>
+  <string name="version_info">%1$s (%2$d) verzió.</string>
+  <string name="sidebar_help">Segítség &amp; GYIK</string>
+  <string name="complete_tutorial">Megértettem!</string>
+  <string name="dismiss_tutorial">Emlékeztess újra</string>
+  <string name="intro_1_subtitle">Üdvözlünk</string>
+  <string name="intro_1_title">Habiticában!</string>
+  <string name="intro_finish_button">Kezdjük el!</string>
+  <string name="previous_button">Előző</string>
+  <string name="next_button">Következő</string>
+  <string name="skip_button">Átugrás</string>
+  <string name="setup_welcome_title">Üdvözlünk</string>
+  <string name="avatar_setup_description">Hogyan szeretnél kinézni? Ne aggódj, később tudsz ezen változtatni!</string>
+  <string name="setup_group_work">Munka</string>
+  <string name="setup_group_exercise">Testmozgás</string>
+  <string name="setup_group_health">Egészség</string>
+  <string name="setup_group_school">Iskola</string>
+  <string name="setup_group_teams">Csapatok</string>
+  <string name="setup_group_chores">Házimunka</string>
+  <string name="setup_group_creativity">Kreativitás</string>
+  <string name="setup_task_work_2">A legfontosabb feladat</string>
+  <string name="setup_task_exercise_1">10 perc kardió</string>
+  <string name="setup_task_exercise_2">Nyújtás</string>
+  <string name="setup_task_school_1">Tanulás/Halogatás</string>
+  <string name="setup_task_school_2">Házi feladat elkészítése</string>
+  <string name="setup_task_chores_1">10 perc takarítás</string>
+  <string name="setup_task_chores_2">Mosogatás</string>
+  <string name="guild">Egyesületek</string>
+  <string name="leave">KIlépés</string>
+  <string name="join">Csatlakozás</string>
+  <string name="leader">Vezető</string>
+  <string name="gems">Drágakövek</string>
+  <string name="copy_as_todo">Lemásolás Tennivalóként</string>
+  <string name="send_pm">Üzenet küldése</string>
+  <string name="flag">Megjelölés</string>
+  <string name="delete">Törlés</string>
+  <string name="name">Név</string>
+  <string name="description">Leírás</string>
+  <string name="add_tag">Új címke</string>
+  <string name="write_message">Üzenet írása</string>
+  <string name="battle_gear">Csatafelszerelés</string>
+  <string name="costume">Jelmez</string>
+  <string name="outfit_head">Fej</string>
+  <string name="outfit_eyewear">Szemüveg</string>
+  <string name="outfit_armor">Páncél</string>
+  <string name="outfit_back">Hát</string>
+  <string name="outfit_body">Test</string>
+  <string name="outfit_shield">Pajzs</string>
+  <string name="outfit_weapon">Fegyver</string>
+  <string name="today">Ma</string>
+  <string name="eggs">Tojások</string>
+  <string name="hatching_potions">Keltetőfőzetek</string>
+  <string name="food">Étel</string>
+  <string name="quests">Küldetések</string>
+  <string name="pets">Állatok</string>
+  <string name="sell">Eladás (%d arany)</string>
+  <string name="hatch_with_potion">Kikeltetés főzettel</string>
+  <string name="hatch_egg">Kikeltetés tojással</string>
+  <string name="dialog_feeding">%1$s %2$s megetetése:</string>
+  <string name="use_animal">Felhasználás</string>
+  <string name="feed">Etetés</string>
+  <string name="close">Bezárás</string>
+  <string name="share">Megosztás</string>
+  <string name="user_level">%d. szint</string>
+  <string name="warrior">Harcos</string>
+  <string name="rogue">Tolvaj</string>
+  <string name="mage">Mágus</string>
+  <string name="healer">Gyógyító</string>
+  <string name="class_confirmation">BIztos, hogy %s szeretnél lenni?</string>
+  <string name="dialog_go_back">Vissza</string>
+  <string name="by_email">E-mailben</string>
+  <string name="send">Küldés</string>
+  <string name="invite">Barátok Meghívása</string>
+  <string name="user_id">Felhasználói azonosító</string>
+  <string name="email">E-mail</string>
+  <string name="invite_users">Meghívás a Csapatba</string>
+  <string name="share_using">Megosztás ezzel</string>
+  <string name="open_in_store">Megnyitás a Play Áruházban</string>
+  <string name="change_class_confirmation">Biztosan meg szeretnéd változtatni az osztályodat? Ez 3 drágakőbe fog kerülni.</string>
+  <string name="leaderMessage">Üzenet tőle: %1$s</string>
+  <string name="leaderName">Vezető: %1$s</string>
+  <string name="confirm">Megerősítés</string>
+  <string name="market">Piac</string>
+  <string name="timeTravelers">Időutazók</string>
+  <string name="no_gold">Nincs elég aranyad!</string>
+  <string name="no_potion">Nincs szükséged életerő-ital vásárlására.</string>
+  <string name="purchase_confirmation_title">Vásárlás megerősítése</string>
+  <string name="gem">drágakő</string>
+  <string name="hourglass">homokóra</string>
+  <string name="hourglasses">homokórák</string>
+  <string name="gold_singular">arany</string>
+  <string name="gold_plural">arany</string>
+  <string name="edit_tag_title">Címke szerkesztése</string>
+  <string name="edit_tag_btn_edit">Szerkesztés</string>
+  <string name="edit_tag_btn_done">Kész</string>
+  <string name="edit_tag_btn_delete">Törlés</string>
+  <string name="confirm_delete_tag_title">Biztos vagy benne?</string>
+  <string name="confirm_delete_tag_message">Biztos, hogy törölni akarod?</string>
+  <string name="filter_drawer_edit_tags">Címkék szerkesztése</string>
+  <string name="filter_drawer_filter_tags">Szűrés címkék szerint</string>
+  <!--QR Strings-->
+  <string name="qr_dialogue_title">A QR kódod</string>
+  <string name="download">Letöltés</string>
+  <string name="send_new_message">Új üzenet küldése</string>
+  <string name="action_continue">Folytatás</string>
+  <string name="scan_qr_code">QR kód beolvasása</string>
+  <string name="invited_to_party">Meghívtak, hogy csatlakozz egy csapathoz!</string>
+  <string name="stats_widget_label">Habitica statisztikák</string>
+  <string name="add_task">Feladat hozzáadása</string>
+  <string name="add_habit">Szokás hozzáadása</string>
+  <string name="add_daily">Napi feladat hozzáadása</string>
+  <string name="add_todo">Tennivaló hozzáadása</string>
+  <string name="add_reward">Jutalom hozzáadása</string>
+  <string name="all_dailies_completed">Az összes napi feladatodat teljesítetted! Szép munka!</string>
+  <string name="widget_dailies">Habitica napi feladatok</string>
+  <string name="widget_todo_list">Habitica Tennivaló Lista</string>
+  <string name="widget_add_task">Habitica feladat hozzáadása</string>
+  <string name="gem.purchase.toolbartitle">Vásárlás</string>
+  <string name="support_habitica">Habitica támogatása</string>
+  <string name="open_market">Piac megnyitása</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">VIszlát holnap!</string>
+  <string name="has_reminder">Van emlékeztetője</string>
+  <string name="has_tag">Van címkéje</string>
+  <string name="active">Aktív</string>
+  <string name="current_bonuses">Jelenlegi bónuszok</string>
+  <string name="current_hourclasses">Jelenlegi misztikus homokórák</string>
+  <string name="inactive">Inaktív</string>
+  <string name="challenge_details">Kihívás részletei</string>
+  <string name="challenge_leave_title">Kihívás elhagyása</string>
+  <string name="challenge_remove_tasks_title">Feladatok eltávoltása</string>
+  <string name="challenge_remove_tasks_text">Biztosan el akarod távolítani a feladatokat?</string>
+  <string name="remove_tasks">Eltávolítás</string>
+  <string name="keep_tasks">Megtartás</string>
+  <string name="my_challenges">Kihívásaim</string>
+  <string name="public_challenges">Nyilvános</string>
+  <string name="challenges">Kihívások</string>
+  <string name="daily">Napi feladat</string>
+  <string name="habit">Szokás</string>
+  <string name="reward">Jutalom</string>
+  <string name="todo">Teendő</string>
+  <string name="official">Hivatalos</string>
+  <string name="challenge">Kihívás</string>
+  <string name="not_part_of_a_challenge">Jelenleg nem veszel részt egy kihívásban sem.</string>
+  <string name="add_reminder">Emlékeztető hozzáadása</string>
+  <string name="warning">Figyelmeztetés</string>
+  <string name="open_settings">Beállítások megnyitása</string>
+  <string name="FAQ">Gyakran Ismételt Kérdések</string>
+  <string name="gem_shop">Drágakő</string>
+  <string name="filters">Szűrők</string>
+  <string name="done">Kész</string>
+  <string name="group_tasks_edit_description">A csoportos feladatokat nem tudod szerkeszteni.</string>
+  <string name="group_tasks_edit_title">Ezt a feladatot nem tudod szerkeszteni.</string>
+  <string name="groups">Csoportok</string>
+  <string name="all">Mind</string>
+  <string name="owned">Saját</string>
+  <string name="login_btn_fb">Bejelentkezés Facebookkal</string>
+  <string name="login_btn_google">Bejelentkezés Google-vel</string>
+  <string name="action_back">Vissza</string>
+  <string name="randomize">Véletlenszerű</string>
+  <string name="avatar_extras">Extrák</string>
+  <string name="avatar_skin_color">Testszín</string>
+  <string name="avatar_hair_color">Hajszín</string>
+  <string name="avatar_hair_bangs">Frufru</string>
+  <string name="avatar_hair_ponytail">Copf</string>
+  <string name="avatar_glasses">Szemüveg</string>
+  <string name="avatar_wheelchair">Kerekesszék</string>
+  <string name="weak">Gyenge</string>
+  <string name="strong">Erős</string>
+  <string name="gray">Szürke</string>
+  <string name="completed">Teljesítve</string>
+  <string name="setuP_group_other">Egyéb</string>
+  <string name="empty_title_habits">Nincsenek szokásaid</string>
+  <string name="empty_title_dailies">Nincsenek napi feladataid</string>
+  <string name="empty_title_todos">Nincsenek Teendőid</string>
+  <string name="save">Mentés</string>
+  <string name="tasks">Feladatok</string>
+  <string name="inn">Fogadó</string>
+  <string name="system">Rendszer</string>
+  <string name="pending">Függőben</string>
+  <string name="accepted">Elfogadva</string>
+  <string name="declined">Visszautasítva</string>
+  <string name="participants">Résztvevők</string>
+  <string name="invitations">Meghívók</string>
+</resources>
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
new file mode 100755
index 000000000..326bccd33
--- /dev/null
+++ b/Habitica/res/values-id/strings.xml
@@ -0,0 +1,705 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Muat Ulang</string>
+  <string name="XP_default">Pengalaman </string>
+  <string name="HP_default">Nyawa</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 Penggunamu</string>
+  <string name="SP_APIToken_title">Token API</string>
+  <string name="SP_APIToken_summary">Token API-mu</string>
+  <string name="Language_title">Bahasa</string>
+  <string name="Language_summary">Ganti bahasa dalam Habitica</string>
+  <string name="SP_user_qr_code">Kode QR-mu</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">Pengingat Harian</string>
+  <string name="pref_reminder_checkbox">Aktifkan Pengingat</string>
+  <string name="pref_reminder_picker">Atur Waktu Pengingat</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 Pengguna</string>
+  <string name="push_notifications">Notifikasi</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">Mendapat Hadiah Permata</string>
+  <string name="preference_push_gifted_subscription">Mendapat Hadiah Langganan</string>
+  <string name="preference_push_invited_to_party">Diundang ke Party</string>
+  <string name="preference_push_invited_to_guild">Diundang ke Guild</string>
+  <string name="preference_push_your_quest_has_begun">Misimu telah Dimulai</string>
+  <string name="preference_push_invited_to_quest">Diundang ke dalam Misi</string>
+  <!--Adding tasks-->
+  <string name="task_value">Nilai</string>
+  <string name="new_todo">To-Do 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">Nama Pengguna</string>
+  <string name="email_username">Email atau Nama Pengguna</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 akunmu</string>
+  <string name="account_details">Detail Akun</string>
+  <string name="LoginActivityName">Selamat Datang</string>
+  <string name="string_revive">Pulihkan</string>
+  <string name="please_connect">Silakan hubungkan melalui aplikasi sebelum menggunakan widget</string>
+  <string name="about.title">Tentang Kami</string>
+  <string name="about.libraries">Pustaka</string>
+  <string name="about.versionhistory">Riwayat 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>
+  <string name="repeatEvery">Ulangi Setiap</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Koneksi Gagal</string>
+  <string name="network_error_no_network_body">Kamu 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">Nama Pengguna dan/atau Kata Sandi salah.</string>
+  <string name="login_validation_error_title">Validasi Gagal</string>
+  <string name="login_validation_error_fieldsmissing">Kamu 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">Trivial</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">Daftar Cek</string>
+  <string name="reminders">Pengingat</string>
+  <string name="actions">Aksi</string>
+  <string name="attributes">Atribut</string>
+  <string name="physical">Kekuatan</string>
+  <string name="mental">Kecerdasan</string>
+  <string name="social">Ketahanan</string>
+  <string name="other">Persepsi</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="repeatables_summary_title">Ringkasan</string>
+  <string name="repeatables_title">Ulangi</string>
+  <string name="repeatables_on_title">Ulangi pada</string>
+  <string name="repeatables_frequency_daily">Harian</string>
+  <string name="repeatables_frequency_weekly">Mingguan</string>
+  <string name="repeatables_frequency_monthly">Bulanan</string>
+  <string name="repeatables_frequency_yearly">Tahunan</string>
+  <string name="repeatables_frequency_day_of_month">Hari pada Bulan</string>
+  <string name="repeatables_frequency_day_of_week">Hari pada Minggu</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_button">Hore!</string>
+  <string name="faint_subtitle">Jangan bersedih!</string>
+  <string name="faint_header">Kamu kehabisan Nyawa!</string>
+  <string name="faint_button">Isi ulang Nyawa &amp; Ulang Lagi</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Gambar Profil</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
+  <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
+  <string name="new_checklist_item">item cek baru</string>
+  <string name="add_checklist_item">Tambahkan</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 party. Untuk bergabung dengan party, silakan kunjungi situs.</string>
+  <string name="forgot_pw_btn">Lupa Kata Sandi</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">Tutup</string>
+  <string name="party">Party</string>
+  <string name="chat">Obrolan</string>
+  <string name="members">Anggota</string>
+  <string name="habits">Kebiasaan</string>
+  <string name="dailies">Keseharian</string>
+  <string name="todos">To-Do</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 menghapusnya?</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">Biasa</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 Item</string>
+  <string name="purchase_set_button">Buka set seharga %d permata</string>
+  <string name="purchase_button">Beli</string>
+  <string name="purchase_set_title">Beli set %s</string>
+  <string name="due_date">Tenggat Waktu</string>
+  <string name="quest.accept">Terima</string>
+  <string name="quest.reject">Tolak</string>
+  <string name="quest.begin">Mulai Misi</string>
+  <string name="quest.cancel">Batalkan Undangan</string>
+  <string name="quest.abort">Batalkan Misi</string>
+  <string name="quest.leave">Tinggalkan Misi</string>
+  <string name="quest.pending">Menunggu</string>
+  <string name="quest.accepted">Diterima</string>
+  <string name="quest.rejected">Ditolak</string>
+  <string name="quest.participants">Partisipan</string>
+  <string name="version_info">Versi %1$s (%2$d)</string>
+  <string name="sidebar_help">Bantuan &amp; FAQ</string>
+  <string name="complete_tutorial">Aku mengerti!</string>
+  <string name="dismiss_tutorial">Ingatkan aku lagi</string>
+  <string name="intro_1_subtitle">Selamat datang di</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Ini saatnya untuk bersenang-senang sambil benar-benar menyelesaikan urusan-urusanmu. Bergabunglah dengan lebih dari %s orang yang memperbaiki aspek hidup mereka satu demi satu.</string>
+  <string name="intro_2_subtitle">Berkembang di dalam game</string>
+  <string name="intro_2_title">Berkembang di kehidupan nyata</string>
+  <string name="intro_2_description">Buka fitur dalam game dengan mengerjakan tugasmu di dunia nyata. Dapatkan baju, peliharaan, dan banyak lagi sebagai hadiahmu mencapai tujuan!</string>
+  <string name="intro_3_subtitle">Bertarung dengan monster</string>
+  <string name="intro_3_title">Menjadi lebih sosial</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">Mari 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">Jadi, kamu mau terlihat seperti apa? Jangan khawatir, kamu bisa mengubahnya lagi nanti.</string>
+  <string name="task_setup_description">Bagus! Sekarang, apa yang menurutmu menarik untuk kamu kembangkan dalam pengembaraan ini?</string>
+  <string name="setup_group_work">Pekerjaan</string>
+  <string name="setup_group_exercise">Olahraga</string>
+  <string name="setup_group_health">Kesehatan</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">Stretching</string>
+  <string name="setup_task_exercise_3">Atur jadwal olahraga</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">Kabari tim mengenai status terbaru</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 kerajinan tangan</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\nDengan permata kamu dapat membeli hal-hal 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 pekerjaan 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">Guild-ku</string>
+  <string name="public_guilds">Guild Publik</string>
+  <string name="guild">Guild</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 To-Do</string>
+  <string name="send_pm">Kirim PM</string>
+  <string name="flag">Laporkan</string>
+  <string name="delete">Hapus</string>
+  <string name="name">Nama </string>
+  <string name="description">Deskripsi</string>
+  <string name="add_tag">Tambahkan Label baru</string>
+  <string name="privacy">Privasi</string>
+  <string name="write_message">Tulis Pesan</string>
+  <string name="post">Kirim</string>
+  <string name="guild_search_hint">Cari guild</string>
+  <string name="todo_due">Tenggat: %s</string>
+  <string name="daily_streak">jumlah runtunan: %d</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">Aksesori 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? Hanya %1$d dari %2$d anggota Party-mu yang sudah ikut misi ini! Misi dimulai secara otomatis ketika semua pemain telah ikut atau menolak undangannya.</string>
+  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
+  <string name="today">Hari Ini</string>
+  <string name="sidebar_items">Item</string>
+  <string name="eggs">Telur</string>
+  <string name="hatching_potions">Ramuan Penetas</string>
+  <string name="food">Makanan</string>
+  <string name="quests">Misi</string>
+  <string name="pets">Peliharaan</string>
+  <string name="mounts">Tunggangan</string>
+  <string name="armoireEquipment">Kamu menemukan Perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
+  <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
+  <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
+  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan Perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
+  <string name="armoireLastItem">Kamu menemukan Perlengkapan terakhir di dalam Peti Harta Karun.</string>
+  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki Perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
+  <string name="sell">Jual (%d Emas)</string>
+  <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
+  <string name="feed_to_pet">Beri makan peliharaan</string>
+  <string name="hatch_egg">Tetaskan dengan telur</string>
+  <string name="invite_party">Undang party</string>
+  <string name="dialog_feeding">Beri makan %2$s %1$s dengan:</string>
+  <string name="use_animal">Gunakan</string>
+  <string name="feed">Beri makan</string>
+  <string name="hatch_with">Tetaskan dengan %s</string>
+  <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
+  <string name="close">Tutup</string>
+  <string name="share">Bagikan</string>
+  <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s!</string>
+  <string name="notification_purchase">%s telah dibeli</string>
+  <string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Ramuan Ajaib</string>
+  <string name="sectionquestPets">Misi</string>
+  <string name="sectionspecialPets">Langka</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Ramuan Ajaib</string>
+  <string name="sectionquestMounts">Misi</string>
+  <string name="sectionspecialMounts">Langka</string>
+  <string name="world_quest">Misi Dunia</string>
+  <string name="inn_description">Perlu istirahat? Masuk ke dalam Penginapan Daniel untuk sementara menghentikan mekanika game Habitica yang lebih susah:\n\n
+• Keseharian yang terlewat tidak akan menyakitimu\n
+• Tugas tidak akan putus runtunannya atau berkurang warnanya\n
+• Boss tidak akan menyerangmu untuk Keseharian yang terlewat\n
+• Damage-mu kepada Boss atau item misi mengumpulkanmu akan tetap menunggu hingga kamu keluar</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">Warrior</string>
+  <string name="rogue">Rogue</string>
+  <string name="mage">Mage</string>
+  <string name="healer">Healer</string>
+  <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
+  <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
+  <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
+  <string name="select_class">Pilih Profesi</string>
+  <string name="opt_out_class">Matikan Fitur</string>
+  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
+  <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
+  <string name="class_changed">Kamu sekarang seorang %s! </string>
+  <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
+  <string name="choose_class">Pilih Kelas</string>
+  <string name="dialog_go_back">Kembali</string>
+  <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
+  <string name="change_class">Ganti profesi</string>
+  <string name="change_class_description">Ubah kelasmu dan terima kembali poin atribut seharga 3 Permata.</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">Aku mencapai level %d di Habitica dengan memperbaiki kebiasaanku di kehidupan nyata!</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 punya pesan apapun. Kamu bisa mengirim pesan baru ke pengguna lain dari obrolan publik mereka!</string>
+  <string name="party_invite">Buka dengan mengundang teman</string>
+  <string name="login_incentive">Buka dengan cara login ke Habitica secara teratur</string>
+  <string name="create_account">Buka dengan membuat sebuah akun</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 dibeli</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 To-Do 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>
+  <string name="subscribe.title">Berlangganan mendukung para pengembang dan membantu menjaga Habitica terus berjalan</string>
+  <string name="subscribe_prompt">Jadilah seorang pelanggan dan kamu akan mendapat keuntungan berikut:</string>
+  <string name="subscribe.listitem1">Beli permata dengan koin emas</string>
+  <string name="subscribe.listitem2">Item bulanan eksklusif</string>
+  <string name="subscribe.listitem3">Simpan lebih banyak riwayat masukan</string>
+  <string name="subscribe.listitem4">Batas drop harian didobel</string>
+  <string name="subscriptions">Langganan</string>
+  <string name="subscription_duration">Berulang setiap %s</string>
+  <string name="subscribe">Berlangganan</string>
+  <string name="subscribe.listitem1.description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
+  <string name="subscribe.listitem2.description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
+  <string name="subscribe.listitem3.description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
+  <string name="subscribe.listitem4.description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
+  <string name="subscription_hourglasses">+%d Jam Pasir Mistis</string>
+  <string name="payment_method">Metode Pembayaran</string>
+  <string name="subscription">Langganan</string>
+  <string name="active">Aktif</string>
+  <string name="cancel_subscription">Batalkan Langganan</string>
+  <string name="cancel_subscription_google.description">Tidak mau berlangganan lagi? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagin \"Aplikasi Saya\" dari Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Tidak mau berlangganan lagi? Karena metode pembayaranmu, kamu hanya bisa berhenti berlangganan dari situs Habitica. Klik tombol di bawah, untuk membuka situs Habitica di browsermu!</string>
+  <string name="visit_habitica_website">Kunjungi Situs Habitica</string>
+  <string name="current_bonuses">Bonus Sekarang</string>
+  <string name="months_subscribed">Bulan Berlangganan</string>
+  <string name="current_hourclasses">Jam Pasir Mistis Sekarang</string>
+  <string name="monthly_gem_cap">Batas permata bulanan</string>
+  <string name="inactive">Tidak aktif</string>
+  <string name="one_month">1 Bulan</string>
+  <string name="months">%d Bulan</string>
+  <string name="month">bulan</string>
+  <string name="three_months">3 bulan</string>
+  <string name="six_months">6 bulan</string>
+  <string name="twelve_months">12 bulan</string>
+  <string name="subscribe_prompt_thanks">Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut:</string>
+  <string name="subscription_status">Status Langganan</string>
+  <string name="byLeader">oleh %s</string>
+  <string name="challenge_details">Detail Tantangan</string>
+  <string name="challenge_leave_title">Tinggalkan Tantangan</string>
+  <string name="challenge_leave_text">Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Hapus tugas</string>
+  <string name="challenge_remove_tasks_text">Apakah kamu mau menghapus tugas ini?</string>
+  <string name="remove_tasks">Hapus</string>
+  <string name="keep_tasks">Simpan</string>
+  <string name="my_challenges">Tantangan Saya</string>
+  <string name="public_challenges">Publik</string>
+  <string name="challenges">Tantangan</string>
+  <string name="daily">Keseharian</string>
+  <string name="habit">Kebiasaan</string>
+  <string name="reward">Hadiah</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Resmi</string>
+  <string name="participating">Berpartisipasi</string>
+  <string name="challenge">Tantangan</string>
+  <string name="go_to_challenge">Pergi ke Tantangan</string>
+  <string name="not_part_of_a_challenge">Kamu tidak mengambil bagian dalam Tantangan apapun saat ini!</string>
+  <string name="join_a_challenge">Ikut sebuah tantangan untuk menambahkan sekumpulan tugas yang telah didesain secara khusus, lalu bersainglah dengan sesama Habitican untuk memenangkan sebuah pencapaian dan bahkan permata!</string>
+  <string name="check_the_public_challenge_tab">Tekan tab \"Publik\" untuk menemukan Tantangan buatan pengguna yang paling cocok untukmu!</string>
+  <string name="add_reminder">Tambahkan Pengingat</string>
+  <string name="warning">Peringatan</string>
+  <string name="open_settings">Buka Pengaturan</string>
+  <string name="dont_keep_activities_warning">Sepertinya kamu mengaktifkan opsi PEngembang \\"Jangan menyimpan Aktifitas\\". Saat ini opsi ini menyebabkan isu dengan aplikasi Habitica, jadi kami sarankan untuk menonaktifkannya.</string>
+  <string name="inbox">Pesan</string>
+  <string name="FAQ">Pertanyaan yang Sering Ditanyakan</string>
+  <string name="special">Spesial</string>
+  <string name="gem_for_gold_description">Karena kamu berlangganan Habitica, kamu bisa membeli sejumlah Permata setiap bulan menggunakan Koin Emas.</string>
+  <string name="limited_count">%d tersisa</string>
+  <string name="gem_shop">Permata</string>
+  <string name="mystery_item">Item Misterius</string>
+  <string name="myster_item_notes">Setiap bulan, pelanggan akan menerima sebuah item misterius. Ini biasanya dirilis sekitar seminggu sebelum akhir bulan.</string>
+  <string name="open">Buka</string>
+  <string name="notification_mystery_item">Kamu membuka kotak ini dan menemukan %s!</string>
+  <string name="checkInRewardEarned">Kamu mendapatkan %1$s sebagai hadiah untuk kesetiaanmu untuk memperbaiki hidupmu.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Hadiahmu selanjutnya akan terbuka setelah %1$d kali Cek In</string>
+  <string name="pending_approval">menunggu persetujuan</string>
+  <string name="filters">Filter</string>
+  <string name="done">Selesai</string>
+  <string name="group_tasks_edit_description">Tugas grup tidak bisa disunting.</string>
+  <string name="group_tasks_edit_title">Tidak bisa menyunting tugas ini</string>
+  <string name="groups">Grup</string>
+  <string name="all">Semua</string>
+  <string name="none">Tidak Ada</string>
+  <string name="owned">Dimiliki</string>
+  <string name="not_owned">Tidak Dimiliki</string>
+  <string name="new_game">Permainan\nBaru</string>
+  <string name="login_btn_fb">Login dengan Facebook</string>
+  <string name="login_btn_google">Login dengan Google</string>
+  <string name="action_back">Kembali</string>
+  <string name="randomize">Sembarang</string>
+  <string name="avatar_extras">Tambahan</string>
+  <string name="avatar_skin_color">Warna Kulit</string>
+  <string name="avatar_hair_color">Warna Rambut</string>
+  <string name="avatar_hair_bangs">Poni</string>
+  <string name="avatar_hair_ponytail">Kucir</string>
+  <string name="avatar_glasses">Kacamata</string>
+  <string name="avatar_wheelchair">Kursi Roda</string>
+  <string name="weak">Lemah</string>
+  <string name="strong">Kuat</string>
+  <string name="gray">Abu-Abu</string>
+  <string name="dated">Terjadwal</string>
+  <string name="completed">Selesai</string>
+  <string name="setuP_group_other">Lainnya</string>
+  <string name="clear">Hapus</string>
+  <string name="empty_title_habits">Kamu tidak punya Kebiasaan apapun</string>
+  <string name="empty_description_habits">Kebiasaan adalah tugas yang tidak memerlukan jadwal ketat. Kamu bisa menyelesaikannya beberapa kali sehari, atau tidak sama sekali.</string>
+  <string name="empty_title_dailies">Kamu tidak punya Keseharian apapun</string>
+  <string name="empty_description_dailies">Keseharian adalah tugas yang berulang setiap waktu tertentu secara teratur. Pilih jadwal yang bekerja untukmu!</string>
+  <string name="empty_title_todos">Kamu tidak punya To-Do apapun</string>
+  <string name="empty_description_todos">To-Do adalah tugas yang hanya perlu diselesaikan sekali. Tambahkan ceklis kepada To-Do-mu untuk meningkatkan harganya.</string>
+  <string name="empty_title_rewards">Kamu tidak punya Hadiah apapun</string>
+  <string name="reset_walkthrough">Ulang Panduan Justin</string>
+  <string name="read_community_guidelines">Tolong baca Pedoman Komunitas kami sebelum posting</string>
+  <string name="maintenance">Perbaikan</string>
+  <string name="reload_content">Muat Ulang Isi</string>
+  <string name="dailyDueDefaultView">Atur Keseharian secara otomatis di tab \'harus dikerjakan\'</string>
+  <string name="dailyDueDefaultViewDescription">Dengan opsi ini dipilih, tugas Keseharianmu akan secara otomatis di tab \'harus dikerjakan\' dan bukan \'semua\'</string>
+  <string name="repeat_summary">Diulang %1$s setiap %2$s%3$s%4$s</string>
+  <string name="no_billing_gems">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau membeli permata.</string>
+  <string name="no_billing_subscriptions">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau berlangganan.</string>
+  <string name="save">Simpan</string>
+  <string name="location">Lokasi</string>
+  <string name="tasks">Tugas</string>
+  <string name="challenge_create_error_enough_gems">Kamu tidak punya cukup Permata untuk membuat sebuah Tantangan.</string>
+  <string name="challenge_create_error_no_tasks">Kamu perlu menambah setidaknya sebuah tugas untuk membuat Tantangan ini.</string>
+  <string name="challenge_create_error_title">Kamu perlu sebuah judul untuk membuat Tantangan ini.</string>
+  <string name="description_optional">Deskripsi (tidak wajib)</string>
+  <string name="new_challenge_title">Judul tantangan baru</string>
+  <string name="ownership">Kepemilikan</string>
+  <string name="inn">Penginapan</string>
+  <string name="system">Sistem</string>
+  <string name="start_quest">Mulai Misi Baru</string>
+  <string name="leave_party">Tinggalkan Party</string>
+  <string name="party_description">Deskripsi Party</string>
+  <string name="abort_confirmation">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
+  <string name="leave_quest_confirmation">Apakah kamu yakin ingin meninggalkan misi aktif ini? Semua progres misimu akan hilang.</string>
+  <string name="number_participants">%1$d Partisipan</string>
+  <string name="welcome_back">Selamat Datang Kembali</string>
+  <string name="yesterdaililes_prompt">Apakah kamu melakukan Keseharian berikut ini kemarin?</string>
+  <string name="start_day">Mulai Hariku</string>
+  <string name="leave_party_confirmation">Apakah kamu yakin ingin meninggalkan Party ini?</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Hadiah selanjutnya setelah %d kali Cek In</string>
+  <string name="pending">Menunggu</string>
+  <string name="accepted">Menerima</string>
+  <string name="declined">Menolak</string>
+  <string name="participants">Partisipan</string>
+  <string name="invitations">Undangan</string>
+  <string name="quest_leader_header" formatted="false">Dimulai oleh %s</string>
+  <string name="quest_abort_message">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
+  <string name="reloading_content">Memuat Ulang Isi</string>
+  <string name="thousand_abbrev">rb</string>
+  <string name="million_abbrev">jt</string>
+  <string name="billion_abbrev">mil</string>
+  <string name="your_balance">Saldomu:</string>
+  <string name="available_until" formatted="false">Tersedia hingga %s</string>
+  <string name="gems_left_max" formatted="false">Permata Bulanan: %1$d/%2$d Tersisa</string>
+  <string name="gems_left_nomax" formatted="false">Permata Bulanan: %d Tersisa</string>
+  <string name="health">Nyawa</string>
+  <string name="collect">Kumpulkan</string>
+  <string name="rage_meter">Tingkat Kemarahan</string>
+  <string name="boss_quest">Misi Boss</string>
+  <string name="collection_quest">Misi Mengumpulkan</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d poin Pengalaman</string>
+  <string name="gold_reward" formatted="false">%d Koin Emas</string>
+  <string name="quest_owner_rewards">Hadiah Pemilik Misi</string>
+  <string name="str_abbrv">Kek</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Kec</string>
+  <string name="con_abbrv">Ket</string>
+  <string name="reset_account">Reset Akun</string>
+  <string name="delete_account">Hapus Akun</string>
+  <string name="delete_account_description">Apakah kamu yakin? Ini akan menghapus akunmu untuk selamanya, dan tidak akan bisa dikembalikan! Kamu perlu mendaftarkan akun baru untuk menggunakan Habitica lagi. Permata di bank atau yang telah digunakan tidak akan diuangkan kembali. Jika kamu sepenuhnya yakin, ketik kata sandimu di kotak teks di bawah.</string>
+  <string name="reset_account_confirmation">reset akun-ku</string>
+  <string name="delete_account_confirmation">hapus akunku</string>
+  <string name="danger_zone">Zona Berbahaya</string>
+  <string name="nevermind">Tidak jadi</string>
+  <string name="resetting_account">Me-reset Akun</string>
+  <string name="deleting_account">Menghapus Akun</string>
+  <string name="insufficientGold">Kamu perlu menyelesaikan lebih banyak tugas sebelum bisa membeli item ini!</string>
+  <string name="insufficientGems">Kamu perlu lebih banyak Permata untuk membeli item ini!</string>
+  <string name="purchase_gems">Beli permata</string>
+  <string name="insufficientHourglasses">Kamu perlu lebih banyak Jam Pasir Mistis untuk membeli item ini!</string>
+  <string name="get_hourglasses">Dapatkan jam pasir</string>
+  <string name="subscribe_for_hourglasses">Berlangganan untuk Jam Pasir</string>
+  <string name="timetravelers_closed_description">Dapatkan satu Jam Pasir Mistis setiap tiga bulan berturut-turut kamu berlangganan, lalu gunakan untuk membuka item-item edisi terbatas, peliharaan, dan tunggangan dari masa lalu... dan masa depan!</string>
+  <string name="want_to_subscribe">Aku mau Berlangganan</string>
+  <string name="seasonal_closed_description">Grand Gala diadakan dekat dengan titik balik matahari dan ekuinoks, jadi cek kembali nanti untuk menemukan sekumpulan seru item musiman yang spesial!</string>
+  <string name="come_back_soon">Datang kembali nanti!</string>
+  <string name="level">Level</string>
+  <string name="streak_label">Rentetan 21 Hari</string>
+  <string name="stats">Status</string>
+  <string name="fix_character_description">Jika kamu menemukan sebuah gangguan atau melakukan kesalahan yang mengubah karaktermu secara tidak adil, kamu bisa memperbaiki angka-angka tersebut secara manual di sini.</string>
+  <string name="fix_character_values">Atur Angka Karakter</string>
+  <string name="saving">Menyimpan</string>
+  <string name="forgot_password_title">Email sebuah Tautan Mengatur Ulang Kata Sandi</string>
+  <string name="forgot_password_description">Masukan alamat email yang kamu gunakan untuk mendaftarkan akun Habitica-mu.</string>
+  <string name="forgot_password_confirmation">Jika kami punya data email-mu, instruksi untuk mengatur kata sandi baru telah dikirim ke email-mu.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Sunting profil publikmu.</string>
+  <string name="display_name">Nama Tampilan</string>
+  <string name="photo_url">Tautan Foto</string>
+  <string name="login_name">Nama Login</string>
+  <string name="about">Tentang</string>
+  <string name="app_settings">Pengaturan Aplikasi</string>
+  <string name="authentication">Autentikasi</string>
+  <string name="authentication_summary">Ganti opsi autentikasi-mu.</string>
+  <string name="change_password">Ganti Kata Sandi</string>
+  <string name="change_email">Ganti Alamat Email</string>
+  <string name="change_login_name">Ganti Nama Login</string>
+  <string name="change">Ganti</string>
+  <string name="character_level">Level Karakter</string>
+  <string name="auto_allocate_points">Pembagian Poin Otomatis</string>
+  <string name="stat_guide">Panduan Status</string>
+  <string name="character_build">Bentuk Tubuh Karakter</string>
+  <string name="character_build_description">Setiap level memberimu sebuah poin untuk ditaruh kepada sebuah atribut pilihanmu. Kamu bisa melakukannya secara manual, atau biarkan game ini mengaturnya untukmu menggunakan salah satu opsi Pembagian Otomatis.</string>
+  <string name="strength">Kekuatan</string>
+  <string name="strength_description">Meningkatkan bonus dari serangan kritikal dan buat itu lebih sering terjadi sewaktu menyelesaikan tugas. Juga meningkatkan damage yang kamu lakukan kepada boss.</string>
+  <string name="intelligence">Kecerdasan</string>
+  <string name="intelligence_description">Meningkatkan EXP yang dihasilkan dari menyelesaikan tugas. Juga meningkatkan batas mana-mu dan seberapa cepat mana bertambah dari waktu ke waktu.</string>
+  <string name="constitution">Ketahanan</string>
+  <string name="constitution_description">Mengurangi jumlah damage yang kamu terima dari tugasmu. Tidak mengurangi damage yang diterima dari boss.</string>
+  <string name="perception">Persepsi</string>
+  <string name="perception_description">Meningkatkan kecenderungan untuk menemukan item sewaktu menyelesaikan Tugas, batas drop harian, Bonus Rentetan, dan jumlah koin emas yang dihadiahkan dari Tugas.</string>
+  <string name="buffs">Buff</string>
+  <string name="allocated">Teralokasi</string>
+  <string name="distribute_evenly">Bagikan Merata</string>
+  <string name="distribute_class">Bagikan berdasarkan pekerjaan</string>
+  <string name="distribute_task">Bagikan berdasarkan aktifitas tugas</string>
+  <string name="no_points_to_allocate">Tidak ada Poin untuk Dibagikan</string>
+  <string name="points_to_allocate" formatted="false">%d Poin untuk Dibagikan</string>
+  <string name="distribute_evenly_help">Bagikan jumlah poin yang sama kepada setiap atribut.</string>
+  <string name="distribute_class_help">Bagikan lebih banyak poin kepada atribut yang penting untuk Pekerjaanmu.</string>
+  <string name="distribute_task_help">Bagikan poin berdasarkan kepada kategori Kekuatan, Kecerdasan, Ketahanan, dan Persepsi yang dihubungkan kepada tugas yang kamu selesaikan.</string>
+  <string name="allocating_points">Membagikan Poin</string>
+  <string name="class_equipment">Perlengkapan</string>
+  <string name="equipment_empty">Kamu sudah punya semua perlengkapan! Lebih banyak lagi tersedia sewaktu Grand Gala, dekat titik balik matahari dan ekuinoks.</string>
+  <string name="classless">Tanpa Pekerjaan</string>
+  <string name="class_equipment_shop_dialog">Item ini hanya tersedia untuk pekerjaan tetentu. \nKamu bisa menggantu pekerjaanmu dari Pengaturan.</string>
+  <string name="class_gear_disclaimer">Kamu hanya bisa membeli perlengkapan untuk pekerjaanmu yang sekarang</string>
+  <string name="available_stats" formatted="false">%d poin</string>
+  <string name="toogle_emojis">Atur Emoji</string>
+  <string name="tavern_description">Selamat datang di Penginapan! Tarik kursi dan mari mengobrol, atau beristirahat dari tugas-tugasmu.</string>
+  <string name="check_into_inn">Masuk ke Penginapan</string>
+  <string name="community_guidelines">Pedoman Komunitas</string>
+  <string name="view_community_guidelines">Lihat Pedoman Komunitas</string>
+  <string name="guidelines_description">Habitica coba membuat sebuah lingkungan yang ramah untuk pengguna segala usia dan latar belakang, khususnya di tempat umum seperti Kedai Minuman. Jika kamu ada pertanyaan, silahkan periksa pedoman kami.</string>
+  <string name="helpful_links">Tautan Berguna</string>
+  <string name="view_faq">Lihat FAQ</string>
+  <string name="report_bug">Laporkan Gangguan</string>
+  <string name="player_tiers">Tingkatan Pemain</string>
+  <string name="staff_moderators">Staf dan Moderator</string>
+  <string name="navigation_drawer_open">Buka laci navigasi</string>
+  <string name="navigation_drawer_close">Tutup laci navigasi</string>
+  <string name="world_boss">Bos Dunia</string>
+  <string name="world_boss_art">Seni Bos</string>
+  <string name="boss_art">Seni Bos</string>
+  <string name="world_boss_description">Deskripsi Bos Dunia</string>
+  <string name="rage_strike_count" formatted="false">Tingkat Kemarahan 1%d/1%d</string>
+  <string name="pending_strike_description">Serangan ini belum terjadi!\nWorld Boss akan mengamuk dan menyerang salah satu dari penjaga toko bersahabat kita sewaktu tingkat kemarahannya telah penuh. Kerjakan sebanyak mungkin Keseharian-mu untuk mencoba mencegah serangan itu!</string>
+  <string name="pending_strike_title">Serangan Tertunda</string>
+  <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</string>
+  <string name="strike_description_subtitle">Ada 3 potensi Serangan peningkat Kemarahan</string>
+  <string name="strike_description_description">Pengukur ini terisi sewaktu Habitican tidak menyelesaikan Keseharian mereka. Sewaktu terisi penuh, sang DysHeartener akan mengerahkan Shattering Heartbreak kepada salah satu dari penjaga toko Habitica, jadi pastikan kamu melakukan tugas-tugasmu!</string>
+  <string name="pending_strike_subtitle">Serangan ini belum terjadi!</string>
+  <string name="strike_active_title" formatted="false">Sang %s telah Diserang!</string>
+  <string name="strike_active_subtitle" formatted="false">%s sekarang Patah Hati!</string>
+  <string name="strike_active_description" formatted="false">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
+  <string name="questShop">Toko Misi</string>
+  <string name="market_owner_long">Alex sang Pedagang</string>
+  <string name="tavern_owner_long">Daniel sang penjaga penginapan</string>
+  <string name="stable_owner_long">Matt sang penguasa hewan buas</string>
+  <string name="hide_boss_art">Sembunyikan Seni Bos</string>
+  <string name="active_world_boss">Bos Dunia aktif</string>
+  <string name="no_party_description">Selesaikan misi bersama teman-temanmu atau sendirian. Bertarung melawan monster, buat Tantangan, dan bantu dirimu untuk tetap bertanggung jawab melalui Party.</string>
+  <string name="no_party_title">Mainkan Habitica dalam Party</string>
+  <string name="join_party_title">Ingin bergabung ke Party?</string>
+  <string name="create_party_website">Buka website untuk membuat Party</string>
+  <string name="id_copied">ID tersalin ke clipboard</string>
+  <string name="insufficientSubscriberGems">Kamu telah membeli semua Permata yang tersedia bulan ini. Lebih banyak akan ditambahkan dalam tiga hari pertama pada setiap bulan. Terima kasih sudah berlangganan!</string>
+  <string name="insufficientSubscriberGemsTitle">Batas Permata Bulanan Telah Tercapai</string>
+</resources>
diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index 66bb7a707..c67620fb4 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tugas</string>
-  <string name="sidebar.skills">Kemampuan</string>
-  <string name="sidebar.section.social">Sosial</string>
-  <string name="sidebar.inbox">Pesan</string>
-  <string name="sidebar.tavern">Kedai Minuman</string>
-  <string name="sidebar.party">Party</string>
-  <string name="sidebar.purchaseGems">Permata &amp; Berlangganan</string>
-  <string name="sidebar.guilds">Guild</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_tasks">Tugas</string>
+  <string name="sidebar_skills">Kemampuan</string>
+  <string name="sidebar_section_social">Sosial</string>
+  <string name="sidebar_inbox">Pesan</string>
+  <string name="sidebar_tavern">Kedai Minuman</string>
+  <string name="sidebar_party">Party</string>
+  <string name="sidebar_purchaseGems">Permata &amp; Berlangganan</string>
+  <string name="sidebar_guilds">Guild</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_about">Tentang Kami</string>
   <string name="sidebar_shops">Toko</string>
   <string name="sidebar_stats">Status</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.tutorial.xml b/Habitica/res/values-in/strings.tutorial.xml
index 1eceff370..9624db2fa 100644
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Beli perlengkapan untuk avatarmu menggunakan koin emas yang kamu dapatkan!</string>
   <string name="tutorial_rewards_2">Kamu juga bisa membuat Hadiah yang benar-benar ada di dunia nyata tergantung apa yang memotivasimu.</string>
   <string name="tutorial_tasks_complete">Itu dulu untuk sekarang. Kalau kamu butuh pengingat, lihat bagian FAQ.</string>
-  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya memengaruhi 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 untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
-  <string name="tutorial_skills">Kemampuan adalah hal spesial yang memiliki efek yang kuat! Ketuk pada kemampuan untuk menggunakannya. Kemampuan akan mengurangi Mana (bar biru), yang bisa kamu dapatkan dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
+    <string name="tutorial_skills">Kemampuan adalah hal spesial yang memiliki efek yang kuat! Ketuk pada kemampuan untuk menggunakannya. Kemampuan akan mengurangi Mana (bar biru), yang bisa kamu dapatkan 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! Di sini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
-  <string name="tutorial_classes">Pilih untuk menjadi Warrior, Mage, Healer, atau Rogue! Setiap pekerjaan memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
-  <string name="tutorial_stats">Ketuk tombol abu-abu untuk mengalokasikan banyak status sekaligus, atau ketuk pada tanda panah untuk menambahkan satu per satu.</string>
+    <string name="tutorial_stats">Ketuk tombol abu-abu untuk mengalokasikan banyak status sekaligus, atau ketuk pada tanda panah untuk menambahkan satu per satu.</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index e86d67dc5..c78445b45 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Pengalaman </string>
   <string name="HP_default">Nyawa</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 Penggunamu</string>
   <string name="SP_APIToken_title">Token API</string>
   <string name="SP_APIToken_summary">Token API-mu</string>
   <string name="Language_title">Bahasa</string>
   <string name="Language_summary">Ganti bahasa dalam Habitica</string>
-  <string name="SP_user_qr_code">Kode QR-mu</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>
@@ -24,7 +20,6 @@
   <string name="pref_reminder_checkbox">Aktifkan Pengingat</string>
   <string name="pref_reminder_picker">Atur Waktu Pengingat</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 Pengguna</string>
   <string name="push_notifications">Notifikasi</string>
   <string name="push_notifications_sum">Pengaturan notifikasi</string>
@@ -37,13 +32,7 @@
   <string name="preference_push_your_quest_has_begun">Misimu telah Dimulai</string>
   <string name="preference_push_invited_to_quest">Diundang ke dalam Misi</string>
   <!--Adding tasks-->
-  <string name="task_value">Nilai</string>
-  <string name="new_todo">To-Do 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">Sunting</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>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Konfirmasi kata sandi</string>
   <string name="logout">Keluar</string>
   <string name="logout_description">Keluar dari akunmu</string>
-  <string name="account_details">Detail Akun</string>
   <string name="LoginActivityName">Selamat Datang</string>
-  <string name="string_revive">Pulihkan</string>
-  <string name="please_connect">Silakan hubungkan melalui aplikasi sebelum menggunakan widget</string>
-  <string name="about.title">Tentang Kami</string>
-  <string name="about.libraries">Pustaka</string>
-  <string name="about.versionhistory">Riwayat 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>
-  <string name="repeatEvery">Ulangi Setiap</string>
+  <string name="about_title">Tentang Kami</string>
+  <string name="about_libraries">Pustaka</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">Kamu 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">Nama Pengguna dan/atau Kata Sandi salah.</string>
   <string name="login_validation_error_title">Validasi Gagal</string>
   <string name="login_validation_error_fieldsmissing">Kamu 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">Sepele</string>
@@ -90,18 +70,7 @@
   <string name="negative_habit_form">Negatif (-)</string>
   <string name="checklist">Daftar Cek</string>
   <string name="reminders">Pengingat</string>
-  <string name="actions">Aksi</string>
   <string name="attributes">Atribut</string>
-  <string name="physical">Kekuatan</string>
-  <string name="mental">Kecerdasan</string>
-  <string name="social">Ketahanan</string>
-  <string name="other">Persepsi</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="repeatables_summary_title">Ringkasan</string>
-  <string name="repeatables_title">Ulangi</string>
-  <string name="repeatables_on_title">Ulangi pada</string>
   <string name="repeatables_frequency_daily">Harian</string>
   <string name="repeatables_frequency_weekly">Mingguan</string>
   <string name="repeatables_frequency_monthly">Bulanan</string>
@@ -120,23 +89,14 @@
   <string name="faint_header">Kamu kehabisan Nyawa!</string>
   <string name="faint_button">Isi ulang Nyawa &amp; Ulang Lagi</string>
   <string name="filter">Filter</string>
-  <string name="profile_image">Gambar Profil</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
   <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
   <string name="new_checklist_item">item cek baru</string>
-  <string name="add_checklist_item">Tambahkan</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 party. Untuk bergabung dengan party, silakan kunjungi situs.</string>
   <string name="forgot_pw_btn">Lupa Kata Sandi</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">Tutup</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">Tutup</string>
   <string name="party">Party</string>
   <string name="chat">Obrolan</string>
   <string name="members">Anggota</string>
@@ -144,8 +104,6 @@
   <string name="dailies">Keseharian</string>
   <string name="todos">To-Do</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 menghapusnya?</string>
   <string name="yes">Ya</string>
   <string name="no">Tidak</string>
   <string name="quest">Misi</string>
@@ -153,14 +111,12 @@
   <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">Biasa</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>
@@ -170,22 +126,16 @@
   <string name="purchase_button">Beli</string>
   <string name="purchase_set_title">Beli set %s</string>
   <string name="due_date">Tenggat Waktu</string>
-  <string name="quest.accept">Terima</string>
-  <string name="quest.reject">Tolak</string>
-  <string name="quest.begin">Mulai Misi</string>
-  <string name="quest.cancel">Batalkan Undangan</string>
-  <string name="quest.abort">Batalkan Misi</string>
-  <string name="quest.leave">Tinggalkan Misi</string>
-  <string name="quest.pending">Menunggu</string>
-  <string name="quest.accepted">Diterima</string>
-  <string name="quest.rejected">Ditolak</string>
-  <string name="quest.participants">Partisipan</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="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">Ingatkan aku lagi</string>
   <string name="intro_1_subtitle">Selamat datang di</string>
-  <string name="intro_1_title">Habitica</string>
   <string name="intro_1_description">Ini saatnya untuk bersenang-senang sambil benar-benar menyelesaikan urusan-urusanmu. Bergabunglah dengan lebih dari %s orang yang memperbaiki aspek hidup mereka satu demi satu.</string>
   <string name="intro_2_subtitle">Berkembang di dalam game</string>
   <string name="intro_2_title">Berkembang di kehidupan nyata</string>
@@ -194,11 +144,8 @@
   <string name="intro_3_title">Menjadi lebih sosial</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">Mari 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">Jadi, kamu mau terlihat seperti apa? Jangan khawatir, kamu bisa mengubahnya lagi nanti.</string>
   <string name="task_setup_description">Bagus! Sekarang, apa yang menurutmu menarik untuk kamu kembangkan dalam pengembaraan ini?</string>
   <string name="setup_group_work">Pekerjaan</string>
@@ -229,28 +176,19 @@
   <string name="setup_task_creativity_1">Belajar menguasai kerajinan tangan</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\nDengan permata kamu dapat membeli hal-hal 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 pekerjaan 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">Guild-ku</string>
   <string name="public_guilds">Guild Publik</string>
   <string name="guild">Guild</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 To-Do</string>
-  <string name="send_pm">Kirim PM</string>
-  <string name="flag">Laporkan</string>
   <string name="delete">Hapus</string>
   <string name="name">Nama </string>
   <string name="description">Deskripsi</string>
   <string name="add_tag">Tambahkan Label baru</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
-  <string name="post">Kirim</string>
   <string name="guild_search_hint">Cari guild</string>
-  <string name="todo_due">Tenggat: %s</string>
-  <string name="daily_streak">jumlah runtunan: %d</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>
@@ -264,9 +202,7 @@
   <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? Hanya %1$d dari %2$d anggota Party-mu yang sudah ikut misi ini! Misi dimulai secara otomatis ketika semua pemain telah ikut atau menolak undangannya.</string>
-  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
   <string name="today">Hari Ini</string>
   <string name="sidebar_items">Item</string>
   <string name="eggs">Telur</string>
@@ -278,12 +214,8 @@
   <string name="armoireEquipment">Kamu menemukan Perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
   <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
   <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
-  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan Perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
-  <string name="armoireLastItem">Kamu menemukan Perlengkapan terakhir di dalam Peti Harta Karun.</string>
-  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki Perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
   <string name="sell">Jual (%d Emas)</string>
   <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
-  <string name="feed_to_pet">Beri makan peliharaan</string>
   <string name="hatch_egg">Tetaskan dengan telur</string>
   <string name="invite_party">Undang party</string>
   <string name="dialog_feeding">Beri makan %s dengan:</string>
@@ -294,16 +226,7 @@
   <string name="close">Tutup</string>
   <string name="share">Bagikan</string>
   <string name="notification_pet_fed">Kamu memberi makan %s!</string>
-  <string name="notification_purchase">%s telah dibeli</string>
   <string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
-  <string name="sectiondrop">Standard</string>
-  <string name="sectionpremium">Ramuan Ajaib</string>
-  <string name="sectionquest">Misi</string>
-  <string name="sectionspecial">Langka</string>
-  <string name="sectionmounts">Standard</string>
-  <string name="sectionpremiumMounts">Ramuan Ajaib</string>
-  <string name="sectionquestMounts">Misi</string>
-  <string name="sectionspecialMounts">Langka</string>
   <string name="world_quest">Misi Dunia</string>
   <string name="inn_description">Perlu istirahat? Masuk ke dalam Penginapan Daniel untuk sementara menghentikan mekanika game Habitica yang lebih susah:\n\n
 • Keseharian yang terlewat tidak akan menyakitimu\n
@@ -322,7 +245,6 @@
   <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
   <string name="select_class">Pilih Profesi</string>
   <string name="opt_out_class">Matikan Fitur</string>
-  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
   <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
   <string name="class_changed">Kamu sekarang seorang %s! </string>
   <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
@@ -337,12 +259,9 @@
   <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">Aku mencapai level %d di Habitica dengan memperbaiki kebiasaanku di kehidupan nyata!</string>
   <string name="share_hatched">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
@@ -350,8 +269,6 @@
   <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>
@@ -360,36 +277,15 @@
   <string name="party_invite">Buka dengan mengundang teman</string>
   <string name="login_incentive">Buka dengan cara login ke Habitica secara teratur</string>
   <string name="create_account">Buka dengan membuat sebuah akun</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 dibeli</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>
@@ -401,15 +297,14 @@
   <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
   <string name="widget_dailies">Keseharian Habitica</string>
   <string name="widget_todo_list">Daftar To-Do 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="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>
@@ -423,26 +318,26 @@
   <string name="belongs_to_challenge">Milik Tantangan</string>
   <string name="has_reminder">Memiliki Pengingat</string>
   <string name="has_tag">Memiliki Label</string>
-  <string name="subscribe.title">Berlangganan mendukung para pengembang dan membantu menjaga Habitica terus berjalan</string>
+  <string name="subscribe_title">Berlangganan mendukung para pengembang dan membantu menjaga Habitica terus berjalan</string>
   <string name="subscribe_prompt">Jadilah seorang pelanggan dan kamu akan mendapat keuntungan berikut:</string>
-  <string name="subscribe.listitem1">Beli permata dengan koin emas</string>
-  <string name="subscribe.listitem2">Item bulanan eksklusif</string>
-  <string name="subscribe.listitem3">Simpan lebih banyak riwayat masukan</string>
-  <string name="subscribe.listitem4">Batas drop harian didobel</string>
+  <string name="subscribe_listitem1">Beli permata dengan koin emas</string>
+  <string name="subscribe_listitem2">Item bulanan eksklusif</string>
+  <string name="subscribe_listitem3">Simpan lebih banyak riwayat masukan</string>
+  <string name="subscribe_listitem4">Batas drop harian didobel</string>
   <string name="subscriptions">Langganan</string>
   <string name="subscription_duration">Berulang setiap %s</string>
   <string name="subscribe">Berlangganan</string>
-  <string name="subscribe.listitem1.description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
-  <string name="subscribe.listitem2.description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
-  <string name="subscribe.listitem3.description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
-  <string name="subscribe.listitem4.description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
+  <string name="subscribe_listitem1_description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
+  <string name="subscribe_listitem2_description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
+  <string name="subscribe_listitem3_description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
+  <string name="subscribe_listitem4_description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
   <string name="subscription_hourglasses">+%d Jam Pasir Mistis</string>
   <string name="payment_method">Metode Pembayaran</string>
   <string name="subscription">Langganan</string>
   <string name="active">Aktif</string>
   <string name="cancel_subscription">Batalkan Langganan</string>
-  <string name="cancel_subscription_google.description">Tidak ingin berlangganan lagi\? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagian \"Aplikasi Saya\" dari Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Tidak ingin berlangganan lagi\? Karena metode pembayaranmu, kamu hanya bisa berhenti berlangganan dari situs Habitica. Klik tombol di bawah, untuk membuka situs Habitica di browsermu!</string>
+  <string name="cancel_subscription_google_description">Tidak ingin berlangganan lagi\? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagian \"Aplikasi Saya\" dari Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Tidak ingin berlangganan lagi\? Karena metode pembayaranmu, kamu hanya bisa berhenti berlangganan dari situs Habitica. Klik tombol di bawah, untuk membuka situs Habitica di browsermu!</string>
   <string name="visit_habitica_website">Kunjungi Situs Habitica</string>
   <string name="current_bonuses">Bonus Sekarang</string>
   <string name="months_subscribed">Bulan Berlangganan</string>
@@ -457,8 +352,6 @@
   <string name="twelve_months">12 bulan</string>
   <string name="subscribe_prompt_thanks">Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut:</string>
   <string name="subscription_status">Status Langganan</string>
-  <string name="byLeader">oleh %s</string>
-  <string name="challenge_details">Detail Tantangan</string>
   <string name="challenge_leave_title">Tinggalkan Tantangan</string>
   <string name="challenge_leave_text">Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"?</string>
   <string name="challenge_remove_tasks_title">Hapus tugas</string>
@@ -466,46 +359,32 @@
   <string name="remove_tasks">Hapus</string>
   <string name="keep_tasks">Simpan</string>
   <string name="my_challenges">Tantangan Saya</string>
-  <string name="public_challenges">Publik</string>
-  <string name="challenges">Tantangan</string>
   <string name="daily">Keseharian</string>
   <string name="habit">Kebiasaan</string>
   <string name="reward">Hadiah</string>
   <string name="todo">To-Do</string>
   <string name="official">Resmi</string>
-  <string name="participating">Berpartisipasi</string>
   <string name="challenge">Tantangan</string>
-  <string name="go_to_challenge">Pergi ke Tantangan</string>
   <string name="not_part_of_a_challenge">Kamu tidak mengambil bagian dalam Tantangan apapun saat ini!</string>
   <string name="join_a_challenge">Ikut sebuah tantangan untuk menambahkan sekumpulan tugas yang telah didesain secara khusus, lalu bersainglah dengan sesama Habitican untuk memenangkan sebuah pencapaian dan bahkan permata!</string>
   <string name="check_the_public_challenge_tab">Tekan tab \"Publik\" untuk menemukan Tantangan buatan pengguna yang paling cocok untukmu!</string>
-  <string name="add_reminder">Tambahkan Pengingat</string>
-  <string name="warning">Peringatan</string>
-  <string name="open_settings">Buka Pengaturan</string>
-  <string name="dont_keep_activities_warning">Sepertinya kamu mengaktifkan opsi PEngembang \\"Jangan menyimpan Aktifitas\\". Saat ini opsi ini menyebabkan isu dengan aplikasi Habitica, jadi kami sarankan untuk menonaktifkannya.</string>
   <string name="inbox">Pesan</string>
-  <string name="FAQ">Pertanyaan yang Sering Ditanyakan</string>
   <string name="special">Spesial</string>
   <string name="gem_for_gold_description">Karena kamu berlangganan Habitica, kamu bisa membeli sejumlah Permata setiap bulan menggunakan Koin Emas.</string>
-  <string name="limited_count">%d tersisa</string>
   <string name="gem_shop">Permata</string>
   <string name="mystery_item">Item Misterius</string>
   <string name="myster_item_notes">Setiap bulan, pelanggan akan menerima sebuah item misterius. Ini biasanya dirilis sekitar seminggu sebelum akhir bulan.</string>
   <string name="open">Buka</string>
-  <string name="notification_mystery_item">Kamu membuka kotak ini dan menemukan %s!</string>
   <string name="checkInRewardEarned">Kamu mendapatkan %1$s sebagai hadiah untuk kesetiaanmu untuk memperbaiki hidupmu.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Hadiahmu selanjutnya akan terbuka setelah %1$d kali Cek In</string>
   <string name="pending_approval">menunggu persetujuan</string>
   <string name="filters">Filter</string>
   <string name="done">Selesai</string>
-  <string name="group_tasks_edit_description">Tugas grup tidak bisa disunting.</string>
-  <string name="group_tasks_edit_title">Tidak bisa menyunting tugas ini</string>
   <string name="groups">Grup</string>
   <string name="all">Semua</string>
   <string name="none">Tidak Ada</string>
   <string name="owned">Dimiliki</string>
   <string name="not_owned">Tidak Dimiliki</string>
-  <string name="new_game">Permainan\nBaru</string>
   <string name="login_btn_fb">Login dengan Facebook</string>
   <string name="login_btn_google">Login dengan Google</string>
   <string name="action_back">Kembali</string>
@@ -537,7 +416,6 @@
   <string name="reload_content">Muat Ulang Isi</string>
   <string name="dailyDueDefaultView">Atur Keseharian secara otomatis di tab \'harus dikerjakan\'</string>
   <string name="dailyDueDefaultViewDescription">Dengan opsi ini dipilih, tugas Keseharianmu akan secara otomatis di tab \'harus dikerjakan\' dan bukan \'semua\'</string>
-  <string name="repeat_summary">Diulang %1$s setiap %2$s%3$s%4$s</string>
   <string name="no_billing_gems">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau membeli permata.</string>
   <string name="no_billing_subscriptions">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau berlangganan.</string>
   <string name="save">Simpan</string>
@@ -550,41 +428,36 @@
   <string name="new_challenge_title">Judul tantangan baru</string>
   <string name="ownership">Kepemilikan</string>
   <string name="inn">Penginapan</string>
-  <string name="system">Sistem</string>
   <string name="start_quest">Mulai Misi Baru</string>
   <string name="leave_party">Tinggalkan Party</string>
   <string name="party_description">Deskripsi Party</string>
-  <string name="abort_confirmation">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
-  <string name="leave_quest_confirmation">Apakah kamu yakin ingin meninggalkan misi aktif ini? Semua progres misimu akan hilang.</string>
   <string name="number_participants">%1$d Partisipan</string>
   <string name="welcome_back">Selamat Datang Kembali</string>
   <string name="yesterdaililes_prompt">Apakah kamu melakukan Keseharian berikut ini kemarin?</string>
   <string name="start_day">Mulai Hariku</string>
   <string name="leave_party_confirmation">Apakah kamu yakin ingin meninggalkan Party ini?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Hadiah selanjutnya setelah %d kali Cek In</string>
   <string name="pending">Menunggu</string>
   <string name="accepted">Menerima</string>
   <string name="declined">Menolak</string>
   <string name="participants">Partisipan</string>
   <string name="invitations">Undangan</string>
-  <string name="quest_leader_header" formatted="false">Dimulai oleh %s</string>
+  <string name="quest_leader_header">Dimulai oleh %s</string>
   <string name="quest_abort_message">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
   <string name="reloading_content">Memuat Ulang Isi</string>
   <string name="thousand_abbrev">rb</string>
   <string name="million_abbrev">jt</string>
   <string name="billion_abbrev">mil</string>
-  <string name="your_balance">Saldomu:</string>
-  <string name="available_until" formatted="false">Tersedia hingga %s</string>
-  <string name="gems_left_max" formatted="false">Permata Bulanan: %1$d/%2$d Tersisa</string>
-  <string name="gems_left_nomax" formatted="false">Permata Bulanan: %d Tersisa</string>
+  <string name="available_until">Tersedia hingga %s</string>
+  <string name="gems_left_max">Permata Bulanan: %1$d/%2$d Tersisa</string>
+  <string name="gems_left_nomax">Permata Bulanan: %d Tersisa</string>
   <string name="health">Nyawa</string>
   <string name="collect">Kumpulkan</string>
   <string name="rage_meter">Tingkat Kemarahan</string>
   <string name="boss_quest">Misi Boss</string>
   <string name="collection_quest">Misi Mengumpulkan</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d poin Pengalaman</string>
-  <string name="gold_reward" formatted="false">%d Koin Emas</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d poin Pengalaman</string>
+  <string name="gold_reward">%d Koin Emas</string>
   <string name="quest_owner_rewards">Hadiah Pemilik Misi</string>
   <string name="str_abbrv">Kek</string>
   <string name="per_abbrv">Per</string>
@@ -596,7 +469,6 @@
   <string name="reset_account_confirmation">reset akun-ku</string>
   <string name="delete_account_confirmation">hapus akunku</string>
   <string name="danger_zone">Zona Berbahaya</string>
-  <string name="nevermind">Tidak jadi</string>
   <string name="resetting_account">Me-reset Akun</string>
   <string name="deleting_account">Menghapus Akun</string>
   <string name="insufficientGold">Kamu perlu menyelesaikan lebih banyak tugas sebelum bisa membeli item ini!</string>
@@ -630,7 +502,6 @@
   <string name="authentication_summary">Ganti opsi autentikasi-mu.</string>
   <string name="change_password">Ganti Kata Sandi</string>
   <string name="change_email">Ganti Alamat Email</string>
-  <string name="change_login_name">Ganti Nama Login</string>
   <string name="change">Ganti</string>
   <string name="character_level">Level Karakter</string>
   <string name="auto_allocate_points">Pembagian Poin Otomatis</string>
@@ -651,7 +522,7 @@
   <string name="distribute_class">Bagikan berdasarkan pekerjaan</string>
   <string name="distribute_task">Bagikan berdasarkan aktifitas tugas</string>
   <string name="no_points_to_allocate">Tidak ada Poin untuk Dibagikan</string>
-  <string name="points_to_allocate" formatted="false">%d Poin untuk Dibagikan</string>
+  <string name="points_to_allocate">%d Poin untuk Dibagikan</string>
   <string name="distribute_evenly_help">Bagikan jumlah poin yang sama kepada setiap atribut.</string>
   <string name="distribute_class_help">Bagikan lebih banyak poin kepada atribut yang penting untuk Pekerjaanmu.</string>
   <string name="distribute_task_help">Bagikan poin berdasarkan kepada kategori Kekuatan, Kecerdasan, Ketahanan, dan Persepsi yang dihubungkan kepada tugas yang kamu selesaikan.</string>
@@ -661,8 +532,6 @@
   <string name="classless">Tanpa Pekerjaan</string>
   <string name="class_equipment_shop_dialog">Item ini hanya tersedia untuk pekerjaan tetentu. \nKamu bisa menggantu pekerjaanmu dari Pengaturan.</string>
   <string name="class_gear_disclaimer">Kamu hanya bisa membeli perlengkapan untuk pekerjaanmu yang sekarang</string>
-  <string name="available_stats" formatted="false">%d poin</string>
-  <string name="toogle_emojis">Atur Emoji</string>
   <string name="tavern_description">Selamat datang di Penginapan! Tarik kursi dan mari mengobrol, atau beristirahat dari tugas-tugasmu.</string>
   <string name="check_into_inn">Masuk ke Penginapan</string>
   <string name="community_guidelines">Pedoman Komunitas</string>
@@ -676,19 +545,13 @@
   <string name="navigation_drawer_open">Buka laci navigasi</string>
   <string name="navigation_drawer_close">Tutup laci navigasi</string>
   <string name="world_boss">Bos Dunia</string>
-  <string name="world_boss_art">Seni Bos</string>
   <string name="boss_art">Seni Bos</string>
   <string name="world_boss_description">Deskripsi Bos Dunia</string>
-  <string name="rage_strike_count" formatted="false">Tingkat Kemarahan 1%d/1%d</string>
-  <string name="pending_strike_description">Serangan ini belum terjadi!\nWorld Boss akan mengamuk dan menyerang salah satu dari penjaga toko bersahabat kita sewaktu tingkat kemarahannya telah penuh. Kerjakan sebanyak mungkin Keseharian-mu untuk mencoba mencegah serangan itu!</string>
+  <string name="rage_strike_count">Tingkat Kemarahan 1%d/1%d</string>
   <string name="pending_strike_title">Serangan Tertunda</string>
   <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</string>
-  <string name="strike_description_subtitle">Ada 3 potensi Serangan peningkat Kemarahan</string>
-  <string name="strike_description_description">Pengukur ini terisi sewaktu Habitican tidak menyelesaikan Keseharian mereka. Sewaktu terisi penuh, sang DysHeartener akan mengerahkan Shattering Heartbreak kepada salah satu dari penjaga toko Habitica, jadi pastikan kamu melakukan tugas-tugasmu!</string>
-  <string name="pending_strike_subtitle">Serangan ini belum terjadi!</string>
-  <string name="strike_active_title" formatted="false">Sang %s telah Diserang!</string>
-  <string name="strike_active_subtitle" formatted="false">%s sekarang Patah Hati!</string>
-  <string name="strike_active_description" formatted="false">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
+  <string name="strike_active_title">Sang %s telah Diserang!</string>
+  <string name="strike_active_description">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
   <string name="questShop">Toko Misi</string>
   <string name="market_owner_long">Alex sang Pedagang</string>
   <string name="tavern_owner_long">Daniel sang penjaga penginapan</string>
@@ -698,11 +561,8 @@
   <string name="no_party_description">Selesaikan misi bersama teman-temanmu atau sendirian. Bertarung melawan monster, buat Tantangan, dan bantu dirimu untuk tetap bertanggung jawab melalui Party.</string>
   <string name="no_party_title">Mainkan Habitica dalam Party</string>
   <string name="join_party_title">Ingin bergabung ke Party?</string>
-  <string name="create_party_website">Buka website untuk membuat Party</string>
-  <string name="id_copied">ID tersalin ke clipboard</string>
   <string name="insufficientSubscriberGems">Kamu telah membeli semua Permata yang tersedia bulan ini. Lebih banyak akan ditambahkan dalam tiga hari pertama pada setiap bulan. Terima kasih sudah berlangganan!</string>
-  <string name="insufficientSubscriberGemsTitle">Batas Permata Bulanan Telah Tercapai</string>
-<string name="levelup_header">Kamu Telah Mencapai Level %1$d!</string>
+  <string name="levelup_header">Kamu Telah Mencapai Level %1$d!</string>
     <string name="levelup_detail">Dengan menyelesaikan tujuan hidupmu, kamu naik level dan sekarang sepenuhnya pulih!</string>
     <string name="faint_penalty_body">Kamu kehilangan satu level, uangmu, and sebagian perlengkapan, tapi kamu bisa mendapatkannya kembali dengan kerja keras! Semoga beruntung—kamu bisa melakukannya dengan baik.</string>
     <string name="reminder_title">Ingatlah untuk selalu memeriksa tugas anda</string>
@@ -712,42 +572,36 @@
     <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="evolved_pet_title">Kamu telah menjinakkan %1$s %2$s, ayo pergi naik!</string>
+    <string name="evolved_pet_title">Kamu telah menjinakkan %s, ayo pergi naik!</string>
     <string name="opting_out_progress">Memilih Keluar</string>
     <string name="invite_username_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang mereka dengan mencantumkan nama penggunanya disini.</string>
     <string name="subscription_duration_norenew">Untuk %s</string>
-    <string name="subscribe1month.gemcap">Batas 25 Gem</string>
-    <string name="subscribe3month.gemcap">Batas 30 Gem</string>
-    <string name="subscribe6month.gemcap">Batas 35 Gem</string>
-    <string name="subscribe12month.gemcap">Batas 45 Gem</string>
+    <string name="subscribe1month_gemcap">Batas 25 Gem</string>
+    <string name="subscribe3month_gemcap">Batas 30 Gem</string>
+    <string name="subscribe6month_gemcap">Batas 35 Gem</string>
+    <string name="subscribe12month_gemcap">Batas 45 Gem</string>
     <string name="due">Tenggat waktu</string>
     <string name="welcome_text">Wah, kamu pasti orang baru disini. Aku Justin, aku akan menjadi pemandumu di Habitica
 \n
 \nPertama-tama, bagaimana sebaiknya aku memanggilmu\? Jangan ragu untuk mengubah apa yang telah dipilih. Saat Anda siap, mari buat avatar Anda!</string>
     <string name="gem_reward">Hadiah Permata</string>
     <string name="create_challenge">Buat Tantangan</string>
-    <string name="edit_challenge">Sunting</string>
-    <string name="challenge_create_error_tavern_one_gem">Kamu butuh setidaknya 1 permata untuk membuat tantangan publik.</string>
+  <string name="challenge_create_error_tavern_one_gem">Kamu butuh setidaknya 1 permata untuk membuat tantangan publik.</string>
     <string name="identify_your_challenge_with_a_tag">Identifikasi tantanganmu dengan nama yang pendek</string>
     <string name="challenge_create_error_tag">Kamu butuh nama yang pendek untuk membuat Tantangan ini.</string>
-    <string name="loading">Memuat…</string>
-    <string name="change_username">Ganti Nama Pengguna</string>
-    <string name="chat_message">Pesan Obrolan</string>
-    <string name="world_boss_description_title">Apa itu Boss Dunia\?</string>
+  <string name="change_username">Ganti Nama Pengguna</string>
+  <string name="world_boss_description_title">Apa itu Boss Dunia\?</string>
     <string name="world_boss_description_1">Selesaikan tugas-tugas untuk menyerang Boss</string>
-    <string name="world_boss_action_prompt" formatted="false">Kalahkan boss untuk mendapatkan hadiah spesial dan menyelamatkan Habitica dari teror %s!</string>
-    <string name="world_boss_description_subtitle">%s menyerangmu!</string>
-    <string name="questShop_owner_long">Ian sang Pemandu Quest</string>
+    <string name="world_boss_action_prompt">Kalahkan boss untuk mendapatkan hadiah spesial dan menyelamatkan Habitica dari teror %s!</string>
+  <string name="questShop_owner_long">Ian sang Pemandu Quest</string>
     <string name="report">Laporkan</string>
-    <string name="like">Suka</string>
-    <string name="reply">Balas</string>
+  <string name="reply">Balas</string>
     <string name="confirm_username_title">Apakah kamu yakin ingin mengkonfirmasi nama pengguna saat ini\?</string>
     <string name="cancel">Batalkan</string>
     <string name="confirm_username">Konfirmasi Nama Pengguna</string>
     <string name="username_not_confirmed">Nama Pengguna tidak terkonfirmasi</string>
     <string name="username_confirmed">Nama Pengguna Terkonfirmasi</string>
-    <string name="username_level">\@%s ・Lvl %d</string>
-    <string name="username_copied">Nama Pengguna berhasil disalin ke clipboard</string>
+  <string name="username_copied">Nama Pengguna berhasil disalin ke clipboard</string>
     <string name="welcomeNameTitle">Bagaimana kami memanggil anda\?</string>
     <string name="display_name_length_error">Nama Tampilan harus berisikan 1 sampai 20 karakter</string>
     <string name="setup_task_reward">Beri hadiah untuk dirimu sendiri</string>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index 1d410af8b..c8d1466cb 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Livello:</string>
     <string name="profile_class_bonus">Bonus classe:</string>
     <string name="profile_allocated">Allocati:</string>
-    <string name="profile_boosts">Bonus:</string>
     <string name="profile_private_message">Messaggio privato</string>
     <string name="profile_achievements">Medaglie</string>
-    <string name="profile_achievement_ok">Ok</string>
-    <string name="profile_qrcode_close">Chiudi</string>
 
 </resources>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index 6d80c686f..852cc4cba 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Attività</string>
-  <string name="sidebar.skills">Abilità</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Messaggi</string>
-  <string name="sidebar.tavern">Taverna</string>
-  <string name="sidebar.party">Squadra</string>
-  <string name="sidebar.purchaseGems">Gemme e abbonamento</string>
-  <string name="sidebar.guilds">Gilde</string>
-  <string name="sidebar.challenges">Sfide</string>
-  <string name="sidebar.section.inventory">Inventario</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipaggiamento</string>
-  <string name="sidebar.stable">Scuderia</string>
-  <string name="sidebar.news">Novità</string>
-  <string name="sidebar.settings">Impostazioni</string>
-  <string name="sidebar.about">Su Habitica</string>
+  <string name="sidebar_tasks">Attività</string>
+  <string name="sidebar_skills">Abilità</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_inbox">Messaggi</string>
+  <string name="sidebar_tavern">Taverna</string>
+  <string name="sidebar_party">Squadra</string>
+  <string name="sidebar_purchaseGems">Gemme e abbonamento</string>
+  <string name="sidebar_guilds">Gilde</string>
+  <string name="sidebar_challenges">Sfide</string>
+  <string name="sidebar_section_inventory">Inventario</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipaggiamento</string>
+  <string name="sidebar_stable">Scuderia</string>
+  <string name="sidebar_news">Novità</string>
+    <string name="sidebar_about">Su Habitica</string>
   <string name="sidebar_shops">Negozi</string>
   <string name="sidebar_stats">Statistiche</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index 278738393..c83ef1f18 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
   <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
   <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
-  <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
-  <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
-  <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
-  <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
+    <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
   <string name="tutorial_party">Qui è dove tu e i tuoi amici potete motivarvi a vicenda e combattere i mostri con le vostre attività!</string>
   <string name="tutorial_tavern">Benvenuto nella Taverna, una chat pubblica per tutte le età! Qui puoi chiacchierare e fare delle domande. Divertiti!</string>
-  <string name="tutorial_classes">Scegli di diventare un Guerriero, un Mago, un Guaritore o un Assassino! Ogni classe ha equipaggiamento ed abilità uniche. Tocca (?) per saperne di più!</string>
-  <string name="tutorial_stats">Premi sul bottone grigio per assegnare un sacco di punti stat in una volta, oppure usa le frecce per aggiungere un punto alla volta.</string>
+    <string name="tutorial_stats">Premi sul bottone grigio per assegnare un sacco di punti stat in una volta, oppure usa le frecce per aggiungere un punto alla volta.</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index e6c454fb9..1a7aa1fcc 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Esperienza</string>
   <string name="HP_default">Salute</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Non è stato possibile importare le preferenze dal codice a barre</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Impostazioni</string>
-  <string name="SP_address_hint">Il tuo server personalizzato</string>
-  <string name="SP_userID_title">ID utente</string>
+    <string name="SP_userID_title">ID utente</string>
   <string name="SP_userID_summary">Il tuo ID utente</string>
   <string name="SP_APIToken_title">Chiave API</string>
   <string name="SP_APIToken_summary">La tua Chiave API</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="PS_contact_title">Contattami</string>
+    <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">Primo giorno della settimana</string>
   <string name="pref_first_day_of_the_week_summary">Primo giorno della settimana in tutti i calendari</string>
   <string name="pref_reminder_header">Notifica giornaliera</string>
   <string name="pref_reminder_checkbox">Attiva notifica</string>
   <string name="pref_reminder_picker">Imposta ora notifica</string>
   <string name="pref_cds_header">Inizio giorno personalizzato</string>
-  <string name="pref_cds_picker">Imposta ora di inizio giorno</string>
-  <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
+    <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
   <string name="push_notifications">Notifiche Push</string>
   <string name="push_notifications_sum">Gestisci le impostazioni delle notifiche push</string>
   <string name="preference_push_you_won_challenge">Hai vinto una Sfida!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">La tua missione è cominciata</string>
   <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
   <!--Adding tasks-->
-  <string name="task_value">Valore</string>
-  <string name="new_todo">Nuova To-Do</string>
-  <string name="new_reward">Nuova Ricompensa</string>
-  <string name="new_daily">Nuova Daily</string>
-  <string name="new_habit">Nuova Abitudine</string>
-  <string name="action_edit">Modifica</string>
-  <string name="action_delete">Elimina</string>
-  <string name="action_cancel">Annulla</string>
+    <string name="action_edit">Modifica</string>
+    <string name="action_cancel">Annulla</string>
   <string name="login_btn">Accedi</string>
   <string name="register_btn">Registrati</string>
   <string name="username">Nome utente</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Conferma password</string>
   <string name="logout">Esci</string>
   <string name="logout_description">Esci dal tuo account</string>
-  <string name="account_details">Dettagli account</string>
-  <string name="LoginActivityName">Benvenuto</string>
-  <string name="string_revive">Rianima</string>
-  <string name="please_connect">Dovresti connetterti attraverso l\'applicazione prima di usare un widget</string>
-  <string name="about.title">Info</string>
-  <string name="about.libraries">Librerie</string>
-  <string name="about.versionhistory">Cronologia versioni</string>
-  <string name="about.habitica_open_source">Habitica è disponibile come software open source su Github</string>
-  <string name="about.rate_our_app">Valuta la nostra app</string>
-  <string name="about.give_us_feedback">Invia suggerimenti!</string>
-  <string name="about.bugreport">Segnala un bug</string>
-  <string name="about.source_code">Codice sorgente</string>
-  <string name="repeatEvery">Ripeti ogni</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Errore di connessione</string>
-  <string name="network_error_no_network_body">Non sei connesso ad internet.</string>
-  <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
+    <string name="LoginActivityName">Benvenuto</string>
+    <string name="about_title">Info</string>
+  <string name="about_libraries">Librerie</string>
+    <string name="about_habitica_open_source">Habitica è disponibile come software open source su Github</string>
+  <string name="about_rate_our_app">Valuta la nostra app</string>
+  <string name="about_give_us_feedback">Invia suggerimenti!</string>
+  <string name="about_bugreport">Segnala un bug</string>
+  <string name="about_source_code">Codice sorgente</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
   <string name="authentication_error_title">Errore di autenticazione</string>
-  <string name="authentication_error_body">Il tuo nome utente e/o password non è corretto.</string>
-  <string name="login_validation_error_title">Errore di validazione</string>
+    <string name="login_validation_error_title">Errore di validazione</string>
   <string name="login_validation_error_fieldsmissing">Devi compilare tutti i campi.</string>
   <string name="save_changes">Salva</string>
   <string name="copy">Copia</string>
   <string name="notes">Note</string>
-  <string name="text">Testo</string>
-  <string name="difficulty">Difficoltà</string>
+    <string name="difficulty">Difficoltà</string>
   <string name="tags">Etichette</string>
   <string name="trivial">Triviale</string>
   <string name="easy">Facile</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativa ( - )</string>
   <string name="checklist">Checklist</string>
   <string name="reminders">Promemoria</string>
-  <string name="actions">Azioni</string>
-  <string name="attributes">Attributi</string>
-  <string name="physical">Forza</string>
-  <string name="mental">Intelligenza</string>
-  <string name="social">Costituzione</string>
-  <string name="other">Percezione</string>
-  <string name="frequency">Frequenza</string>
-  <string name="frequency_weekly">Certi giorni della settimana</string>
-  <string name="frequency_daily">Ogni X giorni</string>
-  <string name="repeatables_summary_title">Riepilogo</string>
-  <string name="repeatables_title">Si ripete</string>
-  <string name="repeatables_on_title">Ripeti di</string>
-  <string name="repeatables_frequency_daily">Quotidianamente</string>
+    <string name="attributes">Attributi</string>
+    <string name="repeatables_frequency_daily">Quotidianamente</string>
   <string name="repeatables_frequency_weekly">Settimanalmente</string>
   <string name="repeatables_frequency_monthly">Mensilmente</string>
   <string name="repeatables_frequency_yearly">Annualmente</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Hai finito i punti salute!</string>
   <string name="faint_button">Ripristina Salute &amp; Riprova</string>
   <string name="filter">Filtro</string>
-  <string name="profile_image">Immagine profilo</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Hai usato %1$s per %2$d mana.</string>
-  <string name="used_skill_without_mana">Hai usato %1$s.</string>
+    <string name="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 attività</string>
-  <string name="skill_progress_title">Usando abilità...</string>
-  <string name="coming_soon">Presto disponibile</string>
-  <string name="chat_flag_confirmation">Vuoi davvero segnalare questo messaggio per violazione?</string>
-  <string name="flag_confirm">Segnala messaggio</string>
-  <string name="unlock_lvl_11">Sblocca al liv. 11</string>
-  <string name="no_party_message">Non sei in una squadra. Per unirti ad una squadra, per favore visita il sito web di Habitica.</string>
-  <string name="forgot_pw_btn">Password dimenticata</string>
-  <string name="tavern.inn.checkOut">Riattiva le tue Daily</string>
-  <string name="tavern.inn.rest">Sospendi le tue Daily</string>
-  <string name="reward.dialog.buy">Compra</string>
-  <string name="reward.dialog.dismiss">Annulla</string>
+    <string name="reminder_title">Ricorda di completare le tue attività</string>
+    <string name="unlock_lvl_11">Sblocca al liv. 11</string>
+    <string name="forgot_pw_btn">Password dimenticata</string>
+  <string name="tavern_inn_checkOut">Riattiva le tue Daily</string>
+  <string name="tavern_inn_rest">Sospendi le tue Daily</string>
+  <string name="reward_dialog_buy">Compra</string>
+  <string name="reward_dialog_dismiss">Annulla</string>
   <string name="party">Squadra</string>
   <string name="chat">Chat</string>
   <string name="members">Membri</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Daily</string>
   <string name="todos">To-do</string>
   <string name="rewards">Ricompense</string>
-  <string name="taskform.delete.title">Sei sicuro/a?</string>
-  <string name="taskform.delete.message">Vuoi davvero eliminare?</string>
-  <string name="yes">Sì</string>
+    <string name="yes">Sì</string>
   <string name="no">No</string>
   <string name="quest">Missione</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Capelli</string>
   <string name="avatar_shirt">Maglia</string>
   <string name="avatar_skin">Pelle</string>
-  <string name="avatar_ears">Orecchie animali</string>
-  <string name="avatar_base">Base</string>
+    <string name="avatar_base">Base</string>
   <string name="avatar_color">Colore</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Baffi</string>
   <string name="avatar_flower">Fiore</string>
   <string name="avatar_bangs">Frangia</string>
-  <string name="avatar_nothing">Niente impostato</string>
-  <string name="avatar_size">Corporatura</string>
+    <string name="avatar_size">Corporatura</string>
   <string name="avatar_size_slim">Snello</string>
   <string name="avatar_size_broad">Robusto</string>
   <string name="avatar_background">Sfondo</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Compra</string>
   <string name="purchase_set_title">Compra set  %s</string>
   <string name="due_date">Data di scadenza</string>
-  <string name="quest.accept">Accetta</string>
-  <string name="quest.reject">Rifiuta</string>
-  <string name="quest.begin">Inizia missione</string>
-  <string name="quest.cancel">Annulla invito</string>
-  <string name="quest.abort">Annulla missione</string>
-  <string name="quest.leave">Abbandona Missione</string>
-  <string name="quest.pending">In attesa</string>
-  <string name="quest.accepted">Accettata</string>
-  <string name="quest.rejected">Rifiutata</string>
-  <string name="quest.participants">Partecipanti</string>
-  <string name="version_info">Versione %1$s (%2$d)</string>
+  <string name="quest_accept">Accetta</string>
+  <string name="quest_reject">Rifiuta</string>
+  <string name="quest_begin">Inizia missione</string>
+  <string name="quest_cancel">Annulla invito</string>
+  <string name="quest_abort">Annulla missione</string>
+    <string name="version_info">Versione %1$s (%2$d)</string>
   <string name="sidebar_help">Aiuto &amp; FAQ</string>
   <string name="complete_tutorial">Capito!</string>
   <string name="dismiss_tutorial">Ricordamelo ancora</string>
   <string name="intro_1_subtitle">Benvenuto in</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
+    <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
   <string name="intro_2_subtitle">Progressi nel gioco</string>
   <string name="intro_2_title">Progressi nella vita</string>
   <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Sii Social</string>
   <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
   <string name="intro_finish_button">Iniziamo!</string>
-  <string name="previous_button">Indietro</string>
-  <string name="next_button">Avanti</string>
+    <string name="next_button">Avanti</string>
   <string name="skip_button">Salta</string>
-  <string name="setup_welcome_description">Benvenuto in Habitica, dove progredire nel gioco migliorerà la tua vita! Man mano che raggiungerai obiettivi nella vita reale, sbloccherai equipaggiamento, animali, missioni e altro.</string>
-  <string name="setup_welcome_title">Benvenuto</string>
-  <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
+    <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
   <string name="task_setup_description">Splendido! Ora dimmi, su cosa vorresti lavorare durante questo viaggio?</string>
   <string name="setup_group_work">Lavoro</string>
   <string name="setup_group_exercise">Esercizio fisico</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Studia un artista</string>
   <string name="setup_task_creativity_2">Lavora su un progetto creativo</string>
   <string name="setup_task_creativity_3">Completa un progetto creativo</string>
-  <string name="gem.purchase.support">Vuoi aiutare a tenere Habitica attivo? Puoi sostenere gli sviluppatori comprando delle gemme!\n\nLe gemme ti permettono di comprare dei simpatici extra per il tuo account, inclusi: \n\n - Originali costumi per il tuo avatar\n - Sfondi magnifici\n - Divertenti missioni che ti premiano con uova di animali\n - La possibilità di cambiare classe prima del livello 10\n\nGrazie infinite per aiutarci a rendere Habitica sempre migliore. Il tuo supporto significa molto per noi!</string>
-  <string name="my_guilds">Le mie Gilde</string>
+    <string name="my_guilds">Le mie Gilde</string>
   <string name="public_guilds">Gilde pubbliche</string>
   <string name="guild">Gilda</string>
   <string name="leave">Abbandona</string>
   <string name="join">Partecipa</string>
-  <string name="leader">Leader</string>
-  <string name="gems">Gemme</string>
-  <string name="copy_as_todo">Copia come To-Do</string>
-  <string name="send_pm">Invia messaggio privato</string>
-  <string name="flag">Segnala</string>
-  <string name="delete">Elimina</string>
+    <string name="gems">Gemme</string>
+    <string name="delete">Elimina</string>
   <string name="name">Nome</string>
   <string name="description">Descrizione</string>
   <string name="add_tag">Aggiungi una nuova etichetta</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Scrivi messaggio</string>
-  <string name="post">Invia</string>
-  <string name="guild_search_hint">Cerca gilde</string>
-  <string name="todo_due">Scade: %s</string>
-  <string name="daily_streak">serie: %d</string>
-  <string name="todo_has_duedate">L\' attività ha una scadenza</string>
-  <string name="battle_gear">Assetto da battaglia</string>
+    <string name="guild_search_hint">Cerca gilde</string>
+    <string name="battle_gear">Assetto da battaglia</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Testa</string>
   <string name="outfit_headAccessory">Accessorio da testa</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Indossa Costume</string>
   <string name="equipped">Equipaggiato</string>
   <string name="quest_cancel_message">Vuoi davvero annullare questa missione? Tutti gli inviti accettati andranno persi. Il proprietario della missione tornerà in possesso della Pergamena.</string>
-  <string name="quest.invitation">Invito Missione</string>
-  <string name="quest_begin_message">Sei sicuro? Solo %1$d dei tuoi %2$d compagni di squadra si sono uniti alla missione! Le missioni partono automaticamente quando tutti i giocatori hanno accettato o rifiutato l\'invito.</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="quest_begin_message">Sei sicuro? Solo %1$d dei tuoi %2$d compagni di squadra si sono uniti alla missione! Le missioni partono automaticamente quando tutti i giocatori hanno accettato o rifiutato l\'invito.</string>
+    <string name="ago_1day">1 giorno fa</string>
   <string name="ago_days">%d giorni fa</string>
   <string name="ago_1Minute">1 min. fa</string>
   <string name="ago_minutes">%d min. fa</string>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Hai trovato dell\'equipaggiamento raro nello Scrigno Incantato: %s! Fantastico!</string>
   <string name="armoireFood">Frughi nello Scrigno e trovi %1$s %2$s. Cosa ci fa qui dentro?</string>
   <string name="armoireExp">Fai a botte con lo Scrigno e ottieni Esperienza. Prendi questo!</string>
-  <string name="armoireNotesFull">Apri lo Scrigno Incantato per ricevere casualmente Equipaggiamento speciale, Esperienza o cibo! Oggetti rimanenti: %d</string>
-  <string name="armoireLastItem">Hai trovato l\'ultimo oggetto raro disponibile nello Scrigno Incantato.</string>
-  <string name="armoireNotesEmpty">Nello Scrigno Incantato compariranno nuovi oggetti la prima settimana di ogni mese. Fino ad allora, continua a cliccare sullo Scrigno per ottenere Esperienza e Cibo!</string>
-  <string name="sell">Vendi (%d Oro)</string>
+    <string name="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="hatch_egg">Schiudi con uovo</string>
   <string name="invite_party">Invita squadra</string>
   <string name="dialog_feeding">Dai da mangiare a %s:</string>
   <string name="use_animal">Usa</string>
@@ -305,8 +237,7 @@
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
   <string name="notification_pet_fed">Hai dato da mangiare al tuo %s!</string>
-  <string name="notification_purchase">Hai comprato %s</string>
-  <string name="notification_purchase_reward">Hai comprato una ricompensa</string>
+    <string name="notification_purchase_reward">Hai comprato una ricompensa</string>
   <string name="world_quest">World Quest</string>
   <string name="inn_description">Bisogno di una pausa ? Riposati alla locanda di Daniel per mettere in pausa le meccaniche di gioco più difficili di Habitica:\n\n
 • Le Daily non completate non faranno diminuire la tua salute\n
@@ -327,8 +258,7 @@
 Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno sempre modo di recuperare Vita dagli sbagli. Gioca come Guaritore se vuoi aiutare gli altri giocatori della tua squadra, o se l\'idea di fregare la morte con il duro lavoro ti ispira!</string>
   <string name="select_class">Seleziona classe</string>
   <string name="opt_out_class">Rinuncia</string>
-  <string name="opt_out_description">Non ti vuoi preoccupare dellle classi? Vuoi scegliere dopo? Puoi essere un guerriero senza abilità speciali. Puoi leggere a proposito del sistema di classi più tardi nella Wiki ed abilitare le classi quando vuoi.</string>
-  <string name="class_confirmation">Vuoi davvero essere un %s?</string>
+    <string name="class_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>
@@ -342,23 +272,18 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="invite_existing_users">Invita utenti esistenti</string>
   <string name="send">Invia</string>
   <string name="invite">Invita amici</string>
-  <string name="invite_id_description">Se hai degli amici che già usano Habitica, invitali inserendo qui il loro ID Utente.</string>
-  <string name="invite_username_description">Se i tuoi amici usano già Habitica, invitali qui usando il loro nome utente.</string>
+    <string name="invite_username_description">Se i tuoi amici usano già Habitica, invitali qui usando il loro nome utente.</string>
   <string name="invite_email_description">Se un amico/a si unisce ad Habitica attraverso la tua e-mail, verrà automaticamente invitato/a nella tua squadra!</string>
   <string name="add_invites">Aggiungi inviti</string>
-  <string name="user_id">ID Utente</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Invita nella squadra</string>
-  <string name="share_using">Condividi con</string>
+    <string name="email">E-mail</string>
+    <string name="share_using">Condividi con</string>
   <string name="share_levelup">Ho raggiunto il livello %d su Habitica migliorando le mie abitudini nella vita reale!</string>
   <string name="share_hatched">Ho appena schiuso un %1$s %2$s in Habitica completando le mie attività nella vita reale!</string>
   <string name="share_raised">Ho appena ottenuto un %1$s in Habitica completando le mie attività nella vita reale!</string>
   <string name="open_in_store">Apri nel Play Store</string>
   <string name="change_class_confirmation">Vuoi davvero cambiare la tua classe? Costerà 3 gemme.</string>
   <string name="change_class_equipment_warning">Attenzione: non potrai più comprare equipaggiamento per la classe %s.</string>
-  <string name="leaderMessage">Messaggio da %1$s</string>
-  <string name="leaderName">Leader: %1$s</string>
-  <string name="confirm">Conferma</string>
+    <string name="confirm">Conferma</string>
   <string name="market">Mercato</string>
   <string name="timeTravelers">Viaggiatori del Tempo</string>
   <string name="seasonalShop">Negozio Stagionale</string>
@@ -366,37 +291,16 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="party_invite">Sblocca invitando amici</string>
   <string name="login_incentive">Sblocca usando Habitica regolarmente</string>
   <string name="create_account">Sblocca creando un account</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">Acquistato %1$s</string>
-  <string name="purchase_confirmation_title">Conferma acquisto</string>
-  <string name="confirm_purchase_text">Compra %1$s per %2$s %3$s</string>
-  <string name="gem">gemma</string>
-  <string name="hourglass">clessidra</string>
-  <string name="hourglasses">clessidre</string>
-  <string name="gold_singular">oro</string>
-  <string name="gold_plural">oro</string>
+    <string name="successful_purchase">Acquistato %1$s</string>
+    <string name="gold_plural">oro</string>
   <string name="chat_message_copied">Messaggio copiato negli Appunti</string>
-  <string name="copy_chat_message">Copia testo</string>
-  <string name="edit_tag_title">Modifica etichetta</string>
-  <string name="edit_tag_btn_edit">Modifica</string>
-  <string name="edit_tag_btn_done">Fatto</string>
-  <string name="edit_tag_btn_delete">Elimina</string>
-  <string name="confirm_delete_tag_title">Sei sicuro?</string>
+    <string name="edit_tag_btn_edit">Modifica</string>
+    <string name="confirm_delete_tag_title">Sei sicuro?</string>
   <string name="confirm_delete_tag_message">Vuoi davvero eliminare?</string>
-  <string name="filter_drawer_edit_tags">Modifica etichette</string>
-  <string name="filter_drawer_filter_tags">Filtra per etichette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Fatti invitare da qualcuno con questo codice QR</string>
-  <string name="qr_save_message">Codice QR salvato in</string>
-  <string name="qr_dialogue_title">Il tuo codice QR</string>
-  <string name="download">Scarica</string>
-  <string name="send_new_message">Invia nuovo messaggio</string>
-  <string name="choose_recipient_title">Scegli destinatario messaggio</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Scegli destinatario messaggio</string>
   <string name="action_continue">Continua</string>
-  <string name="scan_qr_code">Rileva codice QR</string>
-  <string name="enter_recipient_uuid">Inserisci ID Utente destinatario</string>
-  <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
+    <string name="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>
@@ -407,15 +311,14 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="widget_habit_button">Habitica esegui Abitudine</string>
   <string name="widget_dailies">Habitica Daily</string>
   <string name="widget_todo_list">Habitica lista To-Do</string>
-  <string name="widget_add_task">Habitica aggiungi attività</string>
-  <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
-  <string name="gem.purchase.toolbartitle">Compra</string>
-  <string name="gem.purchase.title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
-  <string name="gem.purchase.subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
-  <string name="gem.purchase.listitem1">Costumi per il tuo avatar</string>
-  <string name="gem.purchase.listitem2">Magnifici sfondi</string>
-  <string name="gem.purchase.listitem3">Missioni che ti premiano con uova di animali</string>
-  <string name="gem.purchase.listitem4">La possibilità di cambiare classe prima del livello 100</string>
+    <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
+  <string name="gem_purchase_toolbartitle">Compra</string>
+  <string name="gem_purchase_title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
+  <string name="gem_purchase_subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
+  <string name="gem_purchase_listitem1">Costumi per il tuo avatar</string>
+  <string name="gem_purchase_listitem2">Magnifici sfondi</string>
+  <string name="gem_purchase_listitem3">Missioni che ti premiano con uova di animali</string>
+  <string name="gem_purchase_listitem4">La possibilità di cambiare classe prima del livello 100</string>
   <string name="support_habitica">Supporta Habitica</string>
   <string name="skill_transformation_use">usa</string>
   <string name="hatching_market_info">Non trovi i drop giusti? Dai un\'occhiata al Mercato!</string>
@@ -429,32 +332,32 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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_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="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="subscription_duration_norenew">Per %s</string>
   <string name="subscribe">Abbonati</string>
-  <string name="subscribe.listitem1.description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
-  <string name="subscribe.listitem2.description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
-  <string name="subscribe.listitem3.description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
-  <string name="subscribe.listitem4.description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
-  <string name="subscribe1month.gemcap">Limite di 25 Gemme</string>
-  <string name="subscribe3month.gemcap">Limite di 30 Gemme</string>
-  <string name="subscribe6month.gemcap">Limite di 35 Gemme</string>
-  <string name="subscribe12month.gemcap">Limite di 45 Gemme</string>
+  <string name="subscribe_listitem1_description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
+  <string name="subscribe_listitem2_description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
+  <string name="subscribe_listitem3_description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
+  <string name="subscribe_listitem4_description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
+  <string name="subscribe1month_gemcap">Limite di 25 Gemme</string>
+  <string name="subscribe3month_gemcap">Limite di 30 Gemme</string>
+  <string name="subscribe6month_gemcap">Limite di 35 Gemme</string>
+  <string name="subscribe12month_gemcap">Limite di 45 Gemme</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="due">Oggi</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="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>
@@ -469,56 +372,40 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="twelve_months">12 mesi</string>
   <string name="subscribe_prompt_thanks">Come abbonato hai questi utili benefici:</string>
   <string name="subscription_status">Stato abbonamento</string>
-  <string name="byLeader">di %s</string>
-  <string name="challenge_details">Dettagli sfida</string>
-  <string name="challenge_leave_title">Abbandona sfida</string>
+    <string name="challenge_leave_title">Abbandona sfida</string>
   <string name="challenge_leave_text">Vuoi davvero abbandonare la sfida \"%s\"?</string>
   <string name="challenge_remove_tasks_title">Rimuovi attività</string>
   <string name="challenge_remove_tasks_text">Vuoi rimuovere le attività?</string>
   <string name="remove_tasks">Rimuovi</string>
   <string name="keep_tasks">Tieni</string>
   <string name="my_challenges">Le mie sfide</string>
-  <string name="public_challenges">Pubbliche</string>
-  <string name="challenges">Sfide</string>
-  <string name="daily">Daily</string>
+    <string name="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="challenge">Sfida</string>
+    <string name="not_part_of_a_challenge">Al momento non stai partecipando a nessuna sfida!</string>
   <string name="join_a_challenge">Partecipa ad una sfida per aggiungere delle attività specifiche alla tua lista, poi competi contro altri utenti di Habitica per vincere Medaglie o addirittura delle Gemme!</string>
   <string name="check_the_public_challenge_tab">Vai nella sezione “Pubbliche” per trovare le sfide create dagli utenti più adatte a te!</string>
-  <string name="add_reminder">Aggiungi promemoria</string>
-  <string name="warning">Attenzione</string>
-  <string name="open_settings">Apri impostazioni</string>
-  <string name="dont_keep_activities_warning">Pare che tu abbia l\'opzione sviluppatore \\"Non conservare attività\\" abilitata. Al momento questa opzione causa dei problemi all\'app di Habitica, quindi consigliamo di disabilitarla.</string>
-  <string name="inbox">Messaggi</string>
-  <string name="FAQ">Domande frequenti</string>
-  <string name="special">Speciale</string>
+    <string name="inbox">Messaggi</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="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="checkInRewardEarned">Hai meritato %1$s come premio per la tua costanza nel migliorare la tua vita.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Il prossimo premio verrà sbloccato a %1$d accessi</string>
   <string name="pending_approval">in attesa di approvazione</string>
   <string name="filters">Filtri</string>
   <string name="done">Fatto</string>
-  <string name="group_tasks_edit_description">Le attività di gruppo non possono essere modificate.</string>
-  <string name="group_tasks_edit_title">Non puoi modificare questa attività</string>
-  <string name="groups">Gruppi</string>
+    <string name="groups">Gruppi</string>
   <string name="all">Tutto</string>
   <string name="none">Nessuno</string>
   <string name="owned">Posseduto</string>
   <string name="not_owned">Non posseduto</string>
-  <string name="new_game">Nuovo\nGioco</string>
-  <string name="login_btn_fb">Accedi con Facebook</string>
+    <string name="login_btn_fb">Accedi con Facebook</string>
   <string name="login_btn_google">Accedi con Google</string>
   <string name="action_back">Indietro</string>
   <string name="welcome_text">Oh, devi essere nuovo qui. Sono Justin, sarò la tua guida in Habitica.\n\nInnanzi tutto, come vorresti chiamarti? Non esitare a cambiare quello che ho selezionato per te. Quando sei pronto, crea il tuo avatar!</string>
@@ -550,7 +437,6 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="reload_content">Ricarica contenuti</string>
   <string name="dailyDueDefaultView">Visualizza lista Daily incomplete di default</string>
   <string name="dailyDueDefaultViewDescription">Con questa opzione selezionata, le Daily mostrate saranno quelle della lista \'incomplete\' invece che \'tutte\'.</string>
-  <string name="repeat_summary">Ripeti %1$s ogni %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Il tuo dispositivo non dispone di alcuno dei metodi di pagamento supportati. Per favore usa il sito web di Habitica se vuoi acquistare delle Gemme.</string>
   <string name="no_billing_subscriptions">Il tuo dispositivo non dispone di alcuno dei metodi di pagamento supportati. Per favore usa il sito web di Habitica se vuoi acquistare un abbonamento.</string>
   <string name="save">Salva</string>
@@ -558,8 +444,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="gem_reward">Premio in Gemme</string>
   <string name="tasks">Attività</string>
   <string name="create_challenge">Crea Sfida</string>
-  <string name="edit_challenge">Modifica</string>
-  <string name="challenge_create_error_tavern_one_gem">Ti serve almeno una Gemma per creare una sfida pubblica.</string>
+    <string name="challenge_create_error_tavern_one_gem">Ti serve almeno una Gemma per creare una sfida pubblica.</string>
   <string name="challenge_create_error_enough_gems">Non hai abbastanza gemme per creare una sfida.</string>
   <string name="identify_your_challenge_with_a_tag">Identifica la tua sfida con un nome breve</string>
   <string name="challenge_create_error_tag">Hai bisogno di un nome breve per creare questa Sfida.</string>
@@ -569,42 +454,36 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="new_challenge_title">Titolo della nuova sfida</string>
   <string name="ownership">Proprietà</string>
   <string name="inn">Locanda</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Comincia una nuova Missione</string>
+    <string name="start_quest">Comincia una nuova Missione</string>
   <string name="leave_party">Abbandona squadra</string>
   <string name="party_description">Descrizione squadra</string>
-  <string name="abort_confirmation">Vuoi davvero annullare questa missione? Verrà annullata per tutti i membri della tua squadra e tutti i progressi nella missione saranno persi. La Pergamena tornerà al proprietario della missione.</string>
-  <string name="leave_quest_confirmation">Vuoi davvero abbandonare la missione corrente? Tutti i tuoi progressi nella missione saranno persi.</string>
-  <string name="number_participants">%1$d Partecipanti</string>
+    <string name="number_participants">%1$d Partecipanti</string>
   <string name="welcome_back">Bentornato</string>
   <string name="yesterdaililes_prompt">Hai completato qualcuna di queste Daily ieri?</string>
   <string name="start_day">Inizia la mia giornata</string>
   <string name="leave_party_confirmation">Vuoi davvero lasciare la Squadra?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Prossimo premio tra %d accessi</string>
-  <string name="pending">In attesa</string>
+    <string name="pending">In attesa</string>
   <string name="accepted">Accettato</string>
   <string name="declined">Rifiutato</string>
   <string name="participants">Partecipanti</string>
   <string name="invitations">Inviti</string>
-  <string name="quest_leader_header" formatted="false">Avviata da %s</string>
+  <string name="quest_leader_header">Avviata da %s</string>
   <string name="quest_abort_message">Vuoi davvero annullare questa missione? Verrà annullata per tutti i membri della tua squadra e tutti i progressi nella missione saranno persi. La Pergamena tornerà al proprietario della missione.</string>
-  <string name="loading">Caricamento...</string>
-  <string name="reloading_content">Ricaricamento contenuti</string>
+    <string name="reloading_content">Ricaricamento contenuti</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mln</string>
   <string name="billion_abbrev">mld</string>
-  <string name="your_balance">Il tuo bilancio:</string>
-  <string name="available_until" formatted="false">Disponibile fino al %s</string>
-  <string name="gems_left_max" formatted="false">Gemme mensili: %1$d/%2$d rimanenti</string>
-  <string name="gems_left_nomax" formatted="false">Gemme mensili: %d rimanenti</string>
+    <string name="available_until">Disponibile fino al %s</string>
+  <string name="gems_left_max">Gemme mensili: %1$d/%2$d rimanenti</string>
+  <string name="gems_left_nomax">Gemme mensili: %d rimanenti</string>
   <string name="health">Salute</string>
   <string name="collect">Raccogli</string>
   <string name="rage_meter">Indicatore Furia</string>
   <string name="boss_quest">Missione Boss</string>
   <string name="collection_quest">Missione Raccolta</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Punti esperienza</string>
-  <string name="gold_reward" formatted="false">%d Oro</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Punti esperienza</string>
+  <string name="gold_reward">%d Oro</string>
   <string name="quest_owner_rewards">Premi proprietario missione</string>
   <string name="str_abbrv">FOR</string>
   <string name="per_abbrv">PER</string>
@@ -617,8 +496,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="reset_account_confirmation">resetta il mio account</string>
   <string name="delete_account_confirmation">elimina il mio account</string>
   <string name="danger_zone">Zona pericolosa</string>
-  <string name="nevermind">Ho cambiato idea</string>
-  <string name="resetting_account">Resettando l\'account</string>
+    <string name="resetting_account">Resettando l\'account</string>
   <string name="deleting_account">Cancellazione account</string>
   <string name="insufficientGold">Hai bisogno di completare più attività per comprare questo oggetto!</string>
   <string name="insufficientGems">Ti servono più Gemme per comprare questo oggetto!</string>
@@ -651,8 +529,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="authentication_summary">Cambia le tue opzioni di autenticazione.</string>
   <string name="change_password">Cambia password</string>
   <string name="change_email">Cambia indirizzo e-mail</string>
-  <string name="change_login_name">Cambia nome di login</string>
-  <string name="change_username">Cambia nome utente</string>
+    <string name="change_username">Cambia nome utente</string>
   <string name="change">Cambia</string>
   <string name="character_level">Livello personaggio</string>
   <string name="auto_allocate_points">Alloca punti automaticamente</string>
@@ -673,7 +550,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="distribute_class">Distribuzione basata sulla Classe</string>
   <string name="distribute_task">Distribuzione basata sulle attività</string>
   <string name="no_points_to_allocate">Nessun punto da allocare</string>
-  <string name="points_to_allocate" formatted="false">%d punti da allocare</string>
+  <string name="points_to_allocate">%d punti da allocare</string>
   <string name="distribute_evenly_help">Assegna lo stesso numero di punti ad ogni attributo.</string>
   <string name="distribute_class_help">Assegna più punti agli attributi importanti per la tua Classe.</string>
   <string name="distribute_task_help">Assegna punti in base alle categorie Forza, Intelligenza, Costituzione e Percezione associati alle attività che completi.</string>
@@ -683,9 +560,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="classless">Nessuna classe</string>
   <string name="class_equipment_shop_dialog">Questo oggetto è disponibile solo per una specifica classe.\nPuoi cambiare la tua classe nelle Impostazioni.</string>
   <string name="class_gear_disclaimer">Puoi comprare solo equipaggiamento per la Classe a cui appartieni.</string>
-  <string name="available_stats" formatted="false">%d punti</string>
-  <string name="toogle_emojis">Mostra/nascondi emoji</string>
-  <string name="tavern_description">Benvenuto nella Taverna! Siediti vicino a noi per fare due chiacchiere, o prenditi una pausa dalle tue attività.</string>
+    <string name="tavern_description">Benvenuto nella Taverna! Siediti vicino a noi per fare due chiacchiere, o prenditi una pausa dalle tue attività.</string>
   <string name="check_into_inn">Entra nella Locanda</string>
   <string name="community_guidelines">Linee guida della community</string>
   <string name="view_community_guidelines">Visualizza le Linee guida della community</string>
@@ -699,19 +574,13 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="navigation_drawer_open">Apri menù laterale</string>
   <string name="navigation_drawer_close">Chiudi menù laterale</string>
   <string name="world_boss">Boss Mondiale</string>
-  <string name="world_boss_art">Illustrazione Boss</string>
-  <string name="boss_art">Illustrazione Boss</string>
+    <string name="boss_art">Illustrazione Boss</string>
   <string name="world_boss_description">Descrizione del Boss Mondiale</string>
   <string name="rage_strike_count" formatted="false">Colpi Furia: %d/%d</string>
-  <string name="pending_strike_description">Questo colpo furioso non è ancora successo!\nIl Boss Globale si scaglierà contro uno dei negozianti appena la sua barra della Furia traboccherà. Concentrati sulle tue Daily per cercare di impedirgli di attaccare!</string>
-  <string name="pending_strike_title">Serie in attesa</string>
+    <string name="pending_strike_title">Serie in attesa</string>
   <string name="strike_description_title">Cos\'è un colpo furioso?</string>
-  <string name="strike_description_subtitle">Ci sono 3 possibili colpi furiosi</string>
-  <string name="strike_description_description">Questo indicatore si riempie mano a mano che gli abitanti di Habitica non completano le loro Daily. Se trabocca, il DysHeartener attaccherà uno dei negozianti di Habitica, quindi stai attento e completa le tue attività!</string>
-  <string name="pending_strike_subtitle">Questo colpo furioso non è ancora successo!</string>
-  <string name="strike_active_title" formatted="false">%s è stato attaccato!</string>
-  <string name="strike_active_subtitle" formatted="false">%s ha il cuore spezzato!</string>
-  <string name="strike_active_description" formatted="false">Il nostro beneamato %s era devastato quando il %s frantumò il %s. In fretta, finisci le tue attività per sconfiggere il mostro e aiutare la ricostruzione !!</string>
+    <string name="strike_active_title">%s è stato attaccato!</string>
+    <string name="strike_active_description" formatted="false">Il nostro beneamato %s era devastato quando il %s frantumò il %s. In fretta, finisci le tue attività per sconfiggere il mostro e aiutare la ricostruzione !!</string>
   <string name="questShop">Negozio missioni</string>
   <string name="market_owner_long">Alex il Mercante</string>
   <string name="tavern_owner_long">Daniel il Locandiere</string>
@@ -721,29 +590,21 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="no_party_description">Intraprendi missioni da solo o con amici. Combatti mostri, crea Sfide, e responsabilizzati raggiungendo Squadre.</string>
   <string name="no_party_title">Gioca ad Habitica con una Squadra</string>
   <string name="join_party_description">Dai a un membro squadra il nome utente che troverai sotto e potranno mandarti un invito.</string>
-  <string name="join_party_description_id">Dagli il tuo ID Utente o fagli scannerizzare il tuo QR code durante l\'invito.</string>
-  <string name="join_party_title">Vuoi unirti ad una squadra?</string>
-  <string name="create_party_website">Apri il sito web per creare una squadra</string>
-  <string name="id_copied">ID copiato negli appunti</string>
-  <string name="insufficientSubscriberGems">Hai comprato tutte le Gemme possibili per questo mese. Ulteriori gemme diventano disponibili nei primi tre giorni di ogni mese. Grazie per esserti abbonato/a!</string>
-  <string name="insufficientSubscriberGemsTitle">Limite gemme mensile raggiunto</string>
-  <string name="chat_message">Messaggio Chat</string>
-  <string name="world_boss_description_title">Cos\'è un Boss Mondiale?</string>
-  <string name="world_boss_description_description">Un Boss Mondiale è un evento speciale che unisce tutta la community di Habitica per sconfiggere un potente mostro con le loro attività!\nCompleta delle attività per danneggiare il Boss\nIl Boss Mondiale non ti danneggerà per le attività non completate, ma la sua Furia aumenterà. Se la barra della Furia si riempie, il Boss attaccherà uno dei negozianti di Habitica!\nPuoi continuare i Boss delle missioni normali, il danno verrà applicato a entrambi\nControlla regolarmente la Taverna per vedere i progressi con il Boss Mondiale e gli attacchi Furia.</string>
-  <string name="world_boss_description_intro">Un Boss Mondiale è un evento speciale che unisce tutta la community di Habitica per sconfiggere un potente mostro con le loro attività!</string>
+    <string name="join_party_title">Vuoi unirti ad una squadra?</string>
+    <string name="insufficientSubscriberGems">Hai comprato tutte le Gemme possibili per questo mese. Ulteriori gemme diventano disponibili nei primi tre giorni di ogni mese. Grazie per esserti abbonato/a!</string>
+    <string name="world_boss_description_title">Cos\'è un Boss Mondiale?</string>
+    <string name="world_boss_description_intro">Un Boss Mondiale è un evento speciale che unisce tutta la community di Habitica per sconfiggere un potente mostro con le loro attività!</string>
   <string name="world_boss_description_1">Completa delle attività per danneggiare il Boss</string>
   <string name="world_boss_description_2">Il Boss Mondiale non ti danneggerà per le attività non completate, ma la sua Furia aumenterà. Se la barra della Furia si riempie, il Boss attaccherà uno dei negozianti!</string>
   <string name="world_boss_description_3">Puoi continuare con normali Boss di Missioni, i danni saranno applicati ad entrambi.</string>
   <string name="world_boss_description_4">Vai nella Taverna per vedere i progressi con il Boss Mondiale e gli attacchi Furia.</string>
-  <string name="world_boss_action_prompt" formatted="false">Sconfiggi il Boss per ottenere delle ricompense speciali e salvare Habitica dal terrore di %s!</string>
-  <string name="world_boss_description_subtitle">%s attacca!</string>
-  <string name="questShop_owner_long">Ian la Guida Missione</string>
+  <string name="world_boss_action_prompt">Sconfiggi il Boss per ottenere delle ricompense speciali e salvare Habitica dal terrore di %s!</string>
+    <string name="questShop_owner_long">Ian la Guida Missione</string>
   <string name="seasonalShop_owner_long">Maga Stagionale</string>
   <string name="rage_attack">Attacco Furia:</string>
   <string name="tavern_description_world_boss">Oddio, non fare attenzione al mostro lì sotto — qui siamo ancora in una zona protetta in cui puoi discutere quando fai una pausa.</string>
   <string name="report">Segnala</string>
-  <string name="like">Mi Piace</string>
-  <string name="reply">Rispondi</string>
+    <string name="reply">Rispondi</string>
   <string name="challenge_prize">Premio Sfida</string>
   <string name="challenge_categories">Categorie Sfida</string>
   <string name="created_challenge">Sfida creata</string>
@@ -777,17 +638,15 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="two_handed">Due mani</string>
   <string name="usernamePromptTitle">È giunta l\'ora di scegliere il tuo nome utente!</string>
   <string name="usernamePromptBody">I login sono nuovi, unici nomi utente, che appariranno accanto al tuo nome pubblico e che verranno usati per gli inviti, i @richiami nel chat, e i messaggi.</string>
-  <string name="usernamePromptWiki">Per più ampie informazioni su questo cambiamento, <a href="https://habitica.wikia.com/wiki/Player_Names">visita il wiki.</a></string>
-  <string name="confirmUsername">Conferma nome utente</string>
-  <string name="usernamePromptDisclaimer">I nomi utente devono rispettare i nostri <a href="https://habitica.com/static/terms">Termini di servizio</a> e le <a href="https://habitica.com/static/community-guidelines">Linee guida Comunitarie</a>. Se non hai ancora fissato il tuo login, il tuo nome utente è stato generato automaticamente.</string>
+  <string name="usernamePromptWiki">Per più ampie informazioni su questo cambiamento, <a href="https://habitica.wikia_com/wiki/Player_Names">visita il wiki.</a></string>
+    <string name="usernamePromptDisclaimer">I nomi utente devono rispettare i nostri <a href="https://habitica.com/static/terms">Termini di servizio</a> e le <a href="https://habitica_com/static/community-guidelines">Linee guida Comunitarie</a>. Se non hai ancora fissato il tuo login, il tuo nome utente è stato generato automaticamente.</string>
   <string name="confirm_username_title">Sei sicuro di voler confermare il tuo nome utente attuale?</string>
   <string name="confirm_username_description">Confermando il tuo nome utente, lo renderai pubblico per gli inviti, le @menzioni e i messaggi. Puoi cambiare il tuo nome utente andando nei parametri quando vuoi.</string>
   <string name="cancel">Annulla</string>
   <string name="confirm_username">Conferma Nome Utente</string>
   <string name="username_not_confirmed">Nome Utente non confermato</string>
   <string name="username_confirmed">Nome Utente Confermato</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
-  <string name="enter_recipient_username">Inserisci @username del Destinatario</string>
+    <string name="enter_recipient_username">Inserisci @username del Destinatario</string>
   <string name="username_copied">Nome Utente copiato negli appunti</string>
   <string name="verification_pet">Uno di questi Animali Veterani ti aspetterà dopo che avrai confermato!</string>
   <string name="welcomeNameTitle">Come dovremmo chiamarti?</string>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
index badfe20f3..9a10bb13c 100644
--- a/Habitica/res/values-iw/strings.sidebar.xml
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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.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_tasks">משימות</string>
+  <string name="sidebar_skills">מיומניויות</string>
+  <string name="sidebar_section_social">חברתי</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_about">אודות</string>
   <string name="sidebar_shops">חנויות</string>
-<string name="sidebar.inbox">הודעות</string>
+<string name="sidebar_inbox">הודעות</string>
     <string name="sidebar_stats">נתונים סטטיסטיים</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.tutorial.xml b/Habitica/res/values-iw/strings.tutorial.xml
index 2b2403403..2c2c1c5d7 100644
--- a/Habitica/res/values-iw/strings.tutorial.xml
+++ b/Habitica/res/values-iw/strings.tutorial.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
-  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
-  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
-  <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
+    <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
   <string name="tutorial_party">זה המקום בו אתם וחבריכם יכולים לישמור על עצמכם מחוייבים למטרות ולהלחם במפלצות עם המשימות שלכם!</string>
   <string name="tutorial_tavern">ברוכים הבאים לפונדק, צ׳אט פומבי לכל הגילאים! כאן תוכלו לדבר על פרודוקטיביות ולשאול שאלות. תהנו!</string>
-  <string name="tutorial_classes">ביחרו להיות לוחמים, מכשפים, מרפאים או נוכלים! לכל מקצוע ציוד ומיומנויות משלו. לחצו על ה (?) כדי ללמוד עוד!</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 608cb211b..e304842fd 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -4,17 +4,14 @@
   <string name="XP_default">ניסיון</string>
   <string name="HP_default">בריאות</string>
   <string name="MP_default">מאנה</string>
-  <string name="ERR_pb_barcode">העדפות לא הצליחו להטען מהבר-קוד</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">הגדרות</string>
-  <string name="SP_address_hint">שרת מותאם אישית אליכם</string>
-  <string name="SP_userID_title">מזהה משתמש</string>
+    <string name="SP_userID_title">מזהה משתמש</string>
   <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
   <string name="SP_APIToken_title">מפתח API</string>
   <string name="SP_APIToken_summary">מפתח ה API שלכם</string>
   <string name="Language_title">שפה</string>
-  <string name="SP_user_qr_code">קוד ה QR שלכם</string>
-  <string name="PS_contact_title">צרו איתי קשר</string>
+    <string name="PS_contact_title">צרו איתי קשר</string>
   <string name="pref_account_header">חשבון</string>
   <string name="pref_first_day_of_the_week_title">היום הראשון בשבוע</string>
   <string name="pref_reminder_header">תזכורת יומית</string>
@@ -30,10 +27,8 @@
   <string name="preference_push_your_quest_has_begun">ההרפתקה שלכם החלה</string>
   <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
   <!--Adding tasks-->
-  <string name="task_value">ערך</string>
-  <string name="action_edit">עריכה</string>
-  <string name="action_delete">מחיקה</string>
-  <string name="action_cancel">ביטול</string>
+    <string name="action_edit">עריכה</string>
+    <string name="action_cancel">ביטול</string>
   <string name="login_btn">התחברות</string>
   <string name="register_btn">הרשמו</string>
   <string name="username">שם משתמש</string>
@@ -43,31 +38,23 @@
   <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>
+    <string name="LoginActivityName">ברוכים הבאים</string>
+    <string name="about_title">אודות</string>
+  <string name="about_libraries">ספריות</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="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_title">שגיאת אימות</string>
   <string name="login_validation_error_fieldsmissing">עליכם למלא את כל השדות.</string>
   <string name="save_changes">שמור</string>
   <string name="copy">העתק</string>
   <string name="notes">הערות</string>
-  <string name="text">טקסט</string>
-  <string name="difficulty">רמת קושי</string>
+    <string name="difficulty">רמת קושי</string>
   <string name="tags">תגיות</string>
   <string name="trivial">טריוויאלי</string>
   <string name="easy">קל</string>
@@ -78,12 +65,8 @@
   <string name="negative_habit_form">שלילי ( - )</string>
   <string name="checklist">רשימה</string>
   <string name="reminders">תזכורות</string>
-  <string name="actions">פעולות</string>
-  <string name="attributes">תכונות</string>
-  <string name="frequency">תדירות</string>
-  <string name="frequency_weekly">בימים מסויימים בשבוע</string>
-  <string name="frequency_daily">כל X ימים</string>
-  <string name="monday">שני</string>
+    <string name="attributes">תכונות</string>
+    <string name="monday">שני</string>
   <string name="tuesday">שלישי</string>
   <string name="wednesday">רביעי</string>
   <string name="thursday">חמישי</string>
@@ -95,22 +78,13 @@
   <string name="faint_header">נגמרה לכם הבריאות!</string>
   <string name="faint_button">מלאו בריאות ונסו מחדש</string>
   <string name="filter">מסנן</string>
-  <string name="profile_image">תמונת פרופיל</string>
-  <string name="mana_price_button">%d מאנה</string>
-  <string name="used_skill">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
-  <string name="new_checklist_item">שורה חדשה לרשימה</string>
-  <string name="add_checklist_item">הוסף</string>
-  <string name="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="tavern.inn.checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
-  <string name="tavern.inn.rest">עצרו את המטלות היומיות שלכם</string>
-  <string name="reward.dialog.buy">קנייה</string>
-  <string name="reward.dialog.dismiss">בטל</string>
+    <string name="new_checklist_item">שורה חדשה לרשימה</string>
+    <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
+    <string name="forgot_pw_btn">שכחתי סיסמה</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>
@@ -118,24 +92,20 @@
   <string name="dailies">מטלות יומיות</string>
   <string name="todos">מטרות</string>
   <string name="rewards">פרסים</string>
-  <string name="taskform.delete.title">האם אתם בטוחים?</string>
-  <string name="taskform.delete.message">האם אתם באמת רוצים למחוק?</string>
-  <string name="yes">כן</string>
+    <string name="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_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">גודל</string>
   <string name="avatar_size_slim">רזה</string>
   <string name="avatar_size_broad">רחב</string>
   <string name="avatar_background">רקע</string>
@@ -144,26 +114,18 @@
   <string name="purchase_button">קנייה</string>
   <string name="purchase_set_title">קנו סט %s</string>
   <string name="due_date">תאריך יעד</string>
-  <string name="quest.accept">קבלו</string>
-  <string name="quest.reject">דחו</string>
-  <string name="quest.begin">התחילו הרפתקאה</string>
-  <string name="quest.cancel">בטלו הזמנה</string>
-  <string name="quest.abort">הפסיקו את ההרפתקאה</string>
-  <string name="quest.leave">עיזבו הרפתקאה</string>
-  <string name="quest.pending">ממתין</string>
-  <string name="quest.accepted">התקבל</string>
-  <string name="quest.rejected">נדחה</string>
-  <string name="quest.participants">משתתפים</string>
-  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
+  <string name="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="sidebar_help">עזרה ושאלות נפוצות</string>
   <string name="complete_tutorial">הבנתי!</string>
   <string name="dismiss_tutorial">הזכר לי שוב</string>
   <string name="intro_3_description">שימרו על קצב התקדמות עם עזרה מחבריכם. תימכו אחד בשני בחיים ובקרב ככל שאתם משתפרים ביחד!</string>
-  <string name="previous_button">קודם</string>
-  <string name="next_button">הבא</string>
+    <string name="next_button">הבא</string>
   <string name="skip_button">דלגו</string>
-  <string name="setup_welcome_description">ברוכים הבאים להאביטיקה, המקום בו התקדמות במשחק תשפר אתכם בחיים האמיתיים! ככל שאתם משיגים יעדים בעולם האמיתי, תשחררו ציוד, חיות מחמד, הרפתקאות, ועוד.</string>
-  <string name="setup_welcome_title">ברוכים הבאים</string>
-  <string name="setup_group_work">עבודה</string>
+    <string name="setup_group_work">עבודה</string>
   <string name="setup_group_exercise">התעמלות</string>
   <string name="setup_group_school">בית-ספר</string>
   <string name="setup_group_teams">קבוצות</string>
@@ -190,27 +152,19 @@
   <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="my_guilds">הגילדות שלי</string>
   <string name="public_guilds">גילדות פומביות</string>
   <string name="guild">גילדה</string>
   <string name="leave">עיזבו</string>
   <string name="join">הצטרפו</string>
-  <string name="leader">מנהיג</string>
-  <string name="gems">אבני חן</string>
-  <string name="send_pm">שילחו הודעה פרטית</string>
-  <string name="flag">דיווח</string>
-  <string name="delete">מחיקה</string>
+    <string name="gems">אבני חן</string>
+    <string name="delete">מחיקה</string>
   <string name="name">שם</string>
   <string name="description">תיאור</string>
   <string name="privacy">פרטיות</string>
   <string name="write_message">כיתבו הודעה</string>
-  <string name="post">שליחה</string>
-  <string name="guild_search_hint">חיפוש אחר גילדות</string>
-  <string name="todo_due">חל: %s</string>
-  <string name="daily_streak">רצף נוכחי: %d</string>
-  <string name="todo_has_duedate">למשימה יש תאריך יעד</string>
-  <string name="battle_gear">ציוד קרב</string>
+    <string name="guild_search_hint">חיפוש אחר גילדות</string>
+    <string name="battle_gear">ציוד קרב</string>
   <string name="costume">תחפושת</string>
   <string name="outfit_head">ראש</string>
   <string name="outfit_headAccessory">אביזר ראש</string>
@@ -223,9 +177,7 @@
   <string name="wear_costume">ליבשו תחפושת</string>
   <string name="equipped">מצוייד</string>
   <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
-  <string name="quest.invitation">הזמנה להרפתקאה</string>
-  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
-  <string name="today">היום</string>
+    <string name="today">היום</string>
   <string name="sidebar_items">חפצים</string>
   <string name="eggs">ביצים</string>
   <string name="hatching_potions">שיקויי הבקעה</string>
@@ -236,13 +188,9 @@
   <string name="armoireEquipment">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
   <string name="armoireFood">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
   <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
-  <string name="armoireNotesFull">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
-  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
-  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
-  <string name="sell">מיכרו (%d זהב)</string>
+    <string name="sell">מיכרו (%d זהב)</string>
   <string name="hatch_with_potion">הבקיעו עם שיקוי</string>
-  <string name="feed_to_pet">האכילו חיית מחמד</string>
-  <string name="hatch_egg">הבקיעו עם ביצה</string>
+    <string name="hatch_egg">הבקיעו עם ביצה</string>
   <string name="invite_party">הזמינו חבורה</string>
   <string name="dialog_feeding">האכלתם %s עם:</string>
   <string name="use_animal">השתמשו</string>
@@ -265,8 +213,7 @@
   <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
   <string name="select_class">בחרו מקצוע</string>
   <string name="opt_out_class">וותרו</string>
-  <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
-  <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
+    <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
   <string name="choose_class">בחרו מקצוע</string>
   <string name="dialog_go_back">חזרה</string>
   <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
@@ -277,76 +224,38 @@
   <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="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="email">מייל</string>
+    <string name="share_using">שתפו באמצעות</string>
   <string name="share_hatched">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
   <string name="open_in_store">פתיחה בפליי סטור</string>
   <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
-  <string name="leaderMessage">הודעה מאת %1$s</string>
-  <string name="confirm">אישור</string>
+    <string name="confirm">אישור</string>
   <string name="market">שוק</string>
   <string name="timeTravelers">נוסעים בזמן</string>
   <string name="seasonalShop">חנות עונתית</string>
   <string name="party_invite">שחררו על-ידי הזמנת חברים</string>
-  <string name="no_gold">אין די זהב</string>
-  <string name="no_potion">אינכם צריכים לקנות שיקוי בריאות</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="gold_plural">זהב</string>
   <string name="chat_message_copied">הודעה הועתקה ללוח</string>
-  <string name="copy_chat_message">העתקה ללוח</string>
-  <string name="edit_tag_title">עריכת תג</string>
-  <string name="edit_tag_btn_edit">עריכה</string>
-  <string name="edit_tag_btn_done">בוצע</string>
-  <string name="edit_tag_btn_delete">מחיקה</string>
-  <string name="confirm_delete_tag_title">האם אתם בטוחים?</string>
+    <string name="edit_tag_btn_edit">עריכה</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">בחרו נמען להודעה</string>
   <string name="action_continue">המשך</string>
-  <string name="scan_qr_code">סריקת קוד QR</string>
-  <!--Login Incentives-->
+    <!--Login Incentives-->
   <string name="subscriptions">הרשמות</string>
   <string name="subscribe">הרשמה</string>
 <string name="Language_summary">שנה את השפה של האביטיקה</string>
-    <string name="unknown_error">שגיאה התרחשה…</string>
     <string name="pref_first_day_of_the_week_summary">היום הראשון בשבוע בכל לוחות השנה</string>
     <string name="pref_cds_header">התחלה ביום בבחירה אישית</string>
-    <string name="pref_cds_picker">בחר יום להתחלה בעצמך</string>
 
     <string name="push_notifications_sum">וסט את הגדרות התראות הדחיפה</string>
     <string name="preference_push_invited_to_guild">הוזמנת לגילדה</string>
-    <string name="new_todo">פרויקט חדש</string>
-    <string name="new_reward">תגמול חדש</string>
-    <string name="new_daily">משימה יומית חדשה</string>
-    <string name="new_habit">הרגל חדש</string>
-    <string name="repeatEvery">חזור כל</string>
 
 
-    <string name="physical">כוח</string>
-    <string name="mental">אינטיליגנציה</string>
-    <string name="social">עקביות</string>
-    <string name="other">תפיסה</string>
-
-    <string name="repeatables_title">חזרתיות</string>
-    <string name="repeatables_on_title">חזור ב</string>
     <string name="repeatables_frequency_daily">יומי</string>
     <string name="repeatables_frequency_weekly">שבועי</string>
     <string name="repeatables_frequency_monthly">חודשי</string>
@@ -363,5 +272,4 @@
     <string name="version_info">גרסא %1$s (%2$d)</string>
 
     <string name="intro_1_subtitle">ברוכים הבאים ל</string>
-    <string name="intro_1_title">האביטיקה</string>
-    </resources>
+</resources>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index 766c825f0..21f451774 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">レベル : </string>
     <string name="profile_class_bonus">クラスボーナス : </string>
     <string name="profile_allocated">割当済み : </string>
-    <string name="profile_boosts">勢い : </string>
     <string name="profile_private_message">プライベートメッセージ</string>
     <string name="profile_achievements">実績</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">閉じる</string>
 
 </resources>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index 6176ab897..63d29081d 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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">Habitica について</string>
+  <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_about">Habitica について</string>
   <string name="sidebar_shops">ショップ</string>
   <string name="sidebar_stats">ステータス</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.tutorial.xml b/Habitica/res/values-ja/strings.tutorial.xml
index 4919b000d..4a65497a9 100644
--- a/Habitica/res/values-ja/strings.tutorial.xml
+++ b/Habitica/res/values-ja/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">得られたゴールドであなたのアバター用に装備を購入しましょう！</string>
   <string name="tutorial_rewards_2">あなた自身のモチベーションを上げるために、現実世界での報酬を登録することもできます。</string>
   <string name="tutorial_tasks_complete">これで説明は終わり。もし忘れちゃったときは，FAQをチェックしてみてね。</string>
-  <string name="tutorial_equipment">装備を買ったら、ここに表示されるよ。武装はアバターのステータスに影響し、(有効にすれば)衣装としてアバターの見た目を変えるよ。</string>
-  <string name="tutorial_items">タスクを達成したりレベルを上げることで、アイテムを入手できます。アイテムを使うにはタップしましょう！</string>
-  <string name="tutorial_pets">現実世界のタスクを達成すると、ランダムに「たまご」や「たまごがえしの薬」を見つけるチャンスが得られます。組み合わせてペットをかえしてみましょう</string>
-  <string name="tutorial_skills">スキルは、強力な効果を持つ特殊能力です！ スキルをタップして使いましょう。スキルを使うとマナ (青いバー) が減ります。マナは、毎日チェックして実生活のタスクを達成することで獲得できます。詳しくは、メニューのFAQをチェックしましょう！</string>
+    <string name="tutorial_skills">スキルは、強力な効果を持つ特殊能力です！ スキルをタップして使いましょう。スキルを使うとマナ (青いバー) が減ります。マナは、毎日チェックして実生活のタスクを達成することで獲得できます。詳しくは、メニューのFAQをチェックしましょう！</string>
   <string name="tutorial_party">ここは、あなたと仲間たちが目標達成のために互いに責任感を持ち続けられる場です。タスクをこなしてモンスターと戦うことができます！</string>
   <string name="tutorial_tavern">キャンプ場へようこそ!　ここは年齢なんか気にしないオープンなチャットルームです。ここでタスクの進め方について話したり、質問したりできます。楽しんでね!</string>
-  <string name="tutorial_classes">戦士、魔道士、治療師、それとも盗賊…どれになるか決めよう!　クラスにはそれぞれ専用の装備とスキルがある。詳しくは (?) をタップしてね!</string>
-  <string name="tutorial_stats">一度にステータスを割り当てるには灰色のボタンを、1つずつ割り振るには矢印をタップして下さい。</string>
+    <string name="tutorial_stats">一度にステータスを割り当てるには灰色のボタンを、1つずつ割り振るには矢印をタップして下さい。</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index f7c7c2fbb..88eb1c955 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">経験値</string>
   <string name="HP_default">体力</string>
   <string name="MP_default">マナ</string>
-  <string name="ERR_pb_barcode">設定をバーコードから読み込むことができませんでした</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">設定</string>
-  <string name="SP_address_hint">カスタムサーバー</string>
-  <string name="SP_userID_title">ユーザーID</string>
+    <string name="SP_userID_title">ユーザーID</string>
   <string name="SP_userID_summary">あなたのユーザーID</string>
   <string name="SP_APIToken_title">API トークン</string>
   <string name="SP_APIToken_summary">あなたの API トークン</string>
   <string name="Language_title">言語</string>
   <string name="Language_summary">Habitica の言語を変更する</string>
-  <string name="SP_user_qr_code">QR コード</string>
-  <string name="PS_contact_title">開発者に連絡する</string>
-  <string name="unknown_error">エラーが発生しました…</string>
-  <string name="pref_account_header">アカウント</string>
+    <string name="PS_contact_title">開発者に連絡する</string>
+    <string name="pref_account_header">アカウント</string>
   <string name="pref_first_day_of_the_week_title">週の最初の曜日</string>
   <string name="pref_first_day_of_the_week_summary">すべてのカレンダーでの週の最初の曜日</string>
   <string name="pref_reminder_header">毎日の通知</string>
   <string name="pref_reminder_checkbox">通知を有効にする</string>
   <string name="pref_reminder_picker">通知時間を設定</string>
   <string name="pref_cds_header">日付更新の設定</string>
-  <string name="pref_cds_picker">日付更新の時間を設定する</string>
-  <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
+    <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
   <string name="push_notifications">プッシュ通知</string>
   <string name="push_notifications_sum">プッシュ通知を設定してください</string>
   <string name="preference_push_you_won_challenge">チャレンジで勝ちました!</string>
@@ -37,14 +32,8 @@
   <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">To-Do を追加</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="action_edit">編集</string>
+    <string name="action_cancel">戻る</string>
   <string name="login_btn">ログイン</string>
   <string name="register_btn">登録する</string>
   <string name="username">ユーザー名</string>
@@ -54,32 +43,23 @@
   <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">Widget を使う前に、アプリから接続してください</string>
-  <string name="about.title">Habitica について</string>
-  <string name="about.libraries">ライブラリー</string>
-  <string name="about.versionhistory">バージョン履歴</string>
-  <string name="about.habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています</string>
-  <string name="about.rate_our_app">このアプリをレビュー</string>
-  <string name="about.give_us_feedback">フィードバックを送る!</string>
-  <string name="about.bugreport">バグを報告する</string>
-  <string name="about.source_code">ソースコード</string>
-  <string name="repeatEvery">くり返しの間隔</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="LoginActivityName">ようこそ</string>
+    <string name="about_title">Habitica について</string>
+  <string name="about_libraries">ライブラリー</string>
+    <string name="about_habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています</string>
+  <string name="about_rate_our_app">このアプリをレビュー</string>
+  <string name="about_give_us_feedback">フィードバックを送る!</string>
+  <string name="about_bugreport">バグを報告する</string>
+  <string name="about_source_code">ソースコード</string>
+    <!--Network Errors-->
+    <string name="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_title">確認エラー</string>
   <string name="login_validation_error_fieldsmissing">入力欄のすべてに入力してください。</string>
   <string name="save_changes">保存</string>
   <string name="copy">コピー</string>
   <string name="notes">メモ</string>
-  <string name="text">テキスト</string>
-  <string name="difficulty">難易度</string>
+    <string name="difficulty">難易度</string>
   <string name="tags">タグ</string>
   <string name="trivial">ちょろい</string>
   <string name="easy">かんたん</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">悪い ( - )</string>
   <string name="checklist">チェックリスト</string>
   <string name="reminders">通知</string>
-  <string name="actions">行動</string>
-  <string name="attributes">属性</string>
-  <string name="physical">力</string>
-  <string name="mental">知能</string>
-  <string name="social">体質</string>
-  <string name="other">知覚</string>
-  <string name="frequency">頻度</string>
-  <string name="frequency_weekly">決まった曜日</string>
-  <string name="frequency_daily">何日かごと</string>
-  <string name="repeatables_summary_title">要約</string>
-  <string name="repeatables_title">くり返し</string>
-  <string name="repeatables_on_title">くり返しの基準</string>
-  <string name="repeatables_frequency_daily">日課</string>
+    <string name="attributes">属性</string>
+    <string name="repeatables_frequency_daily">日課</string>
   <string name="repeatables_frequency_weekly">週間</string>
   <string name="repeatables_frequency_monthly">月間</string>
   <string name="repeatables_frequency_yearly">年間</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">体力がなくなった!</string>
   <string name="faint_button">体力を全回復してやり直す</string>
   <string name="filter">フィルター</string>
-  <string name="profile_image">プロフィール画像</string>
-  <string name="mana_price_button">%d マナ</string>
-  <string name="used_skill">%2$dマナを消費して%1$sを唱えた。</string>
-  <string name="used_skill_without_mana">%1$s を唱えた。</string>
+    <string name="used_skill_without_mana">%1$s を唱えた。</string>
   <string name="new_checklist_item">新しいチェックリスト項目</string>
-  <string name="add_checklist_item">追加</string>
-  <string name="reminder_title">忘れずにタスクをチェックしましょう</string>
-  <string name="skill_progress_title">使用中のスキル</string>
-  <string name="coming_soon">近日中</string>
-  <string name="chat_flag_confirmation">このメッセージを違反として報告します。いいですか?</string>
-  <string name="flag_confirm">メッセージに印をつける</string>
-  <string name="unlock_lvl_11">レベル11 でアンロック</string>
-  <string name="no_party_message">パーティーに参加してないよ。パーティーに参加する方法を website で確認して。</string>
-  <string name="forgot_pw_btn">パスワードがわからない</string>
-  <string name="tavern.inn.checkOut">日課を再開する</string>
-  <string name="tavern.inn.rest">日課を中断する</string>
-  <string name="reward.dialog.buy">買う</string>
-  <string name="reward.dialog.dismiss">中止</string>
+    <string name="reminder_title">忘れずにタスクをチェックしましょう</string>
+    <string name="unlock_lvl_11">レベル11 でアンロック</string>
+    <string name="forgot_pw_btn">パスワードがわからない</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>
@@ -148,24 +108,20 @@
   <string name="dailies">日課</string>
   <string name="todos">To-Do</string>
   <string name="rewards">ごほうび</string>
-  <string name="taskform.delete.title">よろしいですか?</string>
-  <string name="taskform.delete.message">削除します。いいですか?</string>
-  <string name="yes">はい</string>
+    <string name="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_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">サイズ</string>
   <string name="avatar_size_slim">スリム</string>
   <string name="avatar_size_broad">がっしり</string>
   <string name="avatar_background">背景</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">購入</string>
   <string name="purchase_set_title">%s セットを購入</string>
   <string name="due_date">期限日</string>
-  <string name="quest.accept">承認</string>
-  <string name="quest.reject">拒否</string>
-  <string name="quest.begin">クエストをはじめる</string>
-  <string name="quest.cancel">招待を中止する</string>
-  <string name="quest.abort">クエストを中断する</string>
-  <string name="quest.leave">クエストを抜ける</string>
-  <string name="quest.pending">保留</string>
-  <string name="quest.accepted">承認済</string>
-  <string name="quest.rejected">拒否</string>
-  <string name="quest.participants">参加者</string>
-  <string name="version_info">バージョン : %1$s (%2$d)</string>
+  <string name="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="version_info">バージョン : %1$s (%2$d)</string>
   <string name="sidebar_help">ヘルプとFAQ</string>
   <string name="complete_tutorial">わかった!</string>
   <string name="dismiss_tutorial">もう一度通知</string>
   <string name="intro_1_subtitle">へよこそう</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">やるべきことを片付けながら楽しむ時が来ました。 現在%s人以上の方々がタスクをこなしながら人生を楽しんでいます。</string>
+    <string name="intro_1_description">やるべきことを片付けながら楽しむ時が来ました。 現在%s人以上の方々がタスクをこなしながら人生を楽しんでいます。</string>
   <string name="intro_2_subtitle">ゲームの進行</string>
   <string name="intro_2_title">人生の進行</string>
   <string name="intro_2_description">実生活でタスクをこなし、ゲーム内の機能をアンロックしよう。よろいやペットなどのさまざまなアイテムを、あなた自身の目標に近づいたごほうびとして獲得しよう。</string>
@@ -198,12 +148,9 @@
   <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="next_button">次へ</string>
   <string name="skip_button">スキップ</string>
-  <string name="setup_welcome_description">Habitica へようこそ。ここはゲームが進むほどに、あなたの実生活が改善されるところ!　あなたが現実世界のゴールを達成すれば、装備やペット、クエストなどなど、新たな世界が広がるよ。</string>
-  <string name="setup_welcome_title">ようこそ</string>
-  <string name="avatar_setup_description">さあ、どんな格好をしたい？　心配しないで、後で変えることもできるから。</string>
+    <string name="avatar_setup_description">さあ、どんな格好をしたい？　心配しないで、後で変えることもできるから。</string>
   <string name="task_setup_description">すばらしい！　では、この冒険の旅で、自分の生活のどの部分を改善したい？</string>
   <string name="setup_group_work">仕事</string>
   <string name="setup_group_exercise">エクササイズ</string>
@@ -233,30 +180,20 @@
   <string name="setup_task_creativity_1">手芸を習う</string>
   <string name="setup_task_creativity_2">創造的なプロジェクトで働く</string>
   <string name="setup_task_creativity_3">創造的なプロジェクトを完了する</string>
-  <string name="gem.purchase.support">Habitica の運営を手伝ってくれませんか?　ジェムを買うことでアプリの開発者を支援できます!\n\nジェムはあなたのアカウントの楽しいおまけを買うことができます。おまけの例: \n\n - アバターのカッコいい衣装\n
- - すんごい背景\n - ペットのタマゴがごほうびの楽しいクエスト\n - レベル100になるまでにクラスを変更できる\n\nHabiticaが最高のものになる手助けをしてくれるとうれしいです。あなたの支援は私たちにとって多くの意味があることなんです!</string>
-  <string name="my_guilds">所属ギルド</string>
+    <string name="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">To-Doとしてコピー</string>
-  <string name="send_pm">PMを送る</string>
-  <string name="flag">フラグ</string>
-  <string name="delete">削除</string>
+    <string name="gems">ジェム</string>
+    <string name="delete">削除</string>
   <string name="name">名前</string>
   <string name="description">詳細</string>
   <string name="add_tag">タグを追加する</string>
   <string name="privacy">プライバシー</string>
   <string name="write_message">メッセージを書く</string>
-  <string name="post">投稿</string>
-  <string name="guild_search_hint">ギルドを検索</string>
-  <string name="todo_due">期限 : %s</string>
-  <string name="daily_streak">現在の連続実行 : %d 回</string>
-  <string name="todo_has_duedate">期限ありタスク</string>
-  <string name="battle_gear">武装</string>
+    <string name="guild_search_hint">ギルドを検索</string>
+    <string name="battle_gear">武装</string>
   <string name="costume">衣装</string>
   <string name="outfit_head">頭</string>
   <string name="outfit_headAccessory">頭部のアクセサリー</string>
@@ -269,10 +206,8 @@
   <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">本当によろしいですか？あなたの%2$dパーティメンバーのうち、 %1$d人しかクエストに参加していません！クエストはすべてのプレーヤーが参加すると自動的に始まります。</string>
-  <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
-  <string name="ago_1day">1日前</string>
+    <string name="quest_begin_message">本当によろしいですか？あなたの%2$dパーティメンバーのうち、 %1$d人しかクエストに参加していません！クエストはすべてのプレーヤーが参加すると自動的に始まります。</string>
+    <string name="ago_1day">1日前</string>
   <string name="ago_days">%d日前</string>
   <string name="ago_1Minute">1分前</string>
   <string name="ago_minutes">%d分前</string>
@@ -289,13 +224,9 @@
   <string name="armoireEquipment">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
   <string name="armoireFood">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
   <string name="armoireExp">宝箱と格闘して経験値を増やした。どうぞっ!</string>
-  <string name="armoireNotesFull">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
-  <string name="armoireLastItem">最後の貴重なアイテムをラッキー宝箱で発見した。</string>
-  <string name="armoireNotesEmpty">宝箱には毎月最初の週に新しいアイテムが入ります。それまでは、クリックして経験値やえさを手に入れよう!</string>
-  <string name="sell">%d ゴールドで売る</string>
+    <string name="sell">%d ゴールドで売る</string>
   <string name="hatch_with_potion">たまごがえしの薬を使う</string>
-  <string name="feed_to_pet">ペットにえさをやる</string>
-  <string name="hatch_egg">たまごをかえす</string>
+    <string name="hatch_egg">たまごをかえす</string>
   <string name="invite_party">パーティーを招待する</string>
   <string name="dialog_feeding">%s にえさをやる :</string>
   <string name="use_animal">連れていく</string>
@@ -306,17 +237,8 @@
   <string name="close">閉じる</string>
   <string name="share">共有する</string>
   <string name="notification_pet_fed">%sにえさをやった!</string>
-  <string name="notification_purchase">%sを購入しました</string>
-  <string name="notification_purchase_reward">報酬をを購入しました</string>
-  <string name="sectiondrop">ふつうの</string>
-  <string name="sectionpremium">魔法の薬</string>
-  <string name="sectionquest">クエスト</string>
-  <string name="sectionspecial">レアな</string>
-  <string name="sectionmounts">ふつうの</string>
-  <string name="sectionpremiumMounts">魔法の薬</string>
-  <string name="sectionquestMounts">クエスト</string>
-  <string name="sectionspecialMounts">レアな</string>
-  <string name="world_quest">世界のクエスト</string>
+    <string name="notification_purchase_reward">報酬をを購入しました</string>
+    <string name="world_quest">世界のクエスト</string>
   <string name="inn_description">休憩が必要？ダニエルの宿屋にチェックインし、Habiticaのややこしいゲームシステムを一時停止しましょう:
 ・日課をこなさなくてもダメージを受けなくなります
 ・タスクの連続実行は変更されなくなり、色も変わらなくなります
@@ -335,8 +257,7 @@
   <string name="healer_description">治療師は痛みに耐え、他人を守るのです。やらなかった日課や悪い習慣にも治療師は動揺せず、失敗から体力を回復させる能力がある。パーティーの他のメンバーを助けることに喜びを感じる、困難な仕事による死をも恐れぬ理想があるのなら、治療師でプレーしよう!</string>
   <string name="select_class">クラスを選ぶ</string>
   <string name="opt_out_class">選ばない</string>
-  <string name="opt_out_description">クラスなんてめんどくさい？ 後で選びたい？ 選ばなくても構いません。スキルのない戦士になります。クラスのしくみについて後でwikiを参照して、いつでもクラスを有効にできます。</string>
-  <string name="class_confirmation">%s になります。いいですか?</string>
+    <string name="class_confirmation">%s になります。いいですか?</string>
   <string name="class_changed">あなたは%s に転職した！</string>
   <string name="class_changed_description">新たな標準の武装を手に入れました。「装備」で取り換えることもできます！</string>
   <string name="choose_class">クラスを選ぶ</string>
@@ -350,23 +271,18 @@
   <string name="invite_existing_users">登録済みのユーザー</string>
   <string name="send">送信</string>
   <string name="invite">友達を招待する</string>
-  <string name="invite_id_description">すでに Habitica に登録しているユーザーに友達がいるなら、その人たちをユーザーIDで招待するよ。</string>
-  <string name="invite_username_description">Habiticaをやってる友達がいたら、ユーザー名を入力してパーティーに招待しよう。</string>
+    <string name="invite_username_description">Habiticaをやってる友達がいたら、ユーザー名を入力してパーティーに招待しよう。</string>
   <string name="invite_email_description">メールを通じて、友達が Habitica に登録したら、自動的にあなたのパーティーに招待するよ！</string>
   <string name="add_invites">招待の追加</string>
-  <string name="user_id">ユーザーID</string>
-  <string name="email">メール</string>
-  <string name="invite_users">パーティーへ招待する</string>
-  <string name="share_using">共有 ( シェア ) : </string>
+    <string name="email">メール</string>
+    <string name="share_using">共有 ( シェア ) : </string>
   <string name="share_levelup">生活を改善して、Habitica でのレベルが %d になった!</string>
   <string name="share_hatched">実生活でのタスクをこなして、Habitica で %1$s%2$s のペットを飼いはじめた。</string>
   <string name="share_raised">実生活でのタスクをこなして、%1$s のペットが乗れるほど大きな乗騎まで成長した。</string>
   <string name="open_in_store">Play ストアで開く</string>
   <string name="change_class_confirmation">クラスを変更します。いいですか? 3 ジェムかかります。</string>
   <string name="change_class_equipment_warning">注意 : %s クラスの装備を買うことはできなくなります。</string>
-  <string name="leaderMessage">%1$s からのメッセージ</string>
-  <string name="leaderName">リーダー : %1$s</string>
-  <string name="confirm">確認</string>
+    <string name="confirm">確認</string>
   <string name="market">市場</string>
   <string name="timeTravelers">タイムトラベラー</string>
   <string name="seasonalShop">期間限定ショップ</string>
@@ -374,37 +290,16 @@
   <string name="party_invite">友達を招待するとアンロック</string>
   <string name="login_incentive">Habiticaに連続でログインするとアンロック</string>
   <string name="create_account">アカウントを作成するとアンロック</string>
-  <string name="no_gold">ゴールドが足りません</string>
-  <string name="no_potion">体力回復の薬を買う必要がありません</string>
-  <string name="successful_purchase">%1$sを購入しました</string>
-  <string name="purchase_confirmation_title">購入の確認</string>
-  <string name="confirm_purchase_text">%2$s %3$s で %1$s  を買う</string>
-  <string name="gem">ジェム</string>
-  <string name="hourglass">砂時計</string>
-  <string name="hourglasses">砂時計</string>
-  <string name="gold_singular">ゴールド</string>
-  <string name="gold_plural">ゴールド</string>
+    <string name="successful_purchase">%1$sを購入しました</string>
+    <string name="gold_plural">ゴールド</string>
   <string name="chat_message_copied">メッセージをクリップボードにコピーしました</string>
-  <string name="copy_chat_message">クリップボードにコピー</string>
-  <string name="edit_tag_title">タグを編集</string>
-  <string name="edit_tag_btn_edit">編集</string>
-  <string name="edit_tag_btn_done">完了</string>
-  <string name="edit_tag_btn_delete">削除</string>
-  <string name="confirm_delete_tag_title">よろしいですか?</string>
+    <string name="edit_tag_btn_edit">編集</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">メッセージの送信先を選択</string>
   <string name="action_continue">続行</string>
-  <string name="scan_qr_code">QR コードを読み取る</string>
-  <string name="enter_recipient_uuid">送信先の ユーザー ID を入力</string>
-  <string name="invited_to_party">パーティーに招待されました!</string>
+    <string name="invited_to_party">パーティーに招待されました!</string>
   <string name="stats_widget_label">Habitica ステータス</string>
   <string name="add_task">タスクを追加</string>
   <string name="add_habit">習慣を追加</string>
@@ -415,15 +310,14 @@
   <string name="widget_habit_button">Habitica の習慣</string>
   <string name="widget_dailies">Habitica の日課</string>
   <string name="widget_todo_list">Habitica のTo-Do リスト</string>
-  <string name="widget_add_task">Habitica のタスク追加</string>
-  <string name="google_services_missing">Google Play サービスが見つかりません。</string>
-  <string name="gem.purchase.toolbartitle">購入</string>
-  <string name="gem.purchase.title">ジェムを購入することで、開発者を支援し、Habitica の運営を維持する手助けができます</string>
-  <string name="gem.purchase.subtitle">ジェムで、楽しいおまけを買うことができます : </string>
-  <string name="gem.purchase.listitem1">アバター用のクールなファッション</string>
-  <string name="gem.purchase.listitem2">すんごい背景</string>
-  <string name="gem.purchase.listitem3">ペットのたまごを獲得できるクエスト</string>
-  <string name="gem.purchase.listitem4">レベル 100 以前でのクラス変更</string>
+    <string name="google_services_missing">Google Play サービスが見つかりません。</string>
+  <string name="gem_purchase_toolbartitle">購入</string>
+  <string name="gem_purchase_title">ジェムを購入することで、開発者を支援し、Habitica の運営を維持する手助けができます</string>
+  <string name="gem_purchase_subtitle">ジェムで、楽しいおまけを買うことができます : </string>
+  <string name="gem_purchase_listitem1">アバター用のクールなファッション</string>
+  <string name="gem_purchase_listitem2">すんごい背景</string>
+  <string name="gem_purchase_listitem3">ペットのたまごを獲得できるクエスト</string>
+  <string name="gem_purchase_listitem4">レベル 100 以前でのクラス変更</string>
   <string name="support_habitica">Habitica の支援</string>
   <string name="skill_transformation_use">唱える</string>
   <string name="hatching_market_info">ほしい落とし物が見つからない?　市場をチェックしてみよう!</string>
@@ -437,36 +331,36 @@
   <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_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="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">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
+  <string name="subscribe_listitem1_description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
 \n
 \nアレクサンダーと1ヵ月の間に取り引きできるジェムの数は、最初は25個に限定されていますが、寄付期間によって増えます。
 \n
 \n寄付の継続3カ月ごとにその数が5個ずつ増えていき、最大で月に50個を買うことができます！</string>
-  <string name="subscribe.listitem2.description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
+  <string name="subscribe_listitem2_description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
 \n
 \nさらに寄付の継続3カ月ごとに、謎のタイムトラベラーによって、歴史的（そして未来的！）な装飾アイテムが入手可能になります。</string>
-  <string name="subscribe.listitem3.description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
-  <string name="subscribe.listitem4.description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</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="subscribe_listitem3_description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
+  <string name="subscribe_listitem4_description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</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="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>
@@ -481,56 +375,40 @@
   <string name="twelve_months">12ヶ月</string>
   <string name="subscribe_prompt_thanks">寄付のお礼として、こんな便利な特典をもらっています：</string>
   <string name="subscription_status">寄付の状況</string>
-  <string name="byLeader">%sで</string>
-  <string name="challenge_details">チャレンジの概要</string>
-  <string name="challenge_leave_title">チャレンジから抜ける</string>
+    <string name="challenge_leave_title">チャレンジから抜ける</string>
   <string name="challenge_leave_text">本当にチャレンジ「%s」を抜けますか？</string>
   <string name="challenge_remove_tasks_title">タスクを削除</string>
   <string name="challenge_remove_tasks_text">タスクを削除しますか？</string>
   <string name="remove_tasks">削除する</string>
   <string name="keep_tasks">残す</string>
   <string name="my_challenges">参加しているチャレンジ</string>
-  <string name="public_challenges">みんなのチャレンジ</string>
-  <string name="challenges">チャレンジ</string>
-  <string name="daily">日課</string>
+    <string name="daily">日課</string>
   <string name="habit">習慣</string>
   <string name="reward">ごほうび</string>
   <string name="todo">To-Do</string>
   <string name="official">Habitica公式</string>
-  <string name="participating">参加済み</string>
-  <string name="challenge">チャレンジ</string>
-  <string name="go_to_challenge">チャレンジに参加する</string>
-  <string name="not_part_of_a_challenge">今参加しているチャレンジはありません！</string>
+    <string name="challenge">チャレンジ</string>
+    <string name="not_part_of_a_challenge">今参加しているチャレンジはありません！</string>
   <string name="join_a_challenge">チャレンジに参加してタスクのセットをあなたのタスクリストに追加し、他のHabiticianと達成度を競いましょう。優勝すれば実績メダルと、副賞としてジェムを手に入れられることもあります！</string>
   <string name="check_the_public_challenge_tab">”みんなのチャレンジ”タブをタップして、ユーザーが作ったチャレンジの中からあなたにしっくりくるものを見つけましょう！</string>
-  <string name="add_reminder">リマインダーを追加する</string>
-  <string name="warning">注意</string>
-  <string name="open_settings">設定を開く</string>
-  <string name="dont_keep_activities_warning">あなたは開発者向けのオプション \“Don\'t keep Activities\” を有効にしているようです。現在、このオプションはHabiticaのアプリに問題を起こしますので、無効にすることをお勧めします。</string>
-  <string name="inbox">メッセージ</string>
-  <string name="FAQ">よくある質問</string>
-  <string name="special">スペシャル</string>
+    <string name="inbox">メッセージ</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="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="checkInRewardEarned">あなたは人生・生活を向上するために力を注いだので、ごほうびとして %1$s を獲得しました。</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">あと%1$d日のログインで、新たな賞品が手に入ります</string>
   <string name="pending_approval">保留された承認</string>
   <string name="filters">フィルター</string>
   <string name="done">完了</string>
-  <string name="group_tasks_edit_description">グループタスクは編集できません。</string>
-  <string name="group_tasks_edit_title">このタスクは編集できません</string>
-  <string name="groups">グループ</string>
+    <string name="groups">グループ</string>
   <string name="all">全部</string>
   <string name="none">なし</string>
   <string name="owned">所持</string>
   <string name="not_owned">非所持</string>
-  <string name="new_game">ニュー・ゲーム</string>
-  <string name="login_btn_fb">Facebookでログイン</string>
+    <string name="login_btn_fb">Facebookでログイン</string>
   <string name="login_btn_google">Googleでログイン</string>
   <string name="action_back">戻る</string>
   <string name="welcome_text">おお、あなたは新しくここに来た方ですね。私の名前はJustin。Habiticaの案内人です。
@@ -564,7 +442,6 @@
   <string name="reload_content">再度読み込み</string>
   <string name="dailyDueDefaultView">日課を標準で「期限」タブに入れる</string>
   <string name="dailyDueDefaultViewDescription">この設定にチェックを入れると、日課は標準で「すべて」タブではなく「期限」タブに入ります</string>
-  <string name="repeat_summary">%1$sを%2$s%3$s%4$sごとにくり返し</string>
   <string name="no_billing_gems">あなたのデバイスは、サポートされている支払方法に対応していません。ジェムを購入したい場合は、Habiticaのウェブサイトをご利用ください。</string>
   <string name="no_billing_subscriptions">あなたのデバイスは、サポートされている支払方法に対応していません。寄付を購入したい場合は、Habiticaのウェブサイトをご利用ください。</string>
   <string name="save">保存</string>
@@ -572,8 +449,7 @@
   <string name="gem_reward">賞品ジェム</string>
   <string name="tasks">タスク</string>
   <string name="create_challenge">チャレンジを作成する</string>
-  <string name="edit_challenge">編集</string>
-  <string name="challenge_create_error_tavern_one_gem">公共のチャレンジを作成するには1ジェム以上必要です。</string>
+    <string name="challenge_create_error_tavern_one_gem">公共のチャレンジを作成するには1ジェム以上必要です。</string>
   <string name="challenge_create_error_enough_gems">チャレンジを作成するのに十分なジェムを持っていません。</string>
   <string name="identify_your_challenge_with_a_tag">チャレンジを短縮名で分類してください</string>
   <string name="challenge_create_error_tag">チャレンジを作成するには短縮名が必要です。</string>
@@ -583,42 +459,36 @@
   <string name="new_challenge_title">新しいチャレンジのタイトル</string>
   <string name="ownership">所有</string>
   <string name="inn">ロッジ</string>
-  <string name="system">システム</string>
-  <string name="start_quest">新しいクエストを開始する</string>
+    <string name="start_quest">新しいクエストを開始する</string>
   <string name="leave_party">パーティーを抜ける</string>
   <string name="party_description">パーティーの説明</string>
-  <string name="abort_confirmation">このミッションを中断します。よろしいですか?　パーティの全員が中断になり、すべての進行状況は失われます。クエストの巻物はクエスト所有者の手に戻ります。</string>
-  <string name="leave_quest_confirmation">進行中のクエストを抜けます。よろしいですか?　あなたのクエストの成果はすべて失われます。</string>
-  <string name="number_participants">%1$d 人の参加者</string>
+    <string name="number_participants">%1$d 人の参加者</string>
   <string name="welcome_back">おかえりなさい</string>
   <string name="yesterdaililes_prompt">これらの日課の中で昨日やり終えたものはありませんか？</string>
   <string name="start_day">一日を始める</string>
   <string name="leave_party_confirmation">本当にパーティーを抜けますか？</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">次の賞品まであと %d 回チェックイン</string>
-  <string name="pending">保留</string>
+    <string name="pending">保留</string>
   <string name="accepted">承認済</string>
   <string name="declined">辞退済</string>
   <string name="participants">参加者</string>
   <string name="invitations">招待</string>
-  <string name="quest_leader_header" formatted="false">%sが始めたタスク</string>
+  <string name="quest_leader_header">%sが始めたタスク</string>
   <string name="quest_abort_message">このミッションを中断します。よろしいですか?　パーティの全員が中断になり、すべての進行状況は失われます。クエストの巻物はクエスト所有者の手に戻ります。</string>
-  <string name="loading">ロード中…</string>
-  <string name="reloading_content">再度読み込みます</string>
+    <string name="reloading_content">再度読み込みます</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">残高:</string>
-  <string name="available_until" formatted="false">%sまで利用可能</string>
-  <string name="gems_left_max" formatted="false">今月のジェム: 残り%1$d/%2$d</string>
-  <string name="gems_left_nomax" formatted="false">今月のジェム: 残り%d</string>
+    <string name="available_until">%sまで利用可能</string>
+  <string name="gems_left_max">今月のジェム: 残り%1$d/%2$d</string>
+  <string name="gems_left_nomax">今月のジェム: 残り%d</string>
   <string name="health">体力</string>
   <string name="collect">集める</string>
   <string name="rage_meter">怒りメーター</string>
   <string name="boss_quest">ボスクエスト</string>
   <string name="collection_quest">収集クエスト</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d の経験値</string>
-  <string name="gold_reward" formatted="false">%dゴールド</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d の経験値</string>
+  <string name="gold_reward">%dゴールド</string>
   <string name="quest_owner_rewards">クエストオーナー報酬</string>
   <string name="str_abbrv">力</string>
   <string name="per_abbrv">知覚</string>
@@ -633,8 +503,7 @@
   <string name="reset_account_confirmation">アカウントをリセット</string>
   <string name="delete_account_confirmation">アカウントを削除</string>
   <string name="danger_zone">危険地帯</string>
-  <string name="nevermind">おかまいなく</string>
-  <string name="resetting_account">アカウントをリセット</string>
+    <string name="resetting_account">アカウントをリセット</string>
   <string name="deleting_account">アカウントを削除</string>
   <string name="insufficientGold">このアイテムを購入するにはもっとタスクをこなす必要があります！</string>
   <string name="insufficientGems">このアイテムを購入するにはもっとジェムが必要です！</string>
@@ -667,8 +536,7 @@
   <string name="authentication_summary">認証オプションを変更する。</string>
   <string name="change_password">パスワードを変更する</string>
   <string name="change_email">メールアドレスを変更する</string>
-  <string name="change_login_name">ログイン名を変更する</string>
-  <string name="change_username">ユーザー名を変更する</string>
+    <string name="change_username">ユーザー名を変更する</string>
   <string name="change">変更する</string>
   <string name="character_level">キャラクターのレベル</string>
   <string name="auto_allocate_points">ポイントの自動割り当て</string>
@@ -689,7 +557,7 @@
   <string name="distribute_class">クラスに基づいて分配する</string>
   <string name="distribute_task">タスクの状況に基づいて分配する</string>
   <string name="no_points_to_allocate">割り当てるポイントがありません</string>
-  <string name="points_to_allocate" formatted="false">%dポイント割り当て可能</string>
+  <string name="points_to_allocate">%dポイント割り当て可能</string>
   <string name="distribute_evenly_help">各能力に同じ値のポイントを割り当てます。</string>
   <string name="distribute_class_help">クラスにとって重要なポイントを多く割り当てます。</string>
   <string name="distribute_task_help">あなたが完了したタスクに基づいて、力、知能、体質、知覚にポイントを割り当てます。</string>
@@ -700,9 +568,7 @@
   <string name="class_equipment_shop_dialog">このアイテムは特定のクラスにのみ利用可能です、\n
 クラスはセッティングから変更できます。</string>
   <string name="class_gear_disclaimer">現在のクラス用の装備しか購入できません</string>
-  <string name="available_stats" formatted="false">%dポイント</string>
-  <string name="toogle_emojis">絵文字を使う</string>
-  <string name="tavern_description">ロッジにようこそ！腰掛けてチャットをし、タスクを休憩しましょう。</string>
+    <string name="tavern_description">ロッジにようこそ！腰掛けてチャットをし、タスクを休憩しましょう。</string>
   <string name="check_into_inn">宿にチェックインする</string>
   <string name="community_guidelines">コミュニティガイドライン</string>
   <string name="view_community_guidelines">コミュニティガイドラインを見る</string>
@@ -716,20 +582,13 @@
   <string name="navigation_drawer_open">ナビゲーションバーを開く</string>
   <string name="navigation_drawer_close">ナビゲーションバーを閉じる</string>
   <string name="world_boss">ワールドボス</string>
-  <string name="world_boss_art">ボス画像</string>
-  <string name="boss_art">ボス画像</string>
+    <string name="boss_art">ボス画像</string>
   <string name="world_boss_description">ワールドボスの説明</string>
-  <string name="rage_strike_count" formatted="false">怒り攻撃 %d/%d</string>
-  <string name="pending_strike_description">まだ攻撃はされていません！
-\nワールドボスは怒りゲージがたまる度に、わたしたちの味方である店主たちの一人に激しく攻撃してきます。日課をこなし続けて、攻撃されるのを防ぎましょう！</string>
-  <string name="pending_strike_title">保留中の攻撃</string>
+  <string name="rage_strike_count">怒り攻撃 %d/%d</string>
+    <string name="pending_strike_title">保留中の攻撃</string>
   <string name="strike_description_title">怒り攻撃とは？</string>
-  <string name="strike_description_subtitle">怒り攻撃が３回まで起こる可能性があります</string>
-  <string name="strike_description_description">このゲージはHabiticaの住人たちが日課を逃すとたまっていきます。ゲージが一杯になると、心蝕のディスハートナーはその強烈なハートブレイクをHabiticaの店主のうち一人に食らわせます。ですから必ずタスクを実行しましょう！</string>
-  <string name="pending_strike_subtitle">まだ攻撃はされていません！</string>
-  <string name="strike_active_title" formatted="false">%s が襲撃を受けました！</string>
-  <string name="strike_active_subtitle" formatted="false">%sは悲しみに打ちひしがれています！</string>
-  <string name="strike_active_description" formatted="false">愛すべき%sは%sの攻撃で%sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
+    <string name="strike_active_title">%s が襲撃を受けました！</string>
+    <string name="strike_active_description">愛すべき%sは%sの攻撃で%sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
   <string name="questShop">クエスト ショップ</string>
   <string name="market_owner_long">商人のAlex</string>
   <string name="tavern_owner_long">キャンプ場の支配人・Daniel</string>
@@ -739,32 +598,21 @@
   <string name="no_party_description">仲間たちと一緒に、または各自で、クエストに挑戦しましょう。モンスターと戦ったり、チャレンジを作ったり…… そして、パーティーを通じてあなた自身を責任ある状態にし続けてみましょう。</string>
   <string name="no_party_title">パーティーに参加してHabiticaをプレイする</string>
   <string name="join_party_description">下の方に見えるユーザー名をパーティーメンバーに伝えましょう。そうすると彼らはあなたに招待を送ることができます</string>
-  <string name="join_party_description_id">招待してもらうときは、あなたのユーザーIDを伝えるか、あなたのQRコードをスキャンしてもらいましょう</string>
-  <string name="join_party_title">パーティーに参加したいですか？</string>
-  <string name="create_party_website">パーティーを作成するにはウェブサイトを開いてください</string>
-  <string name="id_copied">IDをクリップボードにコピーしました</string>
-  <string name="insufficientSubscriberGems">今月購入可能なジェムを買い切りました。来月の月初め1日から3日に購入できるようになります。ご支援に感謝いたします！</string>
-  <string name="insufficientSubscriberGemsTitle">毎月のジェムの購入上限に達しました</string>
-  <string name="chat_message">メッセージでチャットする</string>
-  <string name="world_boss_description_title">ワールドボスとは何ですか？</string>
-  <string name="world_boss_description_description">ワールドボスは、Habiticaのコミュニティが一緒になってタスクをこなすことで、強力なモンスターを倒す特別なイベントです！
-\nタスクを完了してボスにダメージを与えましょう
-\nワールドボスからサボったタスクの分のダメージを食らうことはありませんが、そのかわりに怒りメーターが上昇してゆきます。もしメーターが一杯になると、ボスはHabiticaの店主の誰か一人を攻撃してしまいます！
-\nあなたは通常のクエストボスへもこれまで通り挑戦し続けることができます。ダメージはどちらのボスにも適用されます。キャンプ場でボス戦の進行状況と怒りの攻撃をチェックしましょう</string>
-  <string name="world_boss_description_intro">ワールドボスは、コミュニティ全体がタスクで強力なモンスターを協力して打ち倒す特別イベントです！</string>
+    <string name="join_party_title">パーティーに参加したいですか？</string>
+    <string name="insufficientSubscriberGems">今月購入可能なジェムを買い切りました。来月の月初め1日から3日に購入できるようになります。ご支援に感謝いたします！</string>
+    <string name="world_boss_description_title">ワールドボスとは何ですか？</string>
+    <string name="world_boss_description_intro">ワールドボスは、コミュニティ全体がタスクで強力なモンスターを協力して打ち倒す特別イベントです！</string>
   <string name="world_boss_description_1">タスクを完了してボスにダメージを与えましょう</string>
   <string name="world_boss_description_2">サボったタスクによってこのボスからダメージを受けることはありませんが、怒りメーターが上昇します。怒りメーターが満タンになるとボスは店主たちに攻撃します！</string>
   <string name="world_boss_description_3">あなたは通常のクエストボスへもこれまで通り挑戦し続けることができます。ダメージはどちらのボスにも適用されます</string>
   <string name="world_boss_description_4">キャンプ場でボス戦の進行状況と怒りの攻撃をチェックしましょう</string>
-  <string name="world_boss_action_prompt" formatted="false">ボスを倒して%sの脅威からHabiticaを守り、特別なごほうびを手に入れよう！</string>
-  <string name="world_boss_description_subtitle">%sの攻撃！</string>
-  <string name="questShop_owner_long">クエストガイドのイアン</string>
+  <string name="world_boss_action_prompt">ボスを倒して%sの脅威からHabiticaを守り、特別なごほうびを手に入れよう！</string>
+    <string name="questShop_owner_long">クエストガイドのイアン</string>
   <string name="seasonalShop_owner_long">季節の魔女</string>
   <string name="rage_attack">怒りの攻撃：</string>
   <string name="tavern_description_world_boss">やれやれ、下の方にいるモンスターは気にしないでください。——あなたが休憩にチャットするにはまだ安全ですから。</string>
   <string name="report">報告</string>
-  <string name="like">いいね</string>
-  <string name="reply">返信する</string>
+    <string name="reply">返信する</string>
   <string name="challenge_prize">チャレンジの賞品</string>
   <string name="challenge_categories">チャレンジのカテゴリ</string>
   <string name="created_challenge">作成されたチャレンジ</string>
@@ -798,17 +646,15 @@
   <string name="two_handed">両手持ち</string>
   <string name="usernamePromptTitle">あなたのユーザー名を決める時間です！</string>
   <string name="usernamePromptBody">ログイン名は、現在は固有のユーザー名になりました。あなたの表示名の近くに表示されて、招待、チャットでの＠返信、メッセージのやりとりなどで使用されるでしょう。</string>
-  <string name="usernamePromptWiki">もしこの変更についてより詳しく知りたいときは、<a href="https://habitica.wikia.com/wiki/Player_Names">wiki</a>をご覧ください</string>
-  <string name="confirmUsername">ユーザー名を承認する</string>
-  <string name="usernamePromptDisclaimer">ユーザー名は、私たちの<a href="https://habitica.com/static/terms">サービス利用規約</a>と<a href="https://habitica.com/static/community-guidelines">コミュニティーガイドライン</a>を守ったものでなければなりません。もしあなたが以前にログイン名を設定していなかった場合、あなたのユーザー名は自動生成されました。</string>
+  <string name="usernamePromptWiki">もしこの変更についてより詳しく知りたいときは、<a href="https://habitica.wikia_com/wiki/Player_Names">wiki</a>をご覧ください</string>
+    <string name="usernamePromptDisclaimer">ユーザー名は、私たちの<a href="https://habitica.com/static/terms">サービス利用規約</a>と<a href="https://habitica_com/static/community-guidelines">コミュニティーガイドライン</a>を守ったものでなければなりません。もしあなたが以前にログイン名を設定していなかった場合、あなたのユーザー名は自動生成されました。</string>
   <string name="confirm_username_title">本当に現在のユーザー名を承認しますか？</string>
   <string name="confirm_username_description">承認されたユーザー名は招待や@メンション、メッセージなどで公開されます。ユーザー名はいつでも「設定」から変更可能です。</string>
   <string name="cancel">キャンセル</string>
   <string name="confirm_username">ユーザー名を承認する</string>
   <string name="username_not_confirmed">未承認のユーザー名</string>
   <string name="username_confirmed">承認済みのユーザー名</string>
-  <string name="username_level">\@%s ・レベル%d</string>
-  <string name="enter_recipient_username">送信先の @ユーザー名 を入力</string>
+    <string name="enter_recipient_username">送信先の @ユーザー名 を入力</string>
   <string name="username_copied">ユーザー名をクリップボードにコピーしました</string>
   <string name="verification_pet">あなたが承認を終えたあとには、百戦練磨のペットのうち１匹があなたを待っていることでしょう！</string>
   <string name="welcomeNameTitle">あなたを何と呼べばいいですか？</string>
@@ -857,76 +703,4 @@
   <string name="invited_to_private_guild"><![CDATA[<b>%1$s</b> プライベートギルドに招待されました。]]></string>
   <string name="invited_to_public_guild"><![CDATA[<b>%1$s</b> ギルドに招待されました。]]></string>
   <string name="invited_to_quest"><![CDATA[<b>%1$s</b> クエストに招待されました。]]></string>
-<string name="sectionwacky">へんてこ</string>
-    <string name="x_months">%d乗騎</string>
-    <string name="insufficientGoldTitle">ゴールドが足りません</string>
-    <string name="defeat">撃破</string>
-    <string name="old_password">元のパスワード</string>
-    <string name="new_password">新しいパスワード</string>
-    <string name="new_password_repeat">新しいパスワードをもう一度入力してください</string>
-    <string name="adjust_streak">連続実行回数の値を修正</string>
-    <string name="password_changed">パスワードを変更しました</string>
-    <string name="monthly">月間</string>
-    <string name="weekly">週間</string>
-    <string name="days">日</string>
-    <string name="weeks">週</string>
-    <string name="years">年</string>
-    <string name="new_reminder">新しい通知を追加</string>
-    <string name="streak">連続実行</string>
-    <string name="mystery_sets">ミステリーセット</string>
-    <string name="guild_description">ギルドの説明</string>
-    <string name="invite_to_guild">ギルドへ招待する</string>
-    <string name="join_guild">ギルドへ加入する</string>
-    <string name="garden">菜園の</string>
-    <string name="leave_guild">ギルドを脱退する</string>
-    <string name="left_guild">ギルドを脱退しました</string>
-    <string name="joined_guild">ギルドに参加しました</string>
-    <string name="cost">価格</string>
-    <string name="setup_task_habit_1">Habiticaにタスクを追加しましょう</string>
-    <string name="guild_summary">ギルドの概要</string>
-    <string name="guild_members">ギルドメンバー</string>
-    <string name="guild_bank">ギルド口座</string>
-    <string name="invite_to_party">パーティーへ招待する</string>
-    <string name="delete_task">タスクを削除する</string>
-    <string name="sidebar_achievements">実績</string>
-    <string name="basic_achievements">基本の実績</string>
-    <string name="seasonal_achievements">季節限定の実績</string>
-    <string name="special_achievements">特別な実績</string>
-    <string name="new_task">新しいタスク</string>
-    <string name="details">詳細</string>
-    <string name="add_local_authentication">ローカル認証を追加する</string>
-    <string name="task_title">タスクのタイトル</string>
-
-    <string name="repeats">くり返し</string>
-    <string name="every">くり返しの間隔</string>
-    <string name="scheduling">予定</string>
-    <string name="checklist_text">チェックリストのテキスト</string>
-    <string name="update_available">アップデートが利用可能です：%1$s (%2$d)</string>
-    <string name="need_help_header_description">%sにメッセージを投稿して、疑問について仲間のプレイヤーに答えてもらいましょう。</string>
-    <string name="need_more_help">さらに助けが必要ですか？</string>
-    <string name="become_x">%sになる</string>
-    <string name="report_message_title">違反として%sを報告する：</string>
-    <string name="i_agree_to_follow_the_guidelines">ガイドラインに従うことに同意します</string>
-    <string name="report_violation">違反を報告する</string>
-    <string name="setup_task_habit_1_notes">習慣、日課、To-Doのどれでも</string>
-    <string name="setup_task_habit_2">ここをタップして、やめたい悪い習慣を入力しましょう</string>
-    <string name="setup_task_habit_2_notes">または編集画面から削除しましょう</string>
-    <string name="are_you_sure">本当によろしいですか？</string>
-    <string name="levelup_title_10">クラス・システムがアンロックされました！</string>
-    <string name="pin">ピン留めする</string>
-    <string name="unpin">ピン留めを外す</string>
-    <string name="switch_to_list_view">リスト表示に切り替える</string>
-    <string name="switch_to_grid_view">グリッド表示に切り替える</string>
-    <string name="create_task">%sを作成する</string>
-    <string name="join_party_description_guild">友達に下のユーザー名を教えるか、%sに行って未来の仲間たちに出会いましょう！</string>
-    <string name="assigned_stat">割り当てられた能力値</string>
-    <string name="x_class">%sクラス</string>
-    <string name="report_explanation">[コミュニティガイドライン](https://habitica.com/static/community-guidelines)もしくは[利用規約](https://habitica.com/static/terms)に違反した投稿**だけ**を報告してください。不適切な報告をした場合は、あなた自身が違反となる可能性があります。</string>
-    <string name="reason_for_report">報告の理由（任意）</string>
-    <string name="trillion_abbrev">兆</string>
-    <string name="not_now">今は結構です</string>
-    <string name="levelup_detail_10">あなたのプレイスタイルに合ったクラスを選んで、冒険に役立つ特別なスキルや装備をアンロックしましょう</string>
-    <string name="take_me_back">戻る</string>
-    <string name="confirm_deletion">削除を承認する</string>
-    <string name="share_challenge_with">チャレンジを共有する</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index 367264aa5..a191df910 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -8,11 +8,8 @@
     <string name="profile_level">레벨:</string>
     <string name="profile_class_bonus">직업 보너스:</string>
     <string name="profile_allocated">할당된 포인트:</string>
-    <string name="profile_boosts">부스트:</string>
     <string name="profile_private_message">개인 메시지</string>
     <string name="profile_achievements">업적</string>
-    <string name="profile_achievement_ok">확인</string>
-    <string name="profile_qrcode_close">닫기</string>
 
-<string name="profile_loading_data">회원 정보를 불러오는 중입니다...</string>
+    <string name="profile_loading_data">회원 정보를 불러오는 중입니다...</string>
     </resources>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index 84ac9a831..7194124cd 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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.tavern">주막</string>
-  <string name="sidebar.party">파티</string>
-  <string name="sidebar.purchaseGems">보석 &amp; 구독</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_tasks">과제</string>
+  <string name="sidebar_skills">스킬</string>
+  <string name="sidebar_section_social">소셜</string>
+  <string name="sidebar_tavern">주막</string>
+  <string name="sidebar_party">파티</string>
+  <string name="sidebar_purchaseGems">보석 &amp; 구독</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_about">소개</string>
   <string name="sidebar_shops">상점</string>
-<string name="sidebar.inbox">메세지</string>
+<string name="sidebar_inbox">메세지</string>
     <string name="sidebar_stats">스탯</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.tutorial.xml b/Habitica/res/values-ko/strings.tutorial.xml
index bc3d63ece..9a82546d6 100644
--- a/Habitica/res/values-ko/strings.tutorial.xml
+++ b/Habitica/res/values-ko/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">벌어들인 골드로 자신의 아바타 착용품을 구입하세요!</string>
   <string name="tutorial_rewards_2">동기부여를 도와주는 자신만의 현실세상의 보상을 정할 수도 있습니다.</string>
   <string name="tutorial_tasks_complete">이제 다 되었네요. 다시 보고 싶으시면 FAQ를 확인하세요.</string>
-  <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스탯에 영향을 주고, 당신의 의상은 (활성화 했다면) 아바타의 모습을 바꿔줍니다.</string>
-  <string name="tutorial_items">과제와 레벨업을 달성하면 아이템을 받을 수 있습니다. 아이템을 터치해서 사용하세요!</string>
-  <string name="tutorial_pets">일상생활의 과제들을 해결해 나아가면, 랜덤으로 알이나 포션을 발견할 수 있습니다. 둘을 섞어서 알을 부화시키면 펫을 얻을 수 있어요</string>
-  <string name="tutorial_skills">스킬은 강력한 효과를 가진 능력입니다! 사용하고자 하는 스킬은 터치하면 됩니다. 스킬은 마나 (파란색 바)를 사용하는데, 마나는 매일 출석하고 일상생활의 과제들을 달성하면 채워집니다. 궁금한 점은 FAQ를 참고하세요!</string>
+    <string name="tutorial_skills">스킬은 강력한 효과를 가진 능력입니다! 사용하고자 하는 스킬은 터치하면 됩니다. 스킬은 마나 (파란색 바)를 사용하는데, 마나는 매일 출석하고 일상생활의 과제들을 달성하면 채워집니다. 궁금한 점은 FAQ를 참고하세요!</string>
   <string name="tutorial_party">여기서 당신과 당신의 친구들은 서로의 목표를 체크해주고 과제를 달성하면서 함께 몬스터를 무찌를꺼에요!</string>
   <string name="tutorial_tavern">주막에 오신 것을 환영합니다! 여기는 누구나 채팅할수있는 채팅방입니다. 묻고싶은 것이 있으면 여기서 물어보세요. 좋은 시간 보내시길 바랍니다!</string>
-  <string name="tutorial_classes">전사, 마법사, 치료사나 도적중에서 직업을 정하세요! 각 직업마다 독특한 장비와 능력들이 있습니다. 더 알고싶으면 (?)을 누르세요!</string>
-<string name="tutorial_stats">많은 스탯을 한꺼번에 배분하려면 회색 버튼을 누르시고, 한 포인트씩 따로 분배하려면 화살표를 누르세요.</string>
+    <string name="tutorial_stats">많은 스탯을 한꺼번에 배분하려면 회색 버튼을 누르시고, 한 포인트씩 따로 분배하려면 화살표를 누르세요.</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 20dba8e98..3f3d751c6 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">경험치</string>
   <string name="HP_default">체력</string>
   <string name="MP_default">마나</string>
-  <string name="ERR_pb_barcode">바코드에서 데이터를 가져오지 못했습니다</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">설정</string>
-  <string name="SP_address_hint">사용자 지정 서버</string>
-  <string name="SP_userID_title">유저 ID</string>
+    <string name="SP_userID_title">유저 ID</string>
   <string name="SP_userID_summary">본인의 유저 ID</string>
   <string name="SP_APIToken_title">API 토큰</string>
   <string name="SP_APIToken_summary">본인의 API 토큰</string>
   <string name="Language_title">언어</string>
   <string name="Language_summary">Habitica의 언어 바꾸기</string>
-  <string name="SP_user_qr_code">본인의 QR코드</string>
-  <string name="PS_contact_title">연락처</string>
-  <string name="unknown_error">오류가 발생했습니다…</string>
-  <string name="pref_account_header">계정</string>
+    <string name="PS_contact_title">연락처</string>
+    <string name="pref_account_header">계정</string>
   <string name="pref_first_day_of_the_week_title">일주일의 첫날</string>
   <string name="pref_first_day_of_the_week_summary">모든 달력에서 일주일의 첫날</string>
   <string name="pref_reminder_header">매일 알림</string>
   <string name="pref_reminder_checkbox">알림 활성화 하기</string>
   <string name="pref_reminder_picker">알림 시간 설정</string>
   <string name="pref_cds_header">하루 시작 시간</string>
-  <string name="pref_cds_picker">하루 시작 시간 설정</string>
-  <string name="pref_push_notifications_checkbox">사용자 알림</string>
+    <string name="pref_push_notifications_checkbox">사용자 알림</string>
   <string name="push_notifications">푸쉬 알림</string>
   <string name="push_notifications_sum">푸쉬 알림 설정</string>
   <string name="preference_push_you_won_challenge">도전 과제에서 우승하였습니다!</string>
@@ -37,14 +32,8 @@
   <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="action_edit">수정</string>
+    <string name="action_cancel">취소</string>
   <string name="login_btn">로그인</string>
   <string name="register_btn">등록</string>
   <string name="username">유저아이디</string>
@@ -54,32 +43,23 @@
   <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">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
-  <string name="about.rate_our_app">앱 평가</string>
-  <string name="about.give_us_feedback">피드백을 보내주세요!</string>
-  <string name="about.bugreport">버그 신고</string>
-  <string name="about.source_code">소스코드</string>
-  <string name="repeatEvery">반복주기</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="LoginActivityName">환영합니다</string>
+    <string name="about_title">소개</string>
+  <string name="about_libraries">도서관</string>
+    <string name="about_habitica_open_source">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
+  <string name="about_rate_our_app">앱 평가</string>
+  <string name="about_give_us_feedback">피드백을 보내주세요!</string>
+  <string name="about_bugreport">버그 신고</string>
+  <string name="about_source_code">소스코드</string>
+    <!--Network Errors-->
+    <string name="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_title">검증 오류</string>
   <string name="login_validation_error_fieldsmissing">모든 항목을 채워주셔야 합니다.</string>
   <string name="save_changes">저장</string>
   <string name="copy">복사</string>
   <string name="notes">노트</string>
-  <string name="text">내용</string>
-  <string name="difficulty">난이도</string>
+    <string name="difficulty">난이도</string>
   <string name="tags">태그</string>
   <string name="trivial">사소함</string>
   <string name="easy">쉬움</string>
@@ -90,19 +70,8 @@
   <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="repeatables_summary_title">요약</string>
-  <string name="repeatables_title">반복</string>
-  <string name="repeatables_on_title">반복일</string>
-  <string name="repeatables_frequency_daily">매일</string>
+    <string name="attributes">속성</string>
+    <string name="repeatables_frequency_daily">매일</string>
   <string name="repeatables_frequency_weekly">매주</string>
   <string name="repeatables_frequency_monthly">매달</string>
   <string name="repeatables_frequency_yearly">매년</string>
@@ -120,23 +89,14 @@
   <string name="faint_header">체력이 모두 떨어졌어요!</string>
   <string name="faint_button">체력을 채우고 다시 도전하세요</string>
   <string name="filter">필터</string>
-  <string name="profile_image">프로필 사진</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">당신은 %1$s을 사용해 %2$d 마나를 얻었습니다.</string>
-  <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
+    <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
   <string name="new_checklist_item">새로운 체크리스트 항목</string>
-  <string name="add_checklist_item">더하기</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="tavern.inn.checkOut">일일과제 활성화</string>
-  <string name="tavern.inn.rest">일일과제 일시중지</string>
-  <string name="reward.dialog.buy">구매</string>
-  <string name="reward.dialog.dismiss">닫기</string>
+    <string name="unlock_lvl_11">레벨 11에 열림</string>
+    <string name="forgot_pw_btn">암호 찾기</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>
@@ -144,24 +104,20 @@
   <string name="dailies">일일과제</string>
   <string name="todos">해야 할 일</string>
   <string name="rewards">보상</string>
-  <string name="taskform.delete.title">확실합니까?</string>
-  <string name="taskform.delete.message">삭제하시겠습니까?</string>
-  <string name="yes">예</string>
+    <string name="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_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">체형</string>
   <string name="avatar_size_slim">날씬하게</string>
   <string name="avatar_size_broad">통통하게</string>
   <string name="avatar_background">배경</string>
@@ -170,23 +126,17 @@
   <string name="purchase_button">구매</string>
   <string name="purchase_set_title">%s 세트 구매</string>
   <string name="due_date">만기일</string>
-  <string name="quest.accept">승인</string>
-  <string name="quest.reject">거부</string>
-  <string name="quest.begin">퀘스트 시작</string>
-  <string name="quest.cancel">초대 취소</string>
-  <string name="quest.abort">퀘스트 포기</string>
-  <string name="quest.leave">퀘스트 나가기</string>
-  <string name="quest.pending">미결</string>
-  <string name="quest.accepted">승인됨</string>
-  <string name="quest.rejected">거부됨</string>
-  <string name="quest.participants">참가자</string>
-  <string name="version_info">버젼 %1$s (%2$d)</string>
+  <string name="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="version_info">버젼 %1$s (%2$d)</string>
   <string name="sidebar_help">도움말 &amp; FAQ</string>
   <string name="complete_tutorial">네, 알겠어요!</string>
   <string name="dismiss_tutorial">나중에 알려주세요</string>
   <string name="intro_1_subtitle">환영합니다</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">즐겁게 자기 할 일을 해보세요. 자기 계발중인%s명이 넘는 사람들과 함께 하나씩 일상 생활의 과제들을 해나가세요.</string>
+    <string name="intro_1_description">즐겁게 자기 할 일을 해보세요. 자기 계발중인%s명이 넘는 사람들과 함께 하나씩 일상 생활의 과제들을 해나가세요.</string>
   <string name="intro_2_subtitle">게임의 진전</string>
   <string name="intro_2_title">삶의 진전</string>
   <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
@@ -194,12 +144,9 @@
   <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="next_button">다음</string>
   <string name="skip_button">스킵</string>
-  <string name="setup_welcome_description">Habitica에 오신걸 환영합니다. 게임에서의 진행도는 당신 일상에서의 진행도를 의미하죠! 과제를 달성할수록 새로운 장비, 펫, 퀘스트 등을 열 수 있어요.</string>
-  <string name="setup_welcome_title">환영합니다</string>
-  <string name="avatar_setup_description">자기 아바타가 어떻게 생기길 원하세요? 생김새는 나중에도 바꿀 수 있으니 걱정하지 마세요.</string>
+    <string name="avatar_setup_description">자기 아바타가 어떻게 생기길 원하세요? 생김새는 나중에도 바꿀 수 있으니 걱정하지 마세요.</string>
   <string name="task_setup_description">잘했어요! 그럼 이제 이 여정을 통해 삶의 어떤 부분을 개선하고 싶은지 알아볼까요?</string>
   <string name="setup_group_work">일</string>
   <string name="setup_group_exercise">운동</string>
@@ -229,36 +176,20 @@
   <string name="setup_task_creativity_1">공예 배우기</string>
   <string name="setup_task_creativity_2">창의적인 활동 하기</string>
   <string name="setup_task_creativity_3">창의적인 과제 끝내기</string>
-  <string name="gem.purchase.support">Habitica가 계속되었으면 좋겠나요? 보석을 구매하여 개발자들을 지원해주세요. 보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:
-
-- 아바타를 위한 멋진 의상
-- 환상적인 배경들
-- 펫 알을 얻을 수 있는 재미있는 퀘스트들
-- 레벨 100 이전에 직업 변경 가능
-
-더 나은 Habitica를 만들 수 있도록 도와주셔서 감사합니다. 당신의 지원은 큰 의미로 다가옵니다!</string>
-  <string name="my_guilds">나의 길드</string>
+    <string name="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="gems">보석</string>
+    <string name="delete">삭제</string>
   <string name="name">이름</string>
   <string name="description">설명</string>
   <string name="add_tag">새로운 태그 만들기</string>
   <string name="privacy">개인정보 보호</string>
   <string name="write_message">메세지 작성</string>
-  <string name="post">게시</string>
-  <string name="guild_search_hint">길드 검색</string>
-  <string name="todo_due">만기: %s</string>
-  <string name="daily_streak">현재 연속 콤보: %d</string>
-  <string name="todo_has_duedate">과제가 만기일이 있습니다</string>
-  <string name="battle_gear">전투 장비</string>
+    <string name="guild_search_hint">길드 검색</string>
+    <string name="battle_gear">전투 장비</string>
   <string name="costume">의상</string>
   <string name="outfit_head">머리</string>
   <string name="outfit_headAccessory">머리 장식</string>
@@ -271,10 +202,8 @@
   <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">정말 시작하실건가요? 파티원 %2$d명 중 %1$d명만 퀘스트에 참여했어요. 퀘스트는 모든 플레이어가 초대 수락 또는 거절 의사를 밝히면 자동으로 시작됩니다.</string>
-  <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
-  <string name="today">오늘</string>
+    <string name="quest_begin_message">정말 시작하실건가요? 파티원 %2$d명 중 %1$d명만 퀘스트에 참여했어요. 퀘스트는 모든 플레이어가 초대 수락 또는 거절 의사를 밝히면 자동으로 시작됩니다.</string>
+    <string name="today">오늘</string>
   <string name="sidebar_items">아이템</string>
   <string name="eggs">알</string>
   <string name="hatching_potions">부화 물약</string>
@@ -285,13 +214,9 @@
   <string name="armoireEquipment">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
   <string name="armoireFood">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
   <string name="armoireExp">당신은 옷장과 씨름하여 경험치를 얻었습니다. 맛 좀 봐라!</string>
-  <string name="armoireNotesFull">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
-  <string name="armoireLastItem">당신은 마지막 귀한 장비를 마법의 옷장에서 찾았습니다.</string>
-  <string name="armoireNotesEmpty">옷장에는 매달 첫째주에 새로운 장비가 들어있을 것입니다. 그때까지는 계속 클릭하여 경험치와 음식을 얻으세요!</string>
-  <string name="sell">팔기 (%d 골드)</string>
+    <string name="sell">팔기 (%d 골드)</string>
   <string name="hatch_with_potion">물약으로 알 부화</string>
-  <string name="feed_to_pet">펫 먹이주기</string>
-  <string name="hatch_egg">알 부화</string>
+    <string name="hatch_egg">알 부화</string>
   <string name="invite_party">파티에 초대</string>
   <string name="dialog_feeding">%s 에게 다음의 먹이 주기:</string>
   <string name="use_animal">사용</string>
@@ -301,17 +226,8 @@
   <string name="close">닫기</string>
   <string name="share">나누기</string>
   <string name="notification_pet_fed">%s 에게 먹이를 줬습니다!</string>
-  <string name="notification_purchase">%s 를 구매했습니다</string>
-  <string name="notification_purchase_reward">보상을 구매했습니다</string>
-  <string name="sectiondrop">기본 펫</string>
-  <string name="sectionpremium">마법물약 펫</string>
-  <string name="sectionquest">퀘스트 펫</string>
-  <string name="sectionspecial">희귀 펫</string>
-  <string name="sectionmounts">기본 탑승펫</string>
-  <string name="sectionpremiumMounts">마법 물약 탑승펫</string>
-  <string name="sectionquestMounts">퀘스트 탑승펫</string>
-  <string name="sectionspecialMounts">희귀 탑승펫</string>
-  <string name="world_quest">세계 퀘스트</string>
+    <string name="notification_purchase_reward">보상을 구매했습니다</string>
+    <string name="world_quest">세계 퀘스트</string>
   <string name="inn_description">쉬고 싶으세요\? 다니엘의 여관에 묵으면 Habitica를 일부 멈추어둘 수 있습니다:
 \n
 \n • 미완료 일일과제로 인한 피해를 입지 않습니다
@@ -330,8 +246,7 @@
   <string name="healer_description">힐러는 공격에 휘둘리지 않고 동료들을 보호해 줍니다. 놓친 일일과제와 나쁜 습관들은 그들에게 큰 피해를 입히지 못하고, 설령 실패를 하더라도 치료가 가능합니다. 파티원들을 도와주길 좋아하고 노력으로 죽음을 이겨내는 것이 매력적이라면 힐러를 추천합니다!</string>
   <string name="select_class">직업 고르기</string>
   <string name="opt_out_class">선택 유예</string>
-  <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
-  <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
+    <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
   <string name="class_changed">%s가 되었습니다!</string>
   <string name="class_changed_description">장비 메뉴에서 교체할 수 있는 새로운 기본 전투 장비를 얻었습니다!</string>
   <string name="choose_class">직업 선택</string>
@@ -345,22 +260,17 @@
   <string name="invite_existing_users">등록된 사용자 초대</string>
   <string name="send">보내기</string>
   <string name="invite">친구 초대</string>
-  <string name="invite_id_description">Habitica를 이용하는 친구가 있다면, 유저 아이디를 입력하여 초대하세요.</string>
-  <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
+    <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
   <string name="add_invites">초대 더하기</string>
-  <string name="user_id">유저 ID</string>
-  <string name="email">이메일</string>
-  <string name="invite_users">파티 초대</string>
-  <string name="share_using">올리기</string>
+    <string name="email">이메일</string>
+    <string name="share_using">올리기</string>
   <string name="share_levelup">일상생활의 습관을 개선하여 Habitica에서 레벨 %d가 되었어요!</string>
   <string name="share_hatched">일상생활의 과제들을 달성하여 Habitica에서 %1$s %2$s 펫을 깨웠어요!</string>
   <string name="share_raised">일상생활의 과제들을 달성하여 %1$s 탈것을 얻었어요!</string>
   <string name="open_in_store">플레이스토어로 열기</string>
   <string name="change_class_confirmation">정말로 직업을 바꾸시겠습니까\? 보석 3개가 소모됩니다.</string>
   <string name="change_class_equipment_warning">주의: 더 이상 %s 직업의 장비를 구입할 수 없게됩니다.</string>
-  <string name="leaderMessage">%1$s로부터 온 메세지</string>
-  <string name="leaderName">리더: %1$s</string>
-  <string name="confirm">확인</string>
+    <string name="confirm">확인</string>
   <string name="market">시장</string>
   <string name="timeTravelers">시간 여행자들</string>
   <string name="seasonalShop">계절 상점</string>
@@ -368,37 +278,16 @@
   <string name="party_invite">친구를 초대하여 잠금 해제하기</string>
   <string name="login_incentive">Habitica에 꾸준히 로그인하여 잠금해제</string>
   <string name="create_account">계정을 만들어 잠금 해제</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="successful_purchase">%1$s을(를) 구매함</string>
+    <string name="gold_plural">골드</string>
   <string name="chat_message_copied">메시지를 클립보드에 복사했음</string>
-  <string name="copy_chat_message">클립보드로 복사함</string>
-  <string name="edit_tag_title">태그 편집</string>
-  <string name="edit_tag_btn_edit">편집</string>
-  <string name="edit_tag_btn_done">완료</string>
-  <string name="edit_tag_btn_delete">삭제</string>
-  <string name="confirm_delete_tag_title">정말이요?</string>
+    <string name="edit_tag_btn_edit">편집</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">메시지 받는 사람 선택</string>
   <string name="action_continue">계속</string>
-  <string name="scan_qr_code">QR 코드 스캔</string>
-  <string name="enter_recipient_uuid">받는 사람의 사용자 ID 입력</string>
-  <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
+    <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
   <string name="stats_widget_label">Habitica 통계</string>
   <string name="add_task">과제 추가</string>
   <string name="add_habit">습관 추가</string>
@@ -409,15 +298,14 @@
   <string name="widget_habit_button">Habitica 습관</string>
   <string name="widget_dailies">Habitica 일일과제</string>
   <string name="widget_todo_list">Habitica 할일 목록</string>
-  <string name="widget_add_task">Habitica 과제 추가</string>
-  <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
-  <string name="gem.purchase.toolbartitle">구매</string>
-  <string name="gem.purchase.title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다</string>
-  <string name="gem.purchase.subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
-  <string name="gem.purchase.listitem1">아바타를 위한 멋진 의상</string>
-  <string name="gem.purchase.listitem2">환상적인 배경들</string>
-  <string name="gem.purchase.listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
-  <string name="gem.purchase.listitem4">레벨 100 이전에도 직업 변경 가능</string>
+    <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
+  <string name="gem_purchase_toolbartitle">구매</string>
+  <string name="gem_purchase_title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다</string>
+  <string name="gem_purchase_subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
+  <string name="gem_purchase_listitem1">아바타를 위한 멋진 의상</string>
+  <string name="gem_purchase_listitem2">환상적인 배경들</string>
+  <string name="gem_purchase_listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
+  <string name="gem_purchase_listitem4">레벨 100 이전에도 직업 변경 가능</string>
   <string name="support_habitica">Habitica 지원하기</string>
   <string name="skill_transformation_use">사용</string>
   <string name="hatching_market_info">필요한 아이템이 드롭되지 않나요? 시장으로 가보세요!</string>
@@ -431,32 +319,32 @@
   <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_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="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골드에 판매합니다!
+  <string name="subscribe_listitem1_description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!
 \n
 \n처음에는 매달 구비량이 한 달에 25개로 제한되어 있지만, 후원 기간에 따라 올라갈 수 있습니다.
 \n
 \n연속 정기후원 3개월마다 보석 제한개수가 5개씩, 최대 월 50개까지 올라갑니다!</string>
-  <string name="subscribe.listitem2.description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
+  <string name="subscribe_listitem2_description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
 \n
 \n더불어, 정기 후원을 해주시는 매 3달마다, 미스터리 시간 여행자가 전통적인 (그리고 미래지향적인!) 꾸미기 아이템을 소개해 줄 겁니다.</string>
-  <string name="subscribe.listitem3.description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
-  <string name="subscribe.listitem4.description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다!</string>
+  <string name="subscribe_listitem3_description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
+  <string name="subscribe_listitem4_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">구독을 취소하고 싶으신가요\? 구글 플레이 스토어의 \"내 애플리케이션\" 메뉴에 구독취소 옵션이 있습니다.</string>
-  <string name="cancel_subscription_notgoogle.description">더 이상 구독하고 싶지 않으세요\? 결제 수단으로 인해 웹사이트에서만 취소가 가능합니다. 아래 버튼을 클릭하면, 브라우저에서 사이트가 열립니다!</string>
+  <string name="cancel_subscription_google_description">구독을 취소하고 싶으신가요\? 구글 플레이 스토어의 \"내 애플리케이션\" 메뉴에 구독취소 옵션이 있습니다.</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>
@@ -471,50 +359,35 @@
   <string name="twelve_months">12개월</string>
   <string name="subscribe_prompt_thanks">정기구독을 함으로써 다음과 같은 혜택을 받고 있습니다:</string>
   <string name="subscription_status">구독상황</string>
-  <string name="byLeader">%s 소유</string>
-  <string name="challenge_details">도전 내용</string>
-  <string name="challenge_leave_title">도전 그만두기</string>
+    <string name="challenge_leave_title">도전 그만두기</string>
   <string name="challenge_leave_text">정말로 “%s” 도전을 그만 두시겠습니까?</string>
   <string name="challenge_remove_tasks_title">할일 제거</string>
   <string name="challenge_remove_tasks_text">할일을 제거하고 싶으신가요?</string>
   <string name="remove_tasks">제거하기</string>
   <string name="keep_tasks">놔두기</string>
   <string name="my_challenges">나의 도전들</string>
-  <string name="public_challenges">공개</string>
-  <string name="challenges">도전과제들</string>
-  <string name="daily">일일과제</string>
+    <string name="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="challenge">도전</string>
+    <string name="not_part_of_a_challenge">현재 아무 도전에도 참여하지 않고 있습니다!</string>
   <string name="join_a_challenge">도전에 참여해서 잘 짜여진 과제 목록을 더하고, 다른 해비티칸들과 함께 경쟁해서 업적 달성도 하고 보석도 받을 수 있는 기회를 얻으세요!</string>
   <string name="check_the_public_challenge_tab">\"공개\" 탭을 터치하시면 본인에게 맞는 다른 유저들이 만든 도전들을 찾을 수 있습니다!</string>
-  <string name="add_reminder">미리 알림 설정하기</string>
-  <string name="warning">주의</string>
-  <string name="open_settings">설정 열기</string>
-  <string name="dont_keep_activities_warning">개발자 옵션 \\"활동을 보관하지 마세요\\"가 활성화 된 것 같습니다. 현재이 옵션을 사용하면 habitica 앱에 문제가 발생하므로 사용하지 않는 것이 좋습니다.</string>
-  <string name="inbox">메세지</string>
-  <string name="FAQ">자주 묻는 질문</string>
-  <string name="special">스페셜</string>
+    <string name="inbox">메세지</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="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="checkInRewardEarned">삶을 증진시키려는 노력의 대가로 %1$s를 얻었습니다.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">다음 보상은 %1$d번 출석 후에 풀립니다</string>
   <string name="pending_approval">승인 대기 중</string>
   <string name="filters">필터</string>
   <string name="done">완료</string>
-  <string name="group_tasks_edit_description">그룹 과제는 편집할 수 없습니다.</string>
-  <string name="group_tasks_edit_title">이 과제를 편집할 수 없습니다</string>
-  <string name="groups">그룹</string>
+    <string name="groups">그룹</string>
   <string name="all">전체</string>
   <string name="none">None</string>
   <string name="owned">보유중</string>
@@ -554,18 +427,16 @@
     <string name="ago_minutes">%d분 전</string>
     <string name="ago_hours">%d시간 전</string>
     <string name="ago_1hour">1시간 전</string>
-    <string name="evolved_pet_title">%1$s %2$s를 길들였습니다, 타러 가요!</string>
+    <string name="evolved_pet_title">%s를 길들였습니다, 타러 가요!</string>
     <string name="warrior_description">전사는 치명타를 더 많이 세게 적중시켜서 과제 달성시 보너스 골드, 경험치, 그리고 아이템 획득 확률이 올라갑니다. 보스 몬스터에게도 더 강한 피해를 줍니다. 예측하기 힘들지만 대박 보상이나 보스 퀘스트에서 활약하는 것을 좋아하신다면 전사를 추천합니다!</string>
     <string name="opting_out_progress">선택유예 중</string>
     <string name="invite_username_description">Habitica를 이용하는 친구가 있다면, 유저아이디를 입력하여 초대하세요.</string>
     <string name="subscription_duration_norenew">%s 에</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="subscribe1month_gemcap">보석 한도 25개</string>
+    <string name="subscribe3month_gemcap">보석 한도 30개</string>
+    <string name="subscribe6month_gemcap">보석 한도 35개</string>
+    <string name="subscribe12month_gemcap">보석 한도 45개</string>
     <string name="due">아직 안한 일</string>
-    <string name="new_game">새
-\n게임</string>
     <string name="welcome_text">아, 새로운 모험가인가 보군요. 저는 저스틴이에요, 당신을 위해 Habitica 가이드가 되어드리죠.
 \n
 \n먼저, 뭐라고 불러야 할까요\? 제가 일단 정해보긴 했는데 원하는대로 바꿔보세요. 준비가 되었으면, 아바타를 꾸며봅시다!</string>
@@ -577,7 +448,6 @@
     <string name="maintenance">점검</string>
     <string name="dailyDueDefaultView">일일과제를 \'아직 안한 일\'부터 보기</string>
     <string name="dailyDueDefaultViewDescription">이 옵션을 설정하시면, 일일과제를 볼 때 \'전체\' 대신 \'아직 안한 일\'부터 나타납니다</string>
-    <string name="repeat_summary">%2$s %3$s마다 %1$s %4$s에 반복</string>
 
     <string name="no_billing_gems">현 기기에 사용 가능한 결제수단이 없습니다. 보석을 구매하시려면 habitica 웹사이트를 이용하세요.</string>
     <string name="no_billing_subscriptions">현 기기에 사용 가능한 결제수단이 없습니다. 정기후원을 하시려면 habitica 웹사이트를 이용하세요.</string>
@@ -586,7 +456,6 @@
     <string name="gem_reward">보석 상금</string>
     <string name="tasks">과제들</string>
     <string name="create_challenge">도전과제 만들기</string>
-    <string name="edit_challenge">편집</string>
     <string name="challenge_create_error_tavern_one_gem">공개 도전을 만들려면 적어도 보석 1개가 있어야 합니다.</string>
     <string name="challenge_create_error_enough_gems">도전과제를 만들기에 충분한 보석이 없습니다.</string>
     <string name="identify_your_challenge_with_a_tag">당신의 도전에 간략한 제목을 부여하세요</string>
@@ -597,40 +466,34 @@
     <string name="new_challenge_title">새로운 도전 제목</string>
     <string name="ownership">소유자</string>
     <string name="inn">여관</string>
-    <string name="system">시스템</string>
     <string name="party_description">파티 설명</string>
-    <string name="abort_confirmation">정말로 이 퀘스트를 중단하시겠습니까\? 파티 전체가 퀘스트를 중단하게 되고 지금까지 진행했던 것이 다 날아갑니다. 퀘스트 두루마리는 퀘스트 주인에게 돌아갑니다.</string>
-    <string name="leave_quest_confirmation">정말로 진행중인 퀘스트에서 떠나시겠습니까\? 그동안 본인이 퀘스트에서 진행했던 것이 날아갑니다.</string>
     <string name="number_participants">참여인원 %1$d명</string>
     <string name="welcome_back">돌아온 것을 환영합니다</string>
     <string name="yesterdaililes_prompt">어제 일일과제 중 완료한 것이 있나요\?</string>
     <string name="start_day">오늘 하루 시작하기</string>
     <string name="leave_party_confirmation">정말로 파티에서 탈퇴하시겠습니까\?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">다음 보상은 %d째 출석할 때</string>
     <string name="pending">대기중</string>
     <string name="accepted">수락함</string>
     <string name="declined">거절함</string>
     <string name="participants">참여인원</string>
     <string name="invitations">초대장</string>
-    <string name="quest_leader_header" formatted="false">%s 이/가 시작</string>
+    <string name="quest_leader_header">%s 이/가 시작</string>
     <string name="quest_abort_message">정말로 이 퀘스트를 중단하시겠습니까\? 파티 전체가 퀘스트를 중단하게 되고 지금까지 진행했던 것이 다 날아갑니다. 퀘스트 두루마리는 퀘스트 주인에게 돌아갑니다.</string>
-    <string name="loading">로딩중…</string>
     <string name="reloading_content">재로딩 중</string>
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">b</string>
-    <string name="your_balance">현재 보유 금액:</string>
-    <string name="available_until" formatted="false">%s 까지 유효</string>
-    <string name="gems_left_max" formatted="false">월별 구매 한도: %1$d/%2$d 남음</string>
-    <string name="gems_left_nomax" formatted="false">월별 구매 한도: %d 남음</string>
+    <string name="available_until">%s 까지 유효</string>
+    <string name="gems_left_max">월별 구매 한도: %1$d/%2$d 남음</string>
+    <string name="gems_left_nomax">월별 구매 한도: %d 남음</string>
     <string name="health">체력</string>
     <string name="collect">수집</string>
     <string name="rage_meter">분노 게이지</string>
     <string name="boss_quest">보스 퀘스트</string>
     <string name="collection_quest">수집 퀘스트</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-    <string name="experience_reward" formatted="false">%d 경험치</string>
-    <string name="gold_reward" formatted="false">%d 골드</string>
+    <string name="quest_reward_count">%1$s x%2$d</string>
+    <string name="experience_reward">%d 경험치</string>
+    <string name="gold_reward">%d 골드</string>
     <string name="quest_owner_rewards">퀘스트 주인 보상</string>
     <string name="str_abbrv">Str</string>
     <string name="per_abbrv">Per</string>
@@ -646,7 +509,6 @@
     <string name="reset_account_confirmation">내 계정을 리셋하겠습니다</string>
     <string name="delete_account_confirmation">내 계정을 삭제하겠습니다</string>
     <string name="danger_zone">위험 지역</string>
-    <string name="nevermind">아니에요</string>
     <string name="resetting_account">계정 리셋중</string>
     <string name="deleting_account">계정 삭제중</string>
     <string name="insufficientGold">이 아이템을 구입하려면 더 많은 과제를 실행해야 합니다!</string>
@@ -680,7 +542,6 @@
     <string name="authentication_summary">인증 설정을 변경하실 수 있습니다.</string>
     <string name="change_password">암호 변경</string>
     <string name="change_email">이메일 변경</string>
-    <string name="change_login_name">로그인 아이디 변경</string>
     <string name="change_username">유저아이디 변경</string>
     <string name="change">변경</string>
     <string name="character_level">캐릭터 레벨</string>
@@ -702,7 +563,7 @@
     <string name="distribute_class">직업에 맞게 배분하기</string>
     <string name="distribute_task">과제 성향에 맞게 배분하기</string>
     <string name="no_points_to_allocate">남은 포인트가 없습니다</string>
-    <string name="points_to_allocate" formatted="false">%d 포인트 배분 가능</string>
+    <string name="points_to_allocate">%d 포인트 배분 가능</string>
     <string name="distribute_evenly_help">각 스탯에 동등한 수의 포인트를 분배합니다.</string>
     <string name="distribute_class_help">직업에 중요한 스탯에 더 많은 포인트를 배분합니다.</string>
     <string name="distribute_task_help">완료한 과제와 연관된 근력, 지력, 생명력, 관찰력 부분에 포인트를 더합니다.</string>
@@ -713,8 +574,6 @@
     <string name="class_equipment_shop_dialog">이 아이템은 특정 직업에서만 가능합니다.
 \n설정에 들어가서 직업을 바꾸실 수 있습니다.</string>
     <string name="class_gear_disclaimer">현재 직업에 맞는 장비만 구입할 수 있습니다</string>
-    <string name="available_stats" formatted="false">%d 포인트</string>
-    <string name="toogle_emojis">이모티콘 표시</string>
     <string name="tavern_description">여관에 오신 것을 환영합니다! 여기 앉아서 담소를 나누거나, 과제로부터 벗어나 휴식을 취해보세요.</string>
     <string name="check_into_inn">여관에서 머물기</string>
     <string name="community_guidelines">커뮤니티 지침서</string>
@@ -729,19 +588,12 @@
     <string name="navigation_drawer_open">내비게이션 바 열기</string>
     <string name="navigation_drawer_close">내비게이션 바 닫기</string>
     <string name="world_boss">월드 보스</string>
-    <string name="world_boss_art">보스 아트</string>
     <string name="boss_art">보스 아트</string>
     <string name="world_boss_description">월드 보스 설명</string>
     <string name="rage_strike_count" formatted="false">분노의 타격: %d/%d</string>
-    <string name="pending_strike_description">이 타격은 아직 가해지지 않았습니다!
-\n월드 보스의 분노 게이지가 차면 우리의 이웃 상점주인들 중 하나를 공격하게 됩니다. 하루하루 꾸준히 생활해서 불상사가 생기지 않도록 도와주세요!</string>
     <string name="pending_strike_title">임박한 타격</string>
     <string name="strike_description_title">분노의 타격이 무엇인가요\?</string>
-    <string name="strike_description_subtitle">분노의 타격은 3번까지 가해질 수 있습니다</string>
-    <string name="strike_description_description">이 게이지는 Habitica 주민들이 일일과제를 수행하지 못했을 때 채워집니다. 게이지가 다 차면 상심보스가 충격의 비통함으로 Habitica의 상점주인들 중 한명을 공격하게 되니, 과제를 꼭 완료해주세요!</string>
-    <string name="pending_strike_subtitle">이 타격은 아직 가해지지 않았습니다!</string>
-    <string name="strike_active_title" formatted="false">%s 이(가) 공격받았습니다!</string>
-    <string name="strike_active_subtitle" formatted="false">%s 이(가) 상심에 빠졌어요!</string>
+    <string name="strike_active_title">%s 이(가) 공격받았습니다!</string>
     <string name="strike_active_description" formatted="false">우리의 %s는 %s가 %s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
     <string name="questShop">퀘스트 상점</string>
     <string name="market_owner_long">상인 알렉스</string>
@@ -752,7 +604,6 @@
     <string name="join_party_title">파티에 참여하고 싶으신가요\?</string>
     <string name="no_party_title">파티에 참여해서 해비티카를 이용하세요</string>
     <string name="join_party_description">파티 구성원이 당신을 초대할 수 있도록 아래에 있는 당신의 유저아이디를 그들에게 보내주세요</string>
-    <string name="create_party_website">파티를 만들려면 웹사이트에 접속하세요</string>
     <string name="world_boss_description_title">월드 보스가 무엇인가요\?</string>
     <string name="world_boss_description_intro">월드보스는 해비티카 구성원 전체가 참여하여 자신의 할 일들로 강력한 몬스터를 쓰러뜨리는 특별 이벤트입니다!</string>
     <string name="world_boss_description_1">보스 몬스터에게 피해를 주기 위해 할 일들을 완료하세요</string>
@@ -772,14 +623,12 @@
     <string name="total_checkins">전체 접속 수</string>
     <string name="two_handed">양 손</string>
     <string name="usernamePromptTitle">당신의 유저아이디를 설정할 차례입니다!</string>
-    <string name="usernamePromptWiki">이 변경된 사항에 대해 더 알고 싶다면, <a href="https://habitica.wikia.com/wiki/Player_Names">저희 위키백과를 참고해 주세요.</a></string>
-    <string name="confirmUsername">유저아이디 저장</string>
+    <string name="usernamePromptWiki">이 변경된 사항에 대해 더 알고 싶다면, <a href="https://habitica.wikia_com/wiki/Player_Names">저희 위키백과를 참고해 주세요.</a></string>
     <string name="confirm_username_title">정말로 현재 유저아이디를 저장하시겠습니까\?</string>
     <string name="cancel">취소</string>
     <string name="confirm_username">유저아이디 저장</string>
     <string name="username_not_confirmed">유저아이디가 저장되지 않았습니다</string>
     <string name="username_confirmed">유저아이디가 저장되었습니다</string>
-    <string name="username_level">\@%s ・레벨 %d</string>
     <string name="username_copied">유저아이디가 클립보드에 복사되었습니다</string>
     <string name="welcomeNameTitle">당신을 어떻게 불러드릴까요\?</string>
     <string name="display_name_length_error">이름은 1~30글자 사이로 만들어주세요</string>
@@ -789,25 +638,15 @@
     <string name="create_party">파티 만들기</string>
 
 <string name="no_party_description">친구들과 함께 혹은 혼자 퀘스트 수행을 해봐요. 파티를 통해 몬스터와 싸우고, 도전을 시작하고, 책임감을 유지할 수 있게 스스로를 도와주세요.</string>
-    <string name="join_party_description_id">파티에 초대를 할 때 유저 ID를 알려주거나 QR코드를 스캔하게 해주세요</string>
-    <string name="id_copied">ID가 복사되었습니다</string>
     <string name="insufficientSubscriberGems">이번 달에 살 수 있는 보석을 모두 구입했습니다. 매달 첫 3일 안에 더 구입할 수 있도록 재충전이 됩니다. 후원해주셔서 감사해요!</string>
-    <string name="insufficientSubscriberGemsTitle">월별 보석 한도에 도달했습니다</string>
-    <string name="chat_message">채팅 메세지</string>
-    <string name="world_boss_description_description">월드보스는 해비티카 구성원 전체가 참여하여 자신의 할 일들로 강력한 몬스터를 쓰러뜨리는 특별 이벤트입니다!
-\n보스 몬스터에게 피해를 주기 위해 할 일들을 완료하세요.
-\n과제를 거르면 보스가 당신에게 직접 피해를 주지는 않지만, 분노 게이지가 올라갑니다. 게이지가 다 차면, 보스 몬스터가 상점 주인들 중 한명을 공격할 것입니다!
-\n주막에서 보스와 분노 공격 현황을 확인하세요</string>
     <string name="world_boss_description_3">평소의 퀘스트 보스도 함께 피해를 입기 때문에 동시에 진행할 수 있습니다</string>
     <string name="world_boss_description_4">주막에서 보스와 분노 공격 현황을 확인하세요</string>
-    <string name="world_boss_action_prompt" formatted="false">보스를 쓰러뜨려 특별 보상을 받고 %s의 공포로부터 Habitica를 구해주세요!</string>
-    <string name="world_boss_description_subtitle">%s가 공격합니다!</string>
+    <string name="world_boss_action_prompt">보스를 쓰러뜨려 특별 보상을 받고 %s의 공포로부터 Habitica를 구해주세요!</string>
     <string name="questShop_owner_long">퀘스트 안내자 이안</string>
     <string name="seasonalShop_owner_long">계절의 여마법사</string>
     <string name="rage_attack">분노의 공격:</string>
     <string name="tavern_description_world_boss">어흠, 아래에 있는 몬스터에게 관심갖지 말게나 - 쉬는 시간에 이야기를 나눌 수 있을 만큼 이곳은 아직 안전하다네.</string>
     <string name="report">신고하기</string>
-    <string name="like">좋아요</string>
     <string name="reply">답하기</string>
     <string name="challenge_prize">도전 보상</string>
     <string name="public_challenge">공개 도전</string>
@@ -827,7 +666,7 @@
     <string name="week_reminder_title">과제 실행은 잘 되고 있나요\?</string>
     <string name="week_reminder_text">휴식은 당연히 몸에 좋지만, 간단한 활동도 병행하면 포인트를 벌어 레벨업을 하고 멋진 장비를 얻을 수 있습니다!</string>
     <string name="usernamePromptBody">이제 로그인 네임은 본인의 유일한 유저아이디로써 닉네임 옆에 표시되며, 초대할 때나 채팅에서 @로 언급할 때, 그리고 메세지를 보낼 때에 사용됩니다.</string>
-    <string name="usernamePromptDisclaimer">유저아이디는 <a href="https://habitica.com/static/terms">이용 약관</a>과 <a href="https://habitica.com/static/community-guidelines">커뮤니티 방침</a>에 따라야 합니다. 전에 로그인 네임을 따로 설정한 적이 없다면 자동으로 생성됩니다.</string>
+    <string name="usernamePromptDisclaimer">유저아이디는 <a href="https://habitica.com/static/terms">이용 약관</a>과 <a href="https://habitica_com/static/community-guidelines">커뮤니티 방침</a>에 따라야 합니다. 전에 로그인 네임을 따로 설정한 적이 없다면 자동으로 생성됩니다.</string>
     <string name="confirm_username_description">유저아이디를 저장하면 초대, @언급 그리고 메세지를 주고 받을 때 공개적으로 사용하게 됩니다. 언제든디 설정에서 유저아이디를 바꾸실 수 있습니다.</string>
     <string name="enter_recipient_username">받는 사람의 @ 유저아이디를 입력하세요</string>
     <string name="verification_pet">확인 절차를 마치고나면 여기 베테랑 펫 중 하나가 당신을 기다리고 있을 겁니다!</string>
@@ -846,8 +685,8 @@
     <string name="gift_subscription_subtitle">선물하고 싶은 정기구독 서비스를 선택하세요! 이 구매는 자동으로 연장되지 않습니다.</string>
     <string name="send_gift">선물하기</string>
     <string name="server">서버</string>
-    <string name="gift_confirmation_title">선물이 전달되었습니다!</string>
-    <string name="gift_confirmation_text_g1g1">하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다!</string>
+    <string name="gift_confirmation_title" formatted="false">선물이 전달되었습니다!</string>
+    <string name="gift_confirmation_text_g1g1" formatted="false">하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다!</string>
     <string name="gift_confirmation_text">%s에게 %s-개월 Habitica 구독서비스가 전달되었습니다.</string>
     <string name="discover">찾아보기</string>
     <string name="damage_paused">피해 동결 중</string>
diff --git a/Habitica/res/values-land/bools.xml b/Habitica/res/values-land/bools.xml
index 4ca4f8d62..a6b3daec9 100644
--- a/Habitica/res/values-land/bools.xml
+++ b/Habitica/res/values-land/bools.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="is_portrait_mode">false</bool>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-land/dimens.xml b/Habitica/res/values-land/dimens.xml
index 10d607e5f..a6b3daec9 100644
--- a/Habitica/res/values-land/dimens.xml
+++ b/Habitica/res/values-land/dimens.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<dimen name="PB_marginBottom">-10dp</dimen>
-	<dimen name="new_task_bar_size">38dp</dimen>
-	<dimen name="new_task_bat_btn_width">50dp</dimen>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-lt/strings.profile.xml b/Habitica/res/values-lt/strings.profile.xml
index 1a324e558..4f2f467b1 100644
--- a/Habitica/res/values-lt/strings.profile.xml
+++ b/Habitica/res/values-lt/strings.profile.xml
@@ -8,11 +8,8 @@
     <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>
     <string name="profile_loading_data">Įkeliami narių duomenys ...</string>
     <string name="profile_achievements">Pasiekimai</string>
-    <string name="profile_achievement_ok">Gerai</string>
-    <string name="profile_qrcode_close">Uždaryti</string>
 
 </resources>
diff --git a/Habitica/res/values-lt/strings.sidebar.xml b/Habitica/res/values-lt/strings.sidebar.xml
index 1be85aca0..ac7caf850 100644
--- a/Habitica/res/values-lt/strings.sidebar.xml
+++ b/Habitica/res/values-lt/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Užduotys</string>
-  <string name="sidebar.skills">Sugebėjimai</string>
-  <string name="sidebar.section.social">Bendruomenė</string>
-  <string name="sidebar.tavern">Smuklė</string>
-  <string name="sidebar.party">Grupė</string>
-  <string name="sidebar.purchaseGems">Pirkti Brangakmenius</string>
-  <string name="sidebar.guilds">Gildijos</string>
-  <string name="sidebar.challenges">Iššūkiai</string>
-  <string name="sidebar.section.inventory">Inventorius</string>
-  <string name="sidebar.avatar">Veikėjas</string>
-  <string name="sidebar.equipment">Apranga</string>
-  <string name="sidebar.stable">Augintiniai</string>
-  <string name="sidebar.news">Naujienos</string>
-  <string name="sidebar.settings">Nustatymai</string>
-  <string name="sidebar.about">Apie</string>
+  <string name="sidebar_tasks">Užduotys</string>
+  <string name="sidebar_skills">Sugebėjimai</string>
+  <string name="sidebar_section_social">Bendruomenė</string>
+  <string name="sidebar_tavern">Smuklė</string>
+  <string name="sidebar_party">Grupė</string>
+  <string name="sidebar_purchaseGems">Pirkti Brangakmenius</string>
+  <string name="sidebar_guilds">Gildijos</string>
+  <string name="sidebar_challenges">Iššūkiai</string>
+  <string name="sidebar_section_inventory">Inventorius</string>
+  <string name="sidebar_avatar">Veikėjas</string>
+  <string name="sidebar_equipment">Apranga</string>
+  <string name="sidebar_stable">Augintiniai</string>
+  <string name="sidebar_news">Naujienos</string>
+    <string name="sidebar_about">Apie</string>
   <string name="sidebar_shops">Parduotuvės</string>
-<string name="sidebar.inbox">Žinutės</string>
+<string name="sidebar_inbox">Žinutės</string>
     <string name="sidebar_stats">Statistika</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.tutorial.xml b/Habitica/res/values-lt/strings.tutorial.xml
index 1529bf298..982c86dc4 100644
--- a/Habitica/res/values-lt/strings.tutorial.xml
+++ b/Habitica/res/values-lt/strings.tutorial.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Tavo perkami įrankiai atsiras čia. Tavo Kovinė Apranga keičia tavo statistiką, ir tavo Kostiumas (jei įjungtas) keičia tavo veikėjo išvaizdą.</string>
-  <string name="tutorial_items">Rask lobius atliekant užduotis ir keliant veikėjo lygį. Paspausk ant lobio, kad jį panaudoti!</string>
-  <string name="tutorial_pets">Darant savo gyvenimo užduotis, turi šansą rasti kiaušinius ir eliksyrus. Maišant juos gali išauginti gyvūnėlius.</string>
-  <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
+    <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
   <string name="tutorial_party">Tai yra vieta, kur tu ir tavo draugai galite vienas kitą palaikyti ir taip atsakingai siekti savo tikslų kovodami su pabaisomis ir savo užduotimis!</string>
   <string name="tutorial_tavern">Sveiki atvykę į Smuklę, viešą, visiem amžiams tinkantį pokalbių kambarį! Čia galite šnekėti apie produktyvumą ir užduoti klausimus vieni kitiems. Sėkmės!</string>
-  <string name="tutorial_classes">Pasirink ar nori tapti Kariu, Magu, Gydytoju ar Sukčiumi! Kiekviena klasė turi savo aprangą ir sugebėjimus. Paspausk (?), kad sužinoti daugiau!</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 5f502b844..a1087f858 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -4,18 +4,15 @@
   <string name="XP_default">Partirtis</string>
   <string name="HP_default">Gyvybingumas</string>
   <string name="MP_default">Magijos Taškai</string>
-  <string name="ERR_pb_barcode">Nepavyko nuskaityti nustatymų iš brūkšninio kodo</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Nustatymai</string>
-  <string name="SP_address_hint">Tavo nuosavas serveris</string>
-  <string name="SP_userID_title">Vartotojo ID</string>
+    <string name="SP_userID_title">Vartotojo ID</string>
   <string name="SP_userID_summary">Tavo Vartotojo Identifikacijos Kodas</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Tavo API Token</string>
   <string name="Language_title">Kalba</string>
   <string name="Language_summary">Pakeisti Habitica kalbą</string>
-  <string name="SP_user_qr_code">Tavo QR Kodas</string>
-  <string name="PS_contact_title">Susisiekti</string>
+    <string name="PS_contact_title">Susisiekti</string>
   <string name="pref_account_header">Paskyra</string>
   <string name="pref_first_day_of_the_week_title">Pirma Savaitės Diena</string>
   <string name="pref_first_day_of_the_week_summary">Pirma savaitės diena visuose kalendoriuose</string>
@@ -23,8 +20,7 @@
   <string name="pref_reminder_checkbox">Įjungti Priminimą</string>
   <string name="pref_reminder_picker">Nustatyti Priminimo Laiką</string>
   <string name="pref_cds_header">Tinkinta dienos pradžia</string>
-  <string name="pref_cds_picker">Nustatyti tinkintą dienos pradžios laiką</string>
-  <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
+    <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
   <string name="push_notifications">Aktyvūs Pranšimai</string>
   <string name="push_notifications_sum">Iškylančių pranešimų nustatymai</string>
   <string name="preference_push_you_won_challenge">Laimėjai Iššūkį!</string>
@@ -36,10 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Tavo Misija Prasidėjo</string>
   <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
   <!--Adding tasks-->
-  <string name="task_value">Reikšmė</string>
-  <string name="action_edit">Keisti</string>
-  <string name="action_delete">Ištrinti</string>
-  <string name="action_cancel">Atšaukti</string>
+    <string name="action_edit">Keisti</string>
+    <string name="action_cancel">Atšaukti</string>
   <string name="login_btn">Prisijungti</string>
   <string name="register_btn">Registruotis</string>
   <string name="username">Vartotojo Vardas</string>
@@ -49,31 +43,23 @@
   <string name="confirmpassword">Patvirtinti slaptažodį</string>
   <string name="logout">Atsijungti</string>
   <string name="logout_description">Atsijungti nuo paskyros</string>
-  <string name="account_details">Paskyros Duomenys</string>
-  <string name="LoginActivityName">Sveiki</string>
-  <string name="string_revive">Prisikelti</string>
-  <string name="please_connect">Prašome prisijungti su programa prieš naudojant valdiklį</string>
-  <string name="about.title">Apie</string>
-  <string name="about.libraries">Bibliotekos</string>
-  <string name="about.versionhistory">Versijos istorija</string>
-  <string name="about.habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
-  <string name="about.rate_our_app">Įvertink Programėlę</string>
-  <string name="about.give_us_feedback">Siųsk Atsiliepimus!</string>
-  <string name="about.bugreport">Pranešk apie Klaidą</string>
-  <string name="about.source_code">Pirminis Kodas</string>
+    <string name="LoginActivityName">Sveiki</string>
+    <string name="about_title">Apie</string>
+  <string name="about_libraries">Bibliotekos</string>
+    <string name="about_habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
+  <string name="about_rate_our_app">Įvertink Programėlę</string>
+  <string name="about_give_us_feedback">Siųsk Atsiliepimus!</string>
+  <string name="about_bugreport">Pranešk apie Klaidą</string>
+  <string name="about_source_code">Pirminis Kodas</string>
   <!--Network Errors-->
-  <string name="network_error_title">Prisijungimo Klaida</string>
-  <string name="network_error_no_network_body">Tu nesi prisijungęs(us) prie interneto.</string>
-  <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
+    <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
   <string name="authentication_error_title">Prisijungimo Klaida</string>
-  <string name="authentication_error_body">Tavo Vartotojo Vardas ir/ar Slaptažodis neteisingas(i).</string>
-  <string name="login_validation_error_title">Patvirtinimo Klaida</string>
+    <string name="login_validation_error_title">Patvirtinimo Klaida</string>
   <string name="login_validation_error_fieldsmissing">Turi užpildyti visus laukelius.</string>
   <string name="save_changes">Išsaugoti</string>
   <string name="copy">Kopijuoti</string>
   <string name="notes">Užrašai</string>
-  <string name="text">Tekstas</string>
-  <string name="difficulty">Sunkumas</string>
+    <string name="difficulty">Sunkumas</string>
   <string name="tags">Žymės</string>
   <string name="trivial">Labai Lengva</string>
   <string name="easy">Lengva</string>
@@ -84,12 +70,8 @@
   <string name="negative_habit_form">Neigiamas ( - )</string>
   <string name="checklist">Sąrašas</string>
   <string name="reminders">Priminimai</string>
-  <string name="actions">Veiksmai</string>
-  <string name="attributes">Savybės</string>
-  <string name="frequency">Dažnumas</string>
-  <string name="frequency_weekly">Specifinėmis Savaitės Dienomis</string>
-  <string name="frequency_daily">Kas X Dienų</string>
-  <string name="monday">Pirmadienis</string>
+    <string name="attributes">Savybės</string>
+    <string name="monday">Pirmadienis</string>
   <string name="tuesday">Antradienis</string>
   <string name="wednesday">Trečiadienis</string>
   <string name="thursday">Ketvirtadienis</string>
@@ -101,47 +83,34 @@
   <string name="faint_header">Tavo gyvybingumas išseko!</string>
   <string name="faint_button">Atstatyti Gyvybes ir bandyti dar kartą</string>
   <string name="filter">FIltras</string>
-  <string name="profile_image">Profilis Paveikslėlis</string>
-  <string name="mana_price_button">%d Magijos Taškai</string>
-  <string name="used_skill">Panaudojai [%1$s] už %2$d magijos taškus.</string>
-  <string name="used_skill_without_mana">Panaudojai %1$s.</string>
+    <string name="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="skill_progress_title">Sugebėjimas Naudojamas</string>
-  <string name="coming_soon">Jau Greitai</string>
-  <string name="chat_flag_confirmation">Ar tikrai norite pranešti apie šią žinutę dėl pažeidimo?</string>
-  <string name="flag_confirm">Žymėti Žinutę</string>
-  <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
-  <string name="no_party_message">Tu nesi grupėje. Norėdama(s) prisidėti prie grupės, apsilankyk svetainėje.</string>
-  <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
-  <string name="tavern.inn.checkOut">Atnaujinti Kasdienes Užduotis</string>
-  <string name="tavern.inn.rest">Sustabdyti Kasdienes Užduotis</string>
-  <string name="reward.dialog.buy">Pirkti</string>
-  <string name="reward.dialog.dismiss">Atšaukti</string>
+    <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
+    <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
+  <string name="tavern_inn_checkOut">Atnaujinti Kasdienes Užduotis</string>
+  <string name="tavern_inn_rest">Sustabdyti Kasdienes Užduotis</string>
+  <string name="reward_dialog_buy">Pirkti</string>
+  <string name="reward_dialog_dismiss">Atšaukti</string>
   <string name="party">Grupė</string>
   <string name="chat">Pokalbiai</string>
   <string name="members">Nariai</string>
   <string name="habits">Įpročiai</string>
   <string name="dailies">Kasdienės</string>
   <string name="rewards">Atlygiai</string>
-  <string name="taskform.delete.title">Ar esi įsitikinęs(us)?</string>
-  <string name="taskform.delete.message">Ar tikrai nori ištrinti?</string>
-  <string name="yes">Taip</string>
+    <string name="yes">Taip</string>
   <string name="no">Ne</string>
   <string name="quest">Misija</string>
   <string name="avatar_body">Kūnas</string>
   <string name="avatar_hair">Plaukai</string>
   <string name="avatar_shirt">Marškinėliai</string>
   <string name="avatar_skin">Oda</string>
-  <string name="avatar_ears">Gyvūnų Ausys</string>
-  <string name="avatar_base">Pagrindas</string>
+    <string name="avatar_base">Pagrindas</string>
   <string name="avatar_color">Spalva</string>
   <string name="avatar_beard">Barzda</string>
   <string name="avatar_mustache">Ūsai</string>
   <string name="avatar_flower">Gėlytė</string>
   <string name="avatar_bangs">Kirpčiukai</string>
-  <string name="avatar_nothing">Nenustatyta</string>
-  <string name="avatar_size">Dydis</string>
+    <string name="avatar_size">Dydis</string>
   <string name="avatar_size_slim">Plonas</string>
   <string name="avatar_size_broad">Stambus</string>
   <string name="avatar_background">Fonas</string>
@@ -150,27 +119,19 @@
   <string name="purchase_button">Pirkti</string>
   <string name="purchase_set_title">Pirkti rinkinį %s</string>
   <string name="due_date">Baigimo Terminas</string>
-  <string name="quest.accept">Sutikti</string>
-  <string name="quest.reject">Atmesti</string>
-  <string name="quest.begin">Pradėti Misiją</string>
-  <string name="quest.cancel">Atšaukti Pakvietimą</string>
-  <string name="quest.abort">Atšaukti Misiją</string>
-  <string name="quest.leave">Palikti Misiją</string>
-  <string name="quest.pending">Laukiama</string>
-  <string name="quest.accepted">Sutiko</string>
-  <string name="quest.rejected">Atsisakė</string>
-  <string name="quest.participants">Dalyviai</string>
-  <string name="version_info">Versija: %1$s (%2$d)</string>
+  <string name="quest_accept">Sutikti</string>
+  <string name="quest_reject">Atmesti</string>
+  <string name="quest_begin">Pradėti Misiją</string>
+  <string name="quest_cancel">Atšaukti Pakvietimą</string>
+  <string name="quest_abort">Atšaukti Misiją</string>
+    <string name="version_info">Versija: %1$s (%2$d)</string>
   <string name="sidebar_help">Pagalba &amp; DUK</string>
   <string name="complete_tutorial">Supratau!</string>
   <string name="dismiss_tutorial">Priminti man vėliau</string>
   <string name="intro_3_description">Sek savo tikslus pasitelkęs draugų pagalbą. Padėkit vienas kitam gyvenime kartu kovodami su pabaisomis!</string>
-  <string name="previous_button">Praeitas</string>
-  <string name="next_button">Kitas</string>
+    <string name="next_button">Kitas</string>
   <string name="skip_button">Praleisti</string>
-  <string name="setup_welcome_description">Sveiki užsukę į Habitica, kur tobulėjimas žaidime padės jums tobulėti gyvenime! Kai siekiate gyvenimo tikslų, gausite aprangos, įrankių, augintinių, misijų ir daugiau.</string>
-  <string name="setup_welcome_title">Sveiki</string>
-  <string name="setup_group_work">Darbas</string>
+    <string name="setup_group_work">Darbas</string>
   <string name="setup_group_exercise">Sportas</string>
   <string name="setup_group_school">Mokslai</string>
   <string name="setup_group_teams">Komandos</string>
@@ -197,27 +158,19 @@
   <string name="setup_task_creativity_1">Mokytis amato</string>
   <string name="setup_task_creativity_2">Dirbti prie kūrybinio projekto</string>
   <string name="setup_task_creativity_3">Baigti kūrybinį projektą</string>
-  <string name="gem.purchase.support">Nori padėti Habitica gyvuoti? Gali paremti programuotojus perkant brangakmenius!\n\nBrangakmeniai leidžia pirkti smagius priedus savo paskyrai, pvz: \n\n - Smagūs kostiumai tavo veikėjui\n - Nepakartojami fonai\n - Smagios misijos, kuriose galima rasti kiaušinių\n - Galimybė pasikeisti klasę nepasiekus 100 lygio\n\nDėkojame, kad padedate Habitica klestėti. Jūsų parama mums tikrai daug reiškia!</string>
-  <string name="my_guilds">Mano Gildijos</string>
+    <string name="my_guilds">Mano Gildijos</string>
   <string name="public_guilds">Viešos Gildijos</string>
   <string name="guild">Gildija</string>
   <string name="leave">Palikti</string>
   <string name="join">Prisijungti</string>
-  <string name="leader">Vadas</string>
-  <string name="gems">Brangakmeniai</string>
-  <string name="send_pm">Siųsti Žinutę</string>
-  <string name="flag">Žymėti</string>
-  <string name="delete">Trinti</string>
+    <string name="gems">Brangakmeniai</string>
+    <string name="delete">Trinti</string>
   <string name="name">Pavadinimas</string>
   <string name="description">Aprašymas</string>
   <string name="privacy">Privatumas</string>
   <string name="write_message">Rašyti Žinutę</string>
-  <string name="post">Siųsti</string>
-  <string name="guild_search_hint">Ieškoti gildijų</string>
-  <string name="todo_due">Terminas: %s</string>
-  <string name="daily_streak">dabartinė serija: %d</string>
-  <string name="todo_has_duedate">Užduotis turi Terminą</string>
-  <string name="battle_gear">Kovinė Apranga</string>
+    <string name="guild_search_hint">Ieškoti gildijų</string>
+    <string name="battle_gear">Kovinė Apranga</string>
   <string name="costume">Kostiumas</string>
   <string name="outfit_head">Galva</string>
   <string name="outfit_headAccessory">Galvos Aksesuaras</string>
@@ -230,9 +183,7 @@
   <string name="wear_costume">Užsidėti Kostiumą</string>
   <string name="equipped">Užsidėta</string>
   <string name="quest_cancel_message">Ar tikrai nori atšaukti misiją? Visi pakvietimai bus nutraukti. Misijos savininkas atgaus misijos rankraštį.</string>
-  <string name="quest.invitation">Misijos Pakvietimas</string>
-  <string name="quest.invitation.text">Tave pakvietė dalyvauti misijoje!</string>
-  <string name="today">Šiandien</string>
+    <string name="today">Šiandien</string>
   <string name="sidebar_items">Daiktai</string>
   <string name="eggs">Kiaušiniai</string>
   <string name="hatching_potions">Perėjimosi Eliksyrai</string>
@@ -243,13 +194,9 @@
   <string name="armoireEquipment">Radai retos aprangos dalį Drabužinėje: %s! Nuostabu!</string>
   <string name="armoireFood">Betyrinėjant Drabužinę randi %1$s %2$s. Ką tai čia veikia?</string>
   <string name="armoireExp">Besigrumiant su Drabužine, gauni patirties!</string>
-  <string name="armoireNotesFull">Atidaryk Drabužinę ir gauk retos Aprangos dalį, Patirties ar maisto! Nerasto aprangos dalys: %d</string>
-  <string name="armoireLastItem">Radai paskutinę retos aprangos dalį Užburtoje Drabužinėje.</string>
-  <string name="armoireNotesEmpty">Drabužinėje atsiranda naujų daiktų pirmą kiekvieno mėnesio savaitę. Iki tol, gali toliau joje ieškoti Patirties ir Maisto!</string>
-  <string name="sell">Parduoti (%d Augso)</string>
+    <string name="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="hatch_egg">Išperėti kiaušinį</string>
   <string name="invite_party">Pakviesti grupę</string>
   <string name="dialog_feeding">Pašerti %s su:</string>
   <string name="use_animal">Naudoti</string>
@@ -270,8 +217,7 @@
   <string name="healer_description">Gydytojai yra labai sunkiai sužeidžiami - savybė kuria jie dalinasis su aplinkiniais. Praleistos užduotys ir blogi įpročiai jų taip stipriai neveikia ir jie sugeba atstayti savo gyvybes po nesėkmių. Pasirink Gydytoją, jei nori padėti kitiems savo grupėje ir jei tave įkvepia Mirties apgaudinėjimas!</string>
   <string name="select_class">Pasirinkti Klasę</string>
   <string name="opt_out_class">Atsisakyti</string>
-  <string name="opt_out_description">Tingi gilintis į klases? Nori pasirinkti vėliau? Atsisakyk. Liksi kariu be specialių sugebėjimų. Galėsi vėliau lengvai ją įjungti, kai pasiskaitysi daugiau apie klases wiki puslapyje.</string>
-  <string name="class_confirmation">Ar tikrai nori būti %s?</string>
+    <string name="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>
@@ -282,53 +228,28 @@
   <string name="invite_existing_users">Pakviesti Esamus Vartotojus</string>
   <string name="send">Siųsti</string>
   <string name="invite">Pakviesk Draugus</string>
-  <string name="invite_id_description">Jei tavo draugai jau naudojasi Habitica, pakviesk juos įrašant jų Vartotojo ID čia.</string>
-  <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
+    <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
   <string name="add_invites">Pridėti Pakvietimų</string>
-  <string name="user_id">Vartotojo ID</string>
-  <string name="email">El. paštas</string>
-  <string name="invite_users">Pakviesk į Grupę</string>
-  <string name="share_using">Pasidalinti su</string>
+    <string name="email">El. paštas</string>
+    <string name="share_using">Pasidalinti su</string>
   <string name="share_hatched">Kątik gavau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
   <string name="share_raised">Kątik užauginau %1$s Habitica augintinį atliekant kasdienes užduotis!</string>
   <string name="open_in_store">Atidaryti play parduotuvėje</string>
   <string name="change_class_confirmation">Ar tikrai nori pasikeisti savo klasę? Tai kainuos 3 brangakmenius.</string>
-  <string name="leaderMessage">Žinutė nuo %1$s</string>
-  <string name="confirm">Patvirtinti</string>
+    <string name="confirm">Patvirtinti</string>
   <string name="market">Turgus</string>
   <string name="timeTravelers">Keliautojai Laiku</string>
   <string name="seasonalShop">Sezoninė Parduotuvė</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="purchase_confirmation_title">Patvirtinti pirkinį</string>
-  <string name="confirm_purchase_text">Pirkti %1$s už %2$s %3$s</string>
-  <string name="gem">brangakmenis</string>
-  <string name="hourglass">smėlio laikrodis</string>
-  <string name="hourglasses">smėlio laikrodžiai</string>
-  <string name="gold_singular">aukso</string>
-  <string name="gold_plural">aukso</string>
+    <string name="gold_plural">aukso</string>
   <string name="chat_message_copied">Žinutė nukopijuota į Iškarpinę</string>
-  <string name="copy_chat_message">Kopijuoti į Iškarpinę</string>
-  <string name="edit_tag_title">Keisti Žymę</string>
-  <string name="edit_tag_btn_edit">Keisti</string>
-  <string name="edit_tag_btn_done">Atlikta</string>
-  <string name="edit_tag_btn_delete">Trinti</string>
-  <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
+    <string name="edit_tag_btn_edit">Keisti</string>
+    <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
   <string name="confirm_delete_tag_message">Ar tikrai nori ištrinti?</string>
-  <string name="filter_drawer_edit_tags">Keisti Žymes</string>
-  <string name="filter_drawer_filter_tags">Filtruoti pagal Žymes</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Leisk kitus tave pakviesti su šiuo QR Kodu</string>
-  <string name="qr_save_message">QR kodas išsaugotas</string>
-  <string name="qr_dialogue_title">Tavo QR Kodas</string>
-  <string name="download">Atsisiųsti</string>
-  <string name="send_new_message">Siųsti žinutę</string>
-  <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
   <string name="action_continue">Tęsti</string>
-  <string name="scan_qr_code">Nuskanuok QR Kodą</string>
-  <string name="enter_recipient_uuid">Įvesti adresato Vartotojo ID</string>
-  <string name="invited_to_party">Tave pakvietė į grupę!</string>
+    <string name="invited_to_party">Tave pakvietė į grupę!</string>
   <string name="stats_widget_label">Habitica Statistika</string>
   <string name="add_task">Pridėti Užduotį</string>
   <string name="add_habit">Pridėti Įprotį</string>
@@ -338,15 +259,14 @@
   <string name="all_dailies_completed">Atlikai visas savo dienos užduotis. Puiku!</string>
   <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
   <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
-  <string name="widget_add_task">Habitica Prodėti Užduotį</string>
-  <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
-  <string name="gem.purchase.toolbartitle">Pirkti</string>
-  <string name="gem.purchase.title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
-  <string name="gem.purchase.subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
-  <string name="gem.purchase.listitem1">Gražūs veikėjo kostiumai</string>
-  <string name="gem.purchase.listitem2">Nuostabūs fonai</string>
-  <string name="gem.purchase.listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
-  <string name="gem.purchase.listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
+    <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
+  <string name="gem_purchase_toolbartitle">Pirkti</string>
+  <string name="gem_purchase_title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
+  <string name="gem_purchase_subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
+  <string name="gem_purchase_listitem1">Gražūs veikėjo kostiumai</string>
+  <string name="gem_purchase_listitem2">Nuostabūs fonai</string>
+  <string name="gem_purchase_listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
+  <string name="gem_purchase_listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
   <string name="support_habitica">Paremti Habitica</string>
   <string name="skill_transformation_use">naudoti</string>
   <string name="hatching_market_info">Negaunate reikiamų lašiukų? Patikrinkite turguje!</string>
@@ -357,22 +277,8 @@
   <string name="AudioTheme_summary">Pakeiskite Habitica garsinę temą</string>
   <!--Login Incentives-->
   <string name="see_you_tomorrow">Pasimatysime rytoj!</string>
-<string name="unknown_error">Įvyko klaida…</string>
-    <string name="new_todo">Naujas darbas</string>
-    <string name="new_reward">Naujas apdovanojimas</string>
-    <string name="new_daily">Naujas „Daily“</string>
-    <string name="new_habit">Naujas prigimtis</string>
-    <string name="repeatEvery">Pakartokite kiekvieną</string>
 
 
-    <string name="physical">Jėga</string>
-    <string name="mental">Žvalgyba</string>
-    <string name="social">Konstitucija</string>
-    <string name="other">Įžvalga</string>
-
-    <string name="repeatables_summary_title">Santrauka</string>
-    <string name="repeatables_title">Pakartojama</string>
-    <string name="repeatables_on_title">Kartojasi</string>
     <string name="repeatables_frequency_daily">Kasdien</string>
     <string name="repeatables_frequency_weekly">Savaitės</string>
     <string name="repeatables_frequency_monthly">Mėnesio</string>
@@ -387,8 +293,7 @@
     <string name="reminder_title">Nepamirškite patikrinti savo užduočių</string>
     <string name="todos">Daryti</string>
     <string name="intro_1_subtitle">Sveiki atvykę į</string>
-    <string name="intro_1_title">Habitica</string>
-    <string name="intro_1_description">Atėjo laikas pasilinksminti, kol gausite dalykų. Prisijunkite prie % s kitų, gerindami savo gyvenimą vienu metu.</string>
+    <string name="intro_1_description">Atėjo laikas pasilinksminti, kol gausite dalykų. Prisijunkite prie %s kitų, gerindami savo gyvenimą vienu metu.</string>
     <string name="intro_2_subtitle">Pažanga žaidime</string>
     <string name="intro_2_title">Pažanga gyvenime</string>
     <string name="intro_2_description">Atrakinkite žaidimo funkcijas, patikrindami savo realaus gyvenimo užduotis. Uždirbkite šarvus, augintinius ir daugiau, kaip atlygį už savo tikslų pasiekimą.</string>
@@ -398,26 +303,16 @@
     <string name="avatar_setup_description">Taigi, kaip norėtumėte ieškoti\? Nesijaudinkite, vėliau galite tai pakeisti.</string>
     <string name="task_setup_description">Puikus! Dabar, ką domitės dirbti visą šią kelionę\?</string>
     <string name="setup_group_health">Sveikata</string>
-    <string name="copy_as_todo">Kopijuoti kaip darbus</string>
     <string name="add_tag">Pridėti naują žymę</string>
-    <string name="quest_begin_message">Ar tu tuo tikras\? Tik% 1 $ d jūsų% 2 $ d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
+    <string name="quest_begin_message">Ar tu tuo tikras\? Tik% 1 $d jūsų% 2 $d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
     <string name="ago_1day">Prieš 1 dieną</string>
     <string name="ago_days">prieš %d dienas</string>
     <string name="ago_1Minute">Prieš 1 minutę</string>
     <string name="ago_minutes">Prieš %d minutes</string>
     <string name="ago_hours">prieš %d valandas</string>
     <string name="ago_1hour">Prieš 1 valandą</string>
-    <string name="evolved_pet_title">Prakeikėte %1$s %2$s, eikime į kelionę!</string>
-    <string name="notification_purchase">Įsigijote %s</string>
+    <string name="evolved_pet_title">Prakeikėte %s, eikime į kelionę!</string>
     <string name="notification_purchase_reward">Jūs įsigijote atlygį</string>
-    <string name="sectionpets">Standartinis</string>
-    <string name="sectionpremiumPets">magija potion</string>
-    <string name="sectionquestPets">ieškojimas</string>
-    <string name="sectionspecialPets">Reti</string>
-    <string name="sectionmounts">Standartinis</string>
-    <string name="sectionpremiumMounts">magija potion</string>
-    <string name="sectionquestMounts">ieškojimas</string>
-    <string name="sectionspecialMounts">Reti</string>
     <string name="inn_description">Reikia pertraukos\? Patikrinkite „Daniel\'s Inn“, kad pristabdytumėte sudėtingesnius „Habitica“ žaidimų mechanikus:
 \n
 \n • Praleisti dienraščiai jums nepažeis
@@ -434,7 +329,6 @@
     <string name="invite_username_description">Jei turite draugų, kurie jau naudojasi Habitica, pakvieskite juos pagal vartotojo vardą.</string>
     <string name="share_levelup">Habiticoje pasiekiau %d lygį, gerindamas savo tikrojo gyvenimo įpročius!</string>
     <string name="change_class_equipment_warning">Įspėjimas: nebegalėsite pirkti įrangos iš %s klasės.</string>
-    <string name="leaderName">Lyderis: %1$s</string>
     <string name="empty_inbox">Jūs neturite jokių pranešimų. Galite siųsti vartotojui naują pranešimą iš savo viešųjų pokalbių pranešimų!</string>
     <string name="login_incentive">Atrakinkite reguliariai prisijungdami prie Habitica</string>
     <string name="create_account">Atrakinkite paskyrą</string>
@@ -443,38 +337,38 @@
     <string name="belongs_to_challenge">Priklauso iššūkiui</string>
     <string name="has_reminder">Turi priminimą</string>
     <string name="has_tag">Turi žymę</string>
-    <string name="subscribe.title">Prenumerata palaiko kūrėjus ir padeda išlaikyti Habitica veikimą</string>
+    <string name="subscribe_title">Prenumerata palaiko kūrėjus ir padeda išlaikyti Habitica veikimą</string>
     <string name="subscribe_prompt">Tapkite abonentu ir gausite šiuos naudingus privalumus:</string>
-    <string name="subscribe.listitem1">Pirkti brangakmenius su auksu</string>
-    <string name="subscribe.listitem2">Išskirtiniai mėnesiniai straipsniai</string>
-    <string name="subscribe.listitem3">Išsaugokite papildomus istorijos įrašus</string>
-    <string name="subscribe.listitem4">Dvigubai padidėjo kasdienių lašų</string>
+    <string name="subscribe_listitem1">Pirkti brangakmenius su auksu</string>
+    <string name="subscribe_listitem2">Išskirtiniai mėnesiniai straipsniai</string>
+    <string name="subscribe_listitem3">Išsaugokite papildomus istorijos įrašus</string>
+    <string name="subscribe_listitem4">Dvigubai padidėjo kasdienių lašų</string>
     <string name="subscriptions">Prenumeratos</string>
     <string name="subscription_duration">Pasikartojantis kiekvienas %s</string>
     <string name="subscription_duration_norenew">Dėl %s</string>
     <string name="subscribe">Prenumeruoti</string>
-    <string name="subscribe.listitem1.description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
+    <string name="subscribe_listitem1_description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
 \n
 \nJo mėnesinės siuntos iš pradžių yra ribojamos per 25 brangakmenius per mėnesį, tačiau jos gali padidėti pagal jūsų prenumeratos ilgį.
 \n
 \nViršutinė prenumerata kas tris mėnesius iš eilės padidėja 5 brangakmeniais, ne daugiau kaip 50 brangakmenių per mėnesį!</string>
-    <string name="subscribe.listitem2.description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
+    <string name="subscribe_listitem2_description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
 \n
 \nBe to, kas tris mėnesius iš eilės prenumeratos, paslaptingas laikas keliautojai suteiks jums prieigą prie istorinių (ir futuristinių!) Kosmetikos gaminių.</string>
-    <string name="subscribe.listitem3.description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
-    <string name="subscribe.listitem4.description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
-    <string name="subscribe1month.gemcap">25 perlas riba</string>
-    <string name="subscribe3month.gemcap">30 perlas riba</string>
-    <string name="subscribe6month.gemcap">35 perlas riba</string>
-    <string name="subscribe12month.gemcap">45 perlas riba</string>
+    <string name="subscribe_listitem3_description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
+    <string name="subscribe_listitem4_description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
+    <string name="subscribe1month_gemcap">25 perlas riba</string>
+    <string name="subscribe3month_gemcap">30 perlas riba</string>
+    <string name="subscribe6month_gemcap">35 perlas riba</string>
+    <string name="subscribe12month_gemcap">45 perlas riba</string>
     <string name="subscription_hourglasses">+%d mistikas smėlio laikrodis</string>
     <string name="payment_method">Mokėjimo būdas</string>
     <string name="subscription">Prenumerata</string>
     <string name="active">Aktyvus</string>
     <string name="due">Mokėti</string>
     <string name="cancel_subscription">Atšaukti prenumeratą</string>
-    <string name="cancel_subscription_google.description">Nenorite prenumeruoti\? Galite atsisakyti prenumeratos „Google Play“ parduotuvės skyriuje „Mano programos“.</string>
-    <string name="cancel_subscription_notgoogle.description">Nenorite prenumeruoti\? Dėl mokėjimo būdo galite atsisakyti tik per svetainę. Spustelėkite žemiau esantį mygtuką, kad atidarytumėte svetainę naršyklėje!</string>
+    <string name="cancel_subscription_google_description">Nenorite prenumeruoti\? Galite atsisakyti prenumeratos „Google Play“ parduotuvės skyriuje „Mano programos“.</string>
+    <string name="cancel_subscription_notgoogle_description">Nenorite prenumeruoti\? Dėl mokėjimo būdo galite atsisakyti tik per svetainę. Spustelėkite žemiau esantį mygtuką, kad atidarytumėte svetainę naršyklėje!</string>
     <string name="visit_habitica_website">Aplankykite „Habitica“ svetainę</string>
     <string name="current_bonuses">Dabartinės premijos</string>
     <string name="months_subscribed">Užregistruoti mėnesiai</string>
@@ -490,8 +384,6 @@
     <string name="subscribe_prompt_thanks">Užsisakydami gaunate šias naudingas išmokas:</string>
     <string name="subscription_status">Prenumeratos būsena</string>
 
-    <string name="byLeader">iki %s</string>
-    <string name="challenge_details">Išsami informacija apie iššūkius</string>
     <string name="challenge_leave_title">Palikite iššūkį</string>
     <string name="challenge_leave_text">Ar tikrai norite palikti iššūkį „%s“\?</string>
     <string name="challenge_remove_tasks_title">Pašalinkite užduotis</string>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index c84e4e103..1ed354dd6 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Niveau:</string>
     <string name="profile_class_bonus">Klassebonus:</string>
     <string name="profile_allocated">Toegewezen:</string>
-    <string name="profile_boosts">Versterkingen:</string>
     <string name="profile_private_message">Privébericht</string>
     <string name="profile_achievements">Prestaties</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Sluiten</string>
 
 </resources>
diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml
index cd8d81764..dfd9a7a12 100644
--- a/Habitica/res/values-nl/strings.sidebar.xml
+++ b/Habitica/res/values-nl/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Taken</string>
-  <string name="sidebar.skills">Vaardigheden</string>
-  <string name="sidebar.section.social">Sociaal</string>
-  <string name="sidebar.inbox">Berichten</string>
-  <string name="sidebar.tavern">Herberg</string>
-  <string name="sidebar.party">Groep</string>
-  <string name="sidebar.purchaseGems">Edelstenen &amp; abonnement</string>
-  <string name="sidebar.guilds">Gilden</string>
-  <string name="sidebar.challenges">Uitdagingen</string>
-  <string name="sidebar.section.inventory">Boedel</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Uitrusting</string>
-  <string name="sidebar.stable">Stal</string>
-  <string name="sidebar.news">Nieuws</string>
-  <string name="sidebar.settings">Instellingen</string>
-  <string name="sidebar.about">Over</string>
+  <string name="sidebar_tasks">Taken</string>
+  <string name="sidebar_skills">Vaardigheden</string>
+  <string name="sidebar_section_social">Sociaal</string>
+  <string name="sidebar_inbox">Berichten</string>
+  <string name="sidebar_tavern">Herberg</string>
+  <string name="sidebar_party">Groep</string>
+  <string name="sidebar_purchaseGems">Edelstenen &amp; abonnement</string>
+  <string name="sidebar_guilds">Gilden</string>
+  <string name="sidebar_challenges">Uitdagingen</string>
+  <string name="sidebar_section_inventory">Boedel</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Uitrusting</string>
+  <string name="sidebar_stable">Stal</string>
+  <string name="sidebar_news">Nieuws</string>
+    <string name="sidebar_about">Over</string>
   <string name="sidebar_shops">Winkels</string>
   <string name="sidebar_stats">Statistieken</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.tutorial.xml b/Habitica/res/values-nl/strings.tutorial.xml
index 471c09d1c..00166cd28 100644
--- a/Habitica/res/values-nl/strings.tutorial.xml
+++ b/Habitica/res/values-nl/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Koop een uitrusting voor je avatar met het goud dat je verdient!</string>
   <string name="tutorial_rewards_2">Je kan ook zelf beloningen maken voor in de echte wereld, gebaseerd op wat je motiveert.</string>
   <string name="tutorial_tasks_complete">Dat was het voorlopig. Als je iets vergeet, kijk dan in de FAQ sectie.</string>
-  <string name="tutorial_equipment">Als je uitrustingsstukken koopt verschijnen die hier. Jouw gevechtsuitrusting beïnvloedt je statistieken en je kostuum (als het aan staat) beïnvloedt wat je avatar aan heeft.</string>
-  <string name="tutorial_items">Verdien voorwerpen door taken te voltooien en niveaus omhoog te gaan. Tik op een voorwerp om het te gebruiken!</string>
-  <string name="tutorial_pets">Terwijl je taken uit de echte wereld voltooit, heb je een kans om eieren en drankjes te vinden. Combineer ze om je huisdier te laten uitkomen.</string>
-  <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
+    <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
   <string name="tutorial_party">Dit is waar jij en je vrienden elkaar verantwoordelijk kunnen houden voor het bereiken van je doelen en je samen monsters kan bevechten met je taken!</string>
   <string name="tutorial_tavern">Welkom in de Herberg, een openbare chatroom voor alle leeftijden! Hier kan je praten over productiviteit en vragen stellen. Veel plezier!</string>
-  <string name="tutorial_classes">Kies hier of je Krijger, Magiër, Heler of Dief wilt worden! Elke klasse heeft unieke uitrustingen en vaardigheden. Tik op de (?) om meer te weten te komen!</string>
-  <string name="tutorial_stats">Tik de grijze knop aan om meerdere punten ineens aan te wijzen, of tik op de pijlen om ze één punt per keer toe  te voegen.</string>
+    <string name="tutorial_stats">Tik de grijze knop aan om meerdere punten ineens aan te wijzen, of tik op de pijlen om ze één punt per keer toe  te voegen.</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 0028aab4a..b8e0e58ca 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Ervaring</string>
   <string name="HP_default">Gezondheid</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Voorkeuren konden niet uit de barcode worden geladen</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Instellingen</string>
-  <string name="SP_address_hint">Jouw persoonlijke server</string>
-  <string name="SP_userID_title">Gebruikers-ID</string>
+    <string name="SP_userID_title">Gebruikers-ID</string>
   <string name="SP_userID_summary">Jouw gebruikers-ID</string>
   <string name="SP_APIToken_title">API-token</string>
   <string name="SP_APIToken_summary">Jouw API-token</string>
   <string name="Language_title">Taal</string>
   <string name="Language_summary">Verander Habitica\'s taal</string>
-  <string name="SP_user_qr_code">Je QR code</string>
-  <string name="PS_contact_title">Contact</string>
-  <string name="unknown_error">Er is een fout opgetreden...</string>
-  <string name="pref_account_header">Account</string>
+    <string name="PS_contact_title">Contact</string>
+    <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
   <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
   <string name="pref_reminder_header">Dagelijkse herinnering</string>
   <string name="pref_reminder_checkbox">Activeer herinnering</string>
   <string name="pref_reminder_picker">Stel tijd van herinnering in</string>
   <string name="pref_cds_header">Aangepast begin van de dag</string>
-  <string name="pref_cds_picker">Begin van de dag instellen</string>
-  <string name="pref_push_notifications_checkbox">Gebruiker-pushnotificaties</string>
+    <string name="pref_push_notifications_checkbox">Gebruiker-pushnotificaties</string>
   <string name="push_notifications">Pushnotificaties</string>
   <string name="push_notifications_sum">Stel je pushnotificaties in</string>
   <string name="preference_push_you_won_challenge">Je hebt een uitdaging gewonnen!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
   <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
   <!--Adding tasks-->
-  <string name="task_value">Waarde</string>
-  <string name="new_todo">Nieuwe to-do</string>
-  <string name="new_reward">Nieuwe beloning</string>
-  <string name="new_daily">Nieuwe dagelijkse taak</string>
-  <string name="new_habit">Nieuwe gewoonte</string>
-  <string name="action_edit">Aanpassen</string>
-  <string name="action_delete">Verwijderen</string>
-  <string name="action_cancel">Annuleren</string>
+    <string name="action_edit">Aanpassen</string>
+    <string name="action_cancel">Annuleren</string>
   <string name="login_btn">Inloggen</string>
   <string name="register_btn">Registreren</string>
   <string name="username">Gebruikersnaam</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Bevestig wachtwoord</string>
   <string name="logout">Uitloggen</string>
   <string name="logout_description">Uitloggen</string>
-  <string name="account_details">Accountgegevens</string>
-  <string name="LoginActivityName">Welkom</string>
-  <string name="string_revive">Herleven</string>
-  <string name="please_connect">Maak verbinding via de app voor het gebruik van een widget</string>
-  <string name="about.title">Over</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versiegeschiedenis</string>
-  <string name="about.habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
-  <string name="about.rate_our_app">Beoordeel onze App</string>
-  <string name="about.give_us_feedback">Stuur ons feedback!</string>
-  <string name="about.bugreport">Fout melden</string>
-  <string name="about.source_code">Broncode</string>
-  <string name="repeatEvery">Herhaal elke</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindingsfout</string>
-  <string name="network_error_no_network_body">Je bent niet verbonden met het internet.</string>
-  <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
+    <string name="LoginActivityName">Welkom</string>
+    <string name="about_title">Over</string>
+  <string name="about_libraries">Bibliotheken</string>
+    <string name="about_habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
+  <string name="about_rate_our_app">Beoordeel onze App</string>
+  <string name="about_give_us_feedback">Stuur ons feedback!</string>
+  <string name="about_bugreport">Fout melden</string>
+  <string name="about_source_code">Broncode</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
   <string name="authentication_error_title">Authenticatiefout</string>
-  <string name="authentication_error_body">Je Gebruikersnaam en/of Wachtwoord is onjuist.</string>
-  <string name="login_validation_error_title">Validatiefout</string>
+    <string name="login_validation_error_title">Validatiefout</string>
   <string name="login_validation_error_fieldsmissing">Je moet alle velden invullen.</string>
   <string name="save_changes">Opslaan</string>
   <string name="copy">Kopie</string>
   <string name="notes">Notities</string>
-  <string name="text">Tekst</string>
-  <string name="difficulty">Moeilijkheidsgraad</string>
+    <string name="difficulty">Moeilijkheidsgraad</string>
   <string name="tags">Labels</string>
   <string name="trivial">Triviaal</string>
   <string name="easy">Gemakkelijk</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negatief ( - )</string>
   <string name="checklist">Checklijst</string>
   <string name="reminders">Herinneringen</string>
-  <string name="actions">Acties</string>
-  <string name="attributes">Eigenschappen</string>
-  <string name="physical">Kracht</string>
-  <string name="mental">Intelligentie</string>
-  <string name="social">Lichaam</string>
-  <string name="other">Perceptie</string>
-  <string name="frequency">Frequentie</string>
-  <string name="frequency_weekly">Op Bepaalde Dagen van de Week</string>
-  <string name="frequency_daily">Iedere X Dagen</string>
-  <string name="repeatables_summary_title">Samenvatting</string>
-  <string name="repeatables_title">Herhaalt</string>
-  <string name="repeatables_on_title">Herhaalt op</string>
-  <string name="repeatables_frequency_daily">Dagelijks</string>
+    <string name="attributes">Eigenschappen</string>
+    <string name="repeatables_frequency_daily">Dagelijks</string>
   <string name="repeatables_frequency_weekly">Wekelijks</string>
   <string name="repeatables_frequency_monthly">Maandelijks</string>
   <string name="repeatables_frequency_yearly">Jaarlijks</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Je hebt geen Levenspunten meer!</string>
   <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
   <string name="filter">Filter</string>
-  <string name="profile_image">Profielfoto</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Je hebt %1$s voor %2$d mana gebruikt.</string>
-  <string name="used_skill_without_mana">Je hebt %1$s gebruikt.</string>
+    <string name="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 je taken niet af te vinken</string>
-  <string name="skill_progress_title">Vaardigheid gebruiken</string>
-  <string name="coming_soon">Binnenkort beschikbaar</string>
-  <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wilt melden wegens overtreding?</string>
-  <string name="flag_confirm">Markeer bericht</string>
-  <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
-  <string name="no_party_message">Je zit niet in een groep. Bezoek de website als je je bij een groep wilt aansluiten.</string>
-  <string name="forgot_pw_btn">Wachtwoord vergeten</string>
-  <string name="tavern.inn.checkOut">Heractiveer je Dagelijkse taken</string>
-  <string name="tavern.inn.rest">Pauzeer je Dagelijkse Taken</string>
-  <string name="reward.dialog.buy">Kopen</string>
-  <string name="reward.dialog.dismiss">Verwijderen</string>
+    <string name="reminder_title">Vergeet je taken niet af te vinken</string>
+    <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
+    <string name="forgot_pw_btn">Wachtwoord vergeten</string>
+  <string name="tavern_inn_checkOut">Heractiveer je Dagelijkse taken</string>
+  <string name="tavern_inn_rest">Pauzeer je Dagelijkse Taken</string>
+  <string name="reward_dialog_buy">Kopen</string>
+  <string name="reward_dialog_dismiss">Verwijderen</string>
   <string name="party">Groep</string>
   <string name="chat">Chat</string>
   <string name="members">Leden</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Dagelijkse taken</string>
   <string name="todos">To-do\'s</string>
   <string name="rewards">Beloningen</string>
-  <string name="taskform.delete.title">Weet je het zeker?</string>
-  <string name="taskform.delete.message">Wil je het echt verwijderen?</string>
-  <string name="yes">Ja</string>
+    <string name="yes">Ja</string>
   <string name="no">Nee</string>
   <string name="quest">Queeste</string>
   <string name="avatar_body">Lichaam</string>
   <string name="avatar_hair">Haar</string>
   <string name="avatar_shirt">T-Shirt</string>
   <string name="avatar_skin">Huid</string>
-  <string name="avatar_ears">Dierenoren</string>
-  <string name="avatar_base">Basis</string>
+    <string name="avatar_base">Basis</string>
   <string name="avatar_color">Kleur</string>
   <string name="avatar_beard">Baard</string>
   <string name="avatar_mustache">Snor</string>
   <string name="avatar_flower">Bloem</string>
   <string name="avatar_bangs">Pony</string>
-  <string name="avatar_nothing">Niets ingesteld</string>
-  <string name="avatar_size">Grootte</string>
+    <string name="avatar_size">Grootte</string>
   <string name="avatar_size_slim">Slank</string>
   <string name="avatar_size_broad">Breed</string>
   <string name="avatar_background">Achtergrond</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Koop</string>
   <string name="purchase_set_title">Koop set %s</string>
   <string name="due_date">Einddatum</string>
-  <string name="quest.accept">Accepteren</string>
-  <string name="quest.reject">Afwijzen</string>
-  <string name="quest.begin">Begin Queeste</string>
-  <string name="quest.cancel">Annuleer Uitnodiging</string>
-  <string name="quest.abort">Queeste afbreken</string>
-  <string name="quest.leave">Verlaat Queeste</string>
-  <string name="quest.pending">in afwachting van</string>
-  <string name="quest.accepted">Aanvaard</string>
-  <string name="quest.rejected">Afgewezen</string>
-  <string name="quest.participants">Deelnemers</string>
-  <string name="version_info">Versie %1$s (%2$d)</string>
+  <string name="quest_accept">Accepteren</string>
+  <string name="quest_reject">Afwijzen</string>
+  <string name="quest_begin">Begin Queeste</string>
+  <string name="quest_cancel">Annuleer Uitnodiging</string>
+  <string name="quest_abort">Queeste afbreken</string>
+    <string name="version_info">Versie %1$s (%2$d)</string>
   <string name="sidebar_help">Help &amp; FAQ</string>
   <string name="complete_tutorial">Begrepen!</string>
   <string name="dismiss_tutorial">Herinner me opnieuw</string>
   <string name="intro_1_subtitle">Welkom bij</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
+    <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
   <string name="intro_2_subtitle">Vooruitgang in het spel</string>
   <string name="intro_2_title">Vooruitgang in je leven</string>
   <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrustingsstukken, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Wordt sociaal</string>
   <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
   <string name="intro_finish_button">Laten we beginnen!</string>
-  <string name="previous_button">Vorige</string>
-  <string name="next_button">Volgende</string>
+    <string name="next_button">Volgende</string>
   <string name="skip_button">Sla over</string>
-  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
-  <string name="setup_welcome_title">Welkom</string>
-  <string name="avatar_setup_description">Dus, hoe wil jij er uitzien? Geen zorgen, je kan dit later veranderen.</string>
+    <string name="avatar_setup_description">Dus, hoe wil jij er uitzien? Geen zorgen, je kan dit later veranderen.</string>
   <string name="task_setup_description">Geweldig! Nu, waar zou je graag aan willen werken door deze reis heen?</string>
   <string name="setup_group_work">Werk</string>
   <string name="setup_group_exercise">Sport</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Studeer een meester van het ambacht</string>
   <string name="setup_task_creativity_2">Aan een creatief project werken</string>
   <string name="setup_task_creativity_3">Een creatief project afronden</string>
-  <string name="gem.purchase.support">Wil je helpen om Habitica draaiende te houden? Je kan de ontwikkelaars ondersteunen door edelstenen te kopen!\n\nMet edelstenen kun je leuke extra\'s voor je account kopen, zoals: \n\n - Geweldige kostuums voor je avatar\n - Adembenemende achtergronden\n - Leuke queestes met huisdiereieren als beloning\n - De mogelijkheid om je klasse te veranderen voor je niveau 100 bent\n\nOntzettend bedankt voor je hulp om Habitica het beste te maken wat het kan zijn. Jouw steun betekent heel veel voor ons!</string>
-  <string name="my_guilds">Mijn Gilden</string>
+    <string name="my_guilds">Mijn Gilden</string>
   <string name="public_guilds">Publieke Gilden</string>
   <string name="guild">Gilde</string>
   <string name="leave">Verlaten</string>
   <string name="join">Toetreden</string>
-  <string name="leader">Leider</string>
-  <string name="gems">Edelstenen</string>
-  <string name="copy_as_todo">Kopiëren als to-do</string>
-  <string name="send_pm">PB verzenden</string>
-  <string name="flag">Aanduiden</string>
-  <string name="delete">Verwijderen</string>
+    <string name="gems">Edelstenen</string>
+    <string name="delete">Verwijderen</string>
   <string name="name">Naam</string>
   <string name="description">Beschrijving</string>
   <string name="add_tag">Nieuwe label toevoegen</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Bericht schrijven</string>
-  <string name="post">Post</string>
-  <string name="guild_search_hint">Zoek naar gilden</string>
-  <string name="todo_due">Tegen: %s</string>
-  <string name="daily_streak">huidige serie: %d</string>
-  <string name="todo_has_duedate">Taak heeft een einddatum</string>
-  <string name="battle_gear">Gevechtsuitrusting</string>
+    <string name="guild_search_hint">Zoek naar gilden</string>
+    <string name="battle_gear">Gevechtsuitrusting</string>
   <string name="costume">Kostuum</string>
   <string name="outfit_head">Hoofd</string>
   <string name="outfit_headAccessory">Hoofdaccessoire</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Kostuum Aantrekken</string>
   <string name="equipped">In gebruik</string>
   <string name="quest_cancel_message">Ben je zeker dat je deze queeste wilt beëindigen? Alle aangenomen uitnodigingen zullen verloren gaan. De eigenaar van de queeste zal de queesterol terug krijgen.</string>
-  <string name="quest.invitation">Queeste uitnodiging</string>
-  <string name="quest_begin_message">Weet je het je zeker? Nog maar %1$d van je %2$d groepsleden hebben zich aangesloten bij deze queeste! Queestes beginnen automatisch wanneer alle spelers de uitnodiging hebben geaccepteerd of afgewezen.</string>
-  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
-  <string name="ago_1day">1d geleden</string>
+    <string name="quest_begin_message">Weet je het je zeker? Nog maar %1$d van je %2$d groepsleden hebben zich aangesloten bij deze queeste! Queestes beginnen automatisch wanneer alle spelers de uitnodiging hebben geaccepteerd of afgewezen.</string>
+    <string name="ago_1day">1d geleden</string>
   <string name="ago_days">%dd geleden</string>
   <string name="ago_1Minute">1m geleden</string>
   <string name="ago_minutes">%dm geleden</string>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
   <string name="armoireFood">Je rommelt wat rond in het Kabinet en vindt %1$s %2$s. Wat doet dat hier?</string>
   <string name="armoireExp">Je worstelt met het Kabinet en verdient Ervaring. Pak aan!</string>
-  <string name="armoireNotesFull">Open het Kabinet om willekeurig speciale uitrustingen, ervaring of voedsel te vinden! Stukken uitrusting die nog over zijn: %d</string>
-  <string name="armoireLastItem">Je hebt het laatste stuk zeldzame uitrusting gevonden in het Betoverde Kabinet.</string>
-  <string name="armoireNotesEmpty">Het Kabinet zal nieuwe stukken uitrusting hebben tijdens de eerste week van elke maand. Blijf tot die tijd klikken voor ervaring en voedsel!</string>
-  <string name="sell">Verkoop (%d Goud)</string>
+    <string name="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="hatch_egg">Laten uitkomen met ei</string>
   <string name="invite_party">Nodig groep uit</string>
   <string name="dialog_feeding">Voeder %s met:</string>
   <string name="use_animal">Gebruik</string>
@@ -305,17 +237,8 @@
   <string name="close">Sluiten</string>
   <string name="share">Delen</string>
   <string name="notification_pet_fed">Je hebt je %s gevoederd!</string>
-  <string name="notification_purchase">Je hebt %s gekocht</string>
-  <string name="notification_purchase_reward">Je hebt een beloning gekocht</string>
-  <string name="sectiondrop">Standaard</string>
-  <string name="sectionpremium">Toverdrankje</string>
-  <string name="sectionquest">Queeste</string>
-  <string name="sectionspecial">Zeldzaam</string>
-  <string name="sectionmounts">Standaard</string>
-  <string name="sectionpremiumMounts">Magisch Drankje</string>
-  <string name="sectionquestMounts">Queeste</string>
-  <string name="sectionspecialMounts">Zeldzaam</string>
-  <string name="world_quest">Wereldqueeste</string>
+    <string name="notification_purchase_reward">Je hebt een beloning gekocht</string>
+    <string name="world_quest">Wereldqueeste</string>
   <string name="inn_description">Een pauze nodig? Check in bij Daniels Herberg om een paar van Habitica\'s moeilijkere spelmechanismen te pauzeren:\n\n
 • Gemiste dagelijkse taken zullen je niet beschadigen
 • Taken zullen geen streaks verliezen of vervallen in kleur
@@ -334,8 +257,7 @@
   <string name="healer_description">Helers staan onaangedaan tegenover schade en kunnen die bescherming tot anderen uitstrekken. Gemiste Dagelijkse Taken en slechte Gewoontes doen hen niet veel, en ze hebben hun manieren om er terug bovenop te raken na pech. Speel een Heler als je het leuk vindt om anderen in je Groep te helpen of als het idee om de Dood door hard werk te slim af te zijn jou inspireert!</string>
   <string name="select_class">Selecteer Klasse</string>
   <string name="opt_out_class">Afmelden</string>
-  <string name="opt_out_description">Vind je het klassesysteem te ingewikkeld voor nu? Wil je later pas kiezen? Trek je terug - je zal een krijger zijn zonder speciale talenten. Je kan later nog over het klassesysteem lezen op de wiki en op eender welk moment klassen inschakelen.</string>
-  <string name="class_confirmation">Weet je zeker dat je een %s wilt zijn?</string>
+    <string name="class_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 een nieuwe standaard gevechtsuitrusting die je kan veranderen onder Uitrusting!</string>
   <string name="choose_class">Kies een Klasse</string>
@@ -349,23 +271,18 @@
   <string name="invite_existing_users">Bestaande Gebruikers Uitnodigen</string>
   <string name="send">Versturen</string>
   <string name="invite">Vrienden uitnodigen</string>
-  <string name="invite_id_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun Gebruikers-ID.</string>
-  <string name="invite_username_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun gebruikersnaam.</string>
+    <string name="invite_username_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun gebruikersnaam.</string>
   <string name="invite_email_description">Als een vriend zich inschrijft op Habitica via jouw email, zullen ze automatisch uitgenodigd worden voor jouw groep!</string>
   <string name="add_invites">Uitnodigingen toevoegen</string>
-  <string name="user_id">Gebruikers ID</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Nodig uit voor groep</string>
-  <string name="share_using">Deel door</string>
+    <string name="email">Email</string>
+    <string name="share_using">Deel door</string>
   <string name="share_levelup">Ik ben in Habitica tot niveau %d gekomen door mijn gewoontes in het echte leven 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 rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
   <string name="open_in_store">Open in de play store</string>
   <string name="change_class_confirmation">Weet je zeker dat je van klasse wilt veranderen? Dit kost 3 edelstenen.</string>
   <string name="change_class_equipment_warning">Waarschuwing: Je zult niet langer in staat zijn om uitrusting te kopen van de %s klasse.</string>
-  <string name="leaderMessage">Bericht van %1$s</string>
-  <string name="leaderName">Leider: %1$s</string>
-  <string name="confirm">Bevestig</string>
+    <string name="confirm">Bevestig</string>
   <string name="market">Markt</string>
   <string name="timeTravelers">Tijdreizigers</string>
   <string name="seasonalShop">Seizoenswinkel</string>
@@ -373,37 +290,16 @@
   <string name="party_invite">Ontgrendel door vrienden uit te nodigen</string>
   <string name="login_incentive">Speel vrij door regelmatig in te loggen bij Habitica</string>
   <string name="create_account">Speel vrij door een account aan te maken</string>
-  <string name="no_gold">Niet genoeg goud</string>
-  <string name="no_potion">Je hoeft geen gezondheidsdrankje te kopen</string>
-  <string name="successful_purchase">%1$s gekocht</string>
-  <string name="purchase_confirmation_title">Bevestig aankoop</string>
-  <string name="confirm_purchase_text">Koop %1$s voor %2$s %3$s</string>
-  <string name="gem">edelsteen</string>
-  <string name="hourglass">zandloper</string>
-  <string name="hourglasses">zandlopers</string>
-  <string name="gold_singular">goud</string>
-  <string name="gold_plural">goud</string>
+    <string name="successful_purchase">%1$s gekocht</string>
+    <string name="gold_plural">goud</string>
   <string name="chat_message_copied">Bericht gekopieerd naar klembord</string>
-  <string name="copy_chat_message">Kopieer naar klembord</string>
-  <string name="edit_tag_title">Bewerk label</string>
-  <string name="edit_tag_btn_edit">Bewerk</string>
-  <string name="edit_tag_btn_done">Klaar</string>
-  <string name="edit_tag_btn_delete">Verwijder</string>
-  <string name="confirm_delete_tag_title">Weet je het zeker?</string>
+    <string name="edit_tag_btn_edit">Bewerk</string>
+    <string name="confirm_delete_tag_title">Weet je het zeker?</string>
   <string name="confirm_delete_tag_message">Wil je het echt verwijderen?</string>
-  <string name="filter_drawer_edit_tags">Bewerk labels</string>
-  <string name="filter_drawer_filter_tags">Filter op labels</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laat iemand je uitnodigen met deze QR code</string>
-  <string name="qr_save_message">QR-code opgeslagen in</string>
-  <string name="qr_dialogue_title">Je QR-code</string>
-  <string name="download">Installeer</string>
-  <string name="send_new_message">Stuur nieuw bericht</string>
-  <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
+    <!--QR Strings-->
+    <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="invited_to_party">Je bent uitgenodigd voor een groep!</string>
   <string name="stats_widget_label">Habitica-statistieken</string>
   <string name="add_task">Voeg taak toe</string>
   <string name="add_habit">Voeg Gewoonte toe</string>
@@ -414,15 +310,14 @@
   <string name="widget_habit_button">Habitica Doe Gewoonte</string>
   <string name="widget_dailies">Habitica Dagelijkse taken</string>
   <string name="widget_todo_list">Habitica to-do lijst</string>
-  <string name="widget_add_task">Habitica Voeg taak toe</string>
-  <string name="google_services_missing">Google play diensten niet gevonden.</string>
-  <string name="gem.purchase.toolbartitle">Kopen</string>
-  <string name="gem.purchase.title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
-  <string name="gem.purchase.subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
-  <string name="gem.purchase.listitem1">Gave kostuums voor je avatar</string>
-  <string name="gem.purchase.listitem2">Gave achtergronden</string>
-  <string name="gem.purchase.listitem3">Queesten die je belonen met huisdiereieren</string>
-  <string name="gem.purchase.listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
+    <string name="google_services_missing">Google play diensten niet gevonden.</string>
+  <string name="gem_purchase_toolbartitle">Kopen</string>
+  <string name="gem_purchase_title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="gem_purchase_subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
+  <string name="gem_purchase_listitem1">Gave kostuums voor je avatar</string>
+  <string name="gem_purchase_listitem2">Gave achtergronden</string>
+  <string name="gem_purchase_listitem3">Queesten die je belonen met huisdiereieren</string>
+  <string name="gem_purchase_listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
   <string name="support_habitica">Steun Habitica</string>
   <string name="skill_transformation_use">gebruik</string>
   <string name="hatching_market_info">Krijg je niet de goede drops? Neem een kijkje op de Markt!</string>
@@ -436,32 +331,32 @@
   <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 het nemen van een abonnement steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="subscribe_title">Met het nemen van een abonnement steun je de ontwikkelaars en help je Habitica online te houden</string>
   <string name="subscribe_prompt">Word 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 vondstlimiet verdubbeld</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 vondstlimiet verdubbeld</string>
   <string name="subscriptions">Abonnementen</string>
   <string name="subscription_duration">Keert iedere %s terug</string>
   <string name="subscription_duration_norenew">Voor %s</string>
   <string name="subscribe">Abonneer</string>
-  <string name="subscribe.listitem1.description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
-  <string name="subscribe.listitem2.description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
-  <string name="subscribe.listitem3.description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
-  <string name="subscribe.listitem4.description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
-  <string name="subscribe1month.gemcap">25 Edelsteen drempel</string>
-  <string name="subscribe3month.gemcap">30 Edelsteen drempel</string>
-  <string name="subscribe6month.gemcap">35 Edelsteen drempel</string>
-  <string name="subscribe12month.gemcap">45 Edelsteen drempel</string>
+  <string name="subscribe_listitem1_description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
+  <string name="subscribe_listitem2_description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
+  <string name="subscribe_listitem3_description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
+  <string name="subscribe_listitem4_description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
+  <string name="subscribe1month_gemcap">25 Edelsteen drempel</string>
+  <string name="subscribe3month_gemcap">30 Edelsteen drempel</string>
+  <string name="subscribe6month_gemcap">35 Edelsteen drempel</string>
+  <string name="subscribe12month_gemcap">45 Edelsteen drempel</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="due">Tegen</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 stopzetten. Klik op de knop hieronder om de site in je browser te openen!</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 stopzetten. 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>
@@ -476,56 +371,40 @@
   <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">Abonnementstatus</string>
-  <string name="byLeader">door %s</string>
-  <string name="challenge_details">Uitdagingsdetails</string>
-  <string name="challenge_leave_title">Verlaat uitdaging</string>
+    <string name="challenge_leave_title">Verlaat uitdaging</string>
   <string name="challenge_leave_text">Weet je zeker dat je de uitdaging \"%s\" wilt verlaten?</string>
   <string name="challenge_remove_tasks_title">Verwijder taken</string>
   <string name="challenge_remove_tasks_text">Wil je de taken verwijderen?</string>
   <string name="remove_tasks">Verwijderen</string>
   <string name="keep_tasks">Houden</string>
   <string name="my_challenges">Mijn uitdagingen</string>
-  <string name="public_challenges">Openbaar</string>
-  <string name="challenges">Uitdagingen</string>
-  <string name="daily">Dagelijkse taak</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="challenge">Uitdaging</string>
+    <string name="not_part_of_a_challenge">Je maakt geen deel uit van uitdagingen op dit moment!</string>
   <string name="join_a_challenge">Doe mee aan een uitdaging om een samengestelde set van taken aan je list toe te voegen en neem het op tegen andere Habiticanen om prestaties en zelfs edelstenen te winnen!</string>
   <string name="check_the_public_challenge_tab">Tik op de \"Publiek\" tab om speler-gemaakte uitdagingen te vinden die het best bij jou passen!</string>
-  <string name="add_reminder">Voeg herinnering toe</string>
-  <string name="warning">Waarschuwing</string>
-  <string name="open_settings">Open instellingen</string>
-  <string name="dont_keep_activities_warning">Het lijkt erop dat je de ontwikkelaarsoptie \\"Hou geen activiteiten bij\\" aan hebt staan. Momenteel zorgt deze optie voor problemen met de habitica app, dus raden we je aan het uit te zetten.</string>
-  <string name="inbox">Berichten</string>
-  <string name="FAQ">Veel gestelde vragen</string>
-  <string name="special">Speciaal</string>
+    <string name="inbox">Berichten</string>
+    <string name="special">Speciaal</string>
   <string name="gem_for_gold_description">Omdat je geabonneerd bent op 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="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 vindt %s!</string>
-  <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
+    <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Je volgende prijs wordt vrijgespeeld na %1$d check-ins.</string>
   <string name="pending_approval">wachten op goedkeuring</string>
   <string name="filters">Filters</string>
   <string name="done">Klaar</string>
-  <string name="group_tasks_edit_description">Groepstaken kunnen niet bewerkt worden.</string>
-  <string name="group_tasks_edit_title">Kan deze taak niet bewerken</string>
-  <string name="groups">Groepen</string>
+    <string name="groups">Groepen</string>
   <string name="all">Alle</string>
   <string name="none">Geen</string>
   <string name="owned">Van jou</string>
   <string name="not_owned">Niet van jou</string>
-  <string name="new_game">Nieuw\nSpel</string>
-  <string name="login_btn_fb">Aanmelden met Facebook</string>
+    <string name="login_btn_fb">Aanmelden met Facebook</string>
   <string name="login_btn_google">Aanmelden met Google</string>
   <string name="action_back">Terug</string>
   <string name="randomize">Willekeurig</string>
@@ -556,7 +435,6 @@
   <string name="reload_content">Inhoud herladen</string>
   <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
   <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
-  <string name="repeat_summary">Herhaalt %1$s elke %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Je apparaat heeft geen van de ondersteunde betaalmethodes. Gebruik alsjeblieft de Habitica-website als je edelstenen wilt kopen.</string>
   <string name="no_billing_subscriptions">Je apparaat heeft geen van de ondersteunde betaalmethodes. Gebruik alsjeblieft de Habitica-website als je een abonnement wilt kopen.</string>
   <string name="save">Opslaan</string>
@@ -564,8 +442,7 @@
   <string name="gem_reward">Edelsteen beloning</string>
   <string name="tasks">Taken</string>
   <string name="create_challenge">Maak een Uitdaging</string>
-  <string name="edit_challenge">Bewerk</string>
-  <string name="challenge_create_error_tavern_one_gem">Je hebt minstens 1 edelsteen nodig om een openbare uitdaging te maken.</string>
+    <string name="challenge_create_error_tavern_one_gem">Je hebt minstens 1 edelsteen nodig om een openbare uitdaging te maken.</string>
   <string name="challenge_create_error_enough_gems">Je hebt niet genoeg edelstenen om een uitdaging te maken.</string>
   <string name="identify_your_challenge_with_a_tag">Identificeer je uitdaging met een korte naam</string>
   <string name="challenge_create_error_tag">Je hebt een korte naam nodig om deze uitdaging te maken.</string>
@@ -575,42 +452,36 @@
   <string name="new_challenge_title">Nieuwe titel voor uitdaging</string>
   <string name="ownership">Eigenaarschap</string>
   <string name="inn">Herberg</string>
-  <string name="system">Systeem</string>
-  <string name="start_quest">Begin aan een nieuwe Queeste</string>
+    <string name="start_quest">Begin aan een nieuwe Queeste</string>
   <string name="leave_party">Verlaat Groep</string>
   <string name="party_description">Groepsbeschrijving</string>
-  <string name="abort_confirmation">Weet je zeker dat je deze queeste wilt annuleren? Hij zal voor iedereen in je groep worden geannuleerd en alle voortgang zal verloren gaan. De queeste-perkamentrol zal teruggegeven worden aan de eigenaar van de queeste.</string>
-  <string name="leave_quest_confirmation">Weet je zeker dat je de actieve queeste wilt verlaten? Al je voortgang in de queeste zal verloren gaan.</string>
-  <string name="number_participants">%1$d Deelnemers</string>
+    <string name="number_participants">%1$d Deelnemers</string>
   <string name="welcome_back">Welkom terug</string>
   <string name="yesterdaililes_prompt">Heb je gisteren één van deze Dagelijkse taken voltooid?</string>
   <string name="start_day">Begin mijn dag</string>
   <string name="leave_party_confirmation">Weet je zeker dat je de groep wilt verlaten?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Volgende prijs in %d check-ins</string>
-  <string name="pending">In afwachting</string>
+    <string name="pending">In afwachting</string>
   <string name="accepted">Geaccepteerd</string>
   <string name="declined">Afgewezen</string>
   <string name="participants">Deelnemers</string>
   <string name="invitations">Uitnodigingen</string>
-  <string name="quest_leader_header" formatted="false">Begonnen door %s</string>
+  <string name="quest_leader_header">Begonnen door %s</string>
   <string name="quest_abort_message">Weet je zeker dat je deze missie wilt stoppen? Hij zal worden gestopt voor iedereen in je groep en alle vooruitgang raakt verloren. De queesterol wordt terug gegeven aan de eigenaar van de queeste.</string>
-  <string name="loading">Aan het laden...</string>
-  <string name="reloading_content">Inhoud opnieuw aan het laden</string>
+    <string name="reloading_content">Inhoud opnieuw aan het laden</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mln.</string>
   <string name="billion_abbrev">mld.</string>
-  <string name="your_balance">Jouw balans:</string>
-  <string name="available_until" formatted="false">Verkrijgbaar tot %s</string>
-  <string name="gems_left_max" formatted="false">Maandelijkse edelstenen: %1$d/%2$d Resterend</string>
-  <string name="gems_left_nomax" formatted="false">Maandelijkse edelstenen: %d Resterend</string>
+    <string name="available_until">Verkrijgbaar tot %s</string>
+  <string name="gems_left_max">Maandelijkse edelstenen: %1$d/%2$d Resterend</string>
+  <string name="gems_left_nomax">Maandelijkse edelstenen: %d Resterend</string>
   <string name="health">Gezondheid</string>
   <string name="collect">Verzamel</string>
   <string name="rage_meter">Furie meter</string>
   <string name="boss_quest">Baas Queeste</string>
   <string name="collection_quest">Verzamel Queeste</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%dErvaringspunten</string>
-  <string name="gold_reward" formatted="false">%d Goud</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%dErvaringspunten</string>
+  <string name="gold_reward">%d Goud</string>
   <string name="quest_owner_rewards">Queeste Eigenaar Beloningen</string>
   <string name="str_abbrv">KRA</string>
   <string name="per_abbrv">PER</string>
@@ -623,8 +494,7 @@
   <string name="reset_account_confirmation">mijn account resetten</string>
   <string name="delete_account_confirmation">verwijder mijn account</string>
   <string name="danger_zone">Gevarenzone</string>
-  <string name="nevermind">Laat maar</string>
-  <string name="resetting_account">Account aan het resetten</string>
+    <string name="resetting_account">Account aan het resetten</string>
   <string name="deleting_account">Account Verwijderen</string>
   <string name="insufficientGold">Je moet meer taken voltooien voordat je dit voorwerp kunt aanschaffen!</string>
   <string name="insufficientGems">Je hebt meer Edelstenen nodig om dit voorwerp te kopen!</string>
@@ -657,8 +527,7 @@
   <string name="authentication_summary">Pas je authenticatieopties aan.</string>
   <string name="change_password">Pas je wachtwoord aan.</string>
   <string name="change_email">Pas je e-mail adres aan</string>
-  <string name="change_login_name">Pas je Inlognaam aan</string>
-  <string name="change_username">Pas je Gebruikersnaam aan</string>
+    <string name="change_username">Pas je Gebruikersnaam aan</string>
   <string name="change">Verander</string>
   <string name="character_level">Niveau Personage</string>
   <string name="auto_allocate_points">Automatisch Punten Toewijzen</string>
@@ -679,7 +548,7 @@
   <string name="distribute_class">Verdeling baseren op klasse</string>
   <string name="distribute_task">Verdelen op basis van activiteit van taken</string>
   <string name="no_points_to_allocate">Geen punten toe te wijzen</string>
-  <string name="points_to_allocate" formatted="false">%dpunten toe te wijzen</string>
+  <string name="points_to_allocate">%dpunten toe te wijzen</string>
   <string name="distribute_evenly_help">Wijst hetzelfde aantal punten toe aan elke eigenschap</string>
   <string name="distribute_class_help">Wijst meer punten toe aan de eigenschappen die belangrijk zijn voor jou Klasse.</string>
   <string name="distribute_task_help">Wijst punten toe op basis van de categorieën van Kracht, Intelligentie, Lichaam en Perceptie  die verbonden zijn aan de taken die je voltooit.</string>
@@ -689,9 +558,7 @@
   <string name="classless">Klasseloos</string>
   <string name="class_equipment_shop_dialog">Dit voorwerp is enkel beschikbaar voor een specifieke klasse.\n Je kunt van klasse veranderen bij je Instellingen.</string>
   <string name="class_gear_disclaimer">Je kunt enkel uitrusting kopen voor je huidige klasse</string>
-  <string name="available_stats" formatted="false">%d punten</string>
-  <string name="toogle_emojis">Emojis aan- en uit zetten</string>
-  <string name="tavern_description">Welkom in de Herberg! Kom erbij zitten om te praten of neem een pauze van je taken.</string>
+    <string name="tavern_description">Welkom in de Herberg! Kom erbij zitten om te praten of neem een pauze van je taken.</string>
   <string name="check_into_inn">Check in bij de Herberg</string>
   <string name="community_guidelines">gemeenschapsrichtlijnen</string>
   <string name="view_community_guidelines">Bekijk de gemeenschapsrichtlijnen</string>
@@ -705,19 +572,13 @@
   <string name="navigation_drawer_open">Open navigatie lade</string>
   <string name="navigation_drawer_close">Sluit navigatie lade</string>
   <string name="world_boss">Wereldbaas</string>
-  <string name="world_boss_art">Baas-illustratie</string>
-  <string name="boss_art">Baas Kunst</string>
+    <string name="boss_art">Baas Kunst</string>
   <string name="world_boss_description">Wereldbaas beschrijving</string>
-  <string name="rage_strike_count" formatted="false">Woede Aanvallen: %d/%d</string>
-  <string name="pending_strike_description">Deze aanval is nog niet gebeurd!\nDe Wereldbaas zal een van de vriendelijke winkeliers aanvliegen wanneer de woedebalk opvult. Houd je dagelijkse taken bij en probeer dit te vermijden!</string>
-  <string name="pending_strike_title">Inkomende Aanval</string>
+  <string name="rage_strike_count">Woede Aanvallen: %d/%d</string>
+    <string name="pending_strike_title">Inkomende Aanval</string>
   <string name="strike_description_title">Wat is een Woede Aanval?</string>
-  <string name="strike_description_subtitle">Er zijn 3 potentiële Woede Aanvallen</string>
-  <string name="strike_description_description">De meter vult wanneer een Habitican zijn dagelijkse taken mist. Als deze compleet gevuld is, zal de DysHeartener zijn Verbrijzelende Liefdesverdriet op een van Habitica\'s winkeliers loslaten, dus zorg ervoor dat je taken gedaan worden!</string>
-  <string name="pending_strike_subtitle">Deze Aanval is nog niet gebeurd!</string>
-  <string name="strike_active_title" formatted="false">De %s werd aangevallen!</string>
-  <string name="strike_active_subtitle" formatted="false">%s\'s hart is gebroken!</string>
-  <string name="strike_active_description" formatted="false">Onze dierbare %s was verwoest toen de %s de %s verbrijzelde. Pak snel je taken aan om het monster te verslaan en te helpen herbouwen!</string>
+    <string name="strike_active_title">De %s werd aangevallen!</string>
+    <string name="strike_active_description">Onze dierbare %s was verwoest toen de %s de %s verbrijzelde. Pak snel je taken aan om het monster te verslaan en te helpen herbouwen!</string>
   <string name="questShop">Queestenwinkel</string>
   <string name="market_owner_long">Alex de Handelaar</string>
   <string name="tavern_owner_long">Daniel de herbergier</string>
@@ -727,29 +588,21 @@
   <string name="no_party_description">Ga op queesten met vrienden of met jezelf. Vecht met monsters, creëer Uitdagingen en help jezelf om verantwoordelijk te blijven met behulp van Gezelschappen.   </string>
   <string name="no_party_title">Speel Habitica in een groep</string>
   <string name="join_party_description">Geef een groepslid jouw gebruikersnaam die hieronder te vinden is en dan kunnen ze jou uitnodigen</string>
-  <string name="join_party_description_id">Geef hen jouw gebruikers-ID of laat hen jouw QR-code scannen om je uit te nodigen.</string>
-  <string name="join_party_title">Wil je deelnemen aan een gezelschap?</string>
-  <string name="create_party_website">Open de website om een groep aan te maken</string>
-  <string name="id_copied">ID naar klembord gekopieerd</string>
-  <string name="insufficientSubscriberGems">Je hebt alle Edelstenen die je deze maand kan kopen al gekocht. Meer Edelstenen worden beschikbaar binnen de eerste drie dagen van elke maand. Bedankt om geabonneerd te zijn!</string>
-  <string name="insufficientSubscriberGemsTitle">Maandelijkse Maximum Edelstenen Bereikt</string>
-  <string name="chat_message">Chatbericht</string>
-  <string name="world_boss_description_title">Wat is een Wereldbaas?</string>
-  <string name="world_boss_description_description">Een Wereldbaas is een speciaal evenement waarbij de hele gemeenschap samenwerkt om een machtig monster neer te halen met hun taken!\nVoltooi taken om de Baas te beschadigen\nDe Baas doet geen schade voor gemiste taken, maar zijn Woedebalk gaat omhoog. Als de balk gevuld raakt, dan valt de Baas één van de winkeliers aan!\nJe kan gewoon doorgaan met normale Queeste Bazen,  schade geldt voor beide\.Check de Herberg om de vooruitgang van de Baas en zijn woede aanvallen te zien</string>
-  <string name="world_boss_description_intro">Een Wereldbaas is een speciaal evenement waarbij de hele gemeenschap samenwerkt om een krachtig monster met hun taken te verslaan!</string>
+    <string name="join_party_title">Wil je deelnemen aan een gezelschap?</string>
+    <string name="insufficientSubscriberGems">Je hebt alle Edelstenen die je deze maand kan kopen al gekocht. Meer Edelstenen worden beschikbaar binnen de eerste drie dagen van elke maand. Bedankt om geabonneerd te zijn!</string>
+    <string name="world_boss_description_title">Wat is een Wereldbaas?</string>
+    <string name="world_boss_description_intro">Een Wereldbaas is een speciaal evenement waarbij de hele gemeenschap samenwerkt om een krachtig monster met hun taken te verslaan!</string>
   <string name="world_boss_description_1">Volbreng taken om de Baas te beschadigen</string>
   <string name="world_boss_description_2">Deze Baas zal jou niet schaden voor gemiste taken, maar zal zijn Woedemeter Omhoog doen gaan. Als deze vol is, zal de Baas één van onze winkeliers aanvallen!</string>
   <string name="world_boss_description_3">Je kan verdergaan met normale Queeste-Bazen, jouw schade zal voor beiden tellen.</string>
   <string name="world_boss_description_4">Check de Herberg om de vooruitgang en Woedeaanvallen van de Baas te zien.</string>
-  <string name="world_boss_action_prompt" formatted="false">Versla de Baas om speciale beloningen te ontvangen en red Habitica van %s\'s terreur!</string>
-  <string name="world_boss_description_subtitle">%s valt aan!</string>
-  <string name="questShop_owner_long">Ian de queeste-gids</string>
+  <string name="world_boss_action_prompt">Versla de Baas om speciale beloningen te ontvangen en red Habitica van %s\'s terreur!</string>
+    <string name="questShop_owner_long">Ian de queeste-gids</string>
   <string name="seasonalShop_owner_long">Seizoenstovenares</string>
   <string name="rage_attack">Woedeaanval</string>
   <string name="tavern_description_world_boss">Oh jee, schenk geen aandacht aan het monster hier beneden — dit blijft een veilige plaats om te chatten tijdens je pauzes.</string>
   <string name="report">rapporteer</string>
-  <string name="like">Vind ik leuk</string>
-  <string name="reply">Reageer</string>
+    <string name="reply">Reageer</string>
   <string name="challenge_prize">Uitdaging Prijs</string>
   <string name="challenge_categories">Uitdaging Categorieën</string>
   <string name="created_challenge">Gemaakte uitdaging</string>
@@ -780,15 +633,13 @@
   <string name="total_checkins">Totaal aantal Check-ins</string>
   <string name="two_handed">Tweehandig</string>
   <string name="usernamePromptTitle">Het is tijd om een gebruikersnaam te kiezen</string>
-  <string name="usernamePromptWiki">Als je meer te weten wil komen over deze verandering, <a href="https://habitica.wikia.com/wiki/Player_Names">bezoek onze wiki.</a></string>
-  <string name="confirmUsername">Bevestig gebruikersnaam</string>
-  <string name="confirm_username_title">Weet je zeker dat je jou huidige gebruikersnaam wilt bevestigen?</string>
+  <string name="usernamePromptWiki">Als je meer te weten wil komen over deze verandering, <a href="https://habitica.wikia_com/wiki/Player_Names">bezoek onze wiki.</a></string>
+    <string name="confirm_username_title">Weet je zeker dat je jou huidige gebruikersnaam wilt bevestigen?</string>
   <string name="cancel">Annuleren</string>
   <string name="confirm_username">Bevestig gebruikersnaam</string>
   <string name="username_not_confirmed">Gebruikersnaam niet bevestigd</string>
   <string name="username_confirmed">gebruikersnaam bevestigt</string>
-  <string name="username_level">\@%s ・niv %d</string>
-  <string name="enter_recipient_username">Voer een ontvanger in @gebruikersnaam</string>
+    <string name="enter_recipient_username">Voer een ontvanger in @gebruikersnaam</string>
   <string name="username_copied">Gebruikersnaam gekopieerd naar het prikbord</string>
   <string name="display_name_length_error">Gebruikersnamen moeten tussen 1 en 30 karakters lang zijn</string>
   <string name="setup_task_join_habitica">Sluit je aan bij Habitica (Aanvinken)</string>
diff --git a/Habitica/res/values-no/strings.xml b/Habitica/res/values-no/strings.xml
new file mode 100755
index 000000000..08fe36347
--- /dev/null
+++ b/Habitica/res/values-no/strings.xml
@@ -0,0 +1,613 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Oppdater</string>
+  <string name="XP_default">Erfaring</string>
+  <string name="HP_default">Helsepoeng</string>
+  <string name="MP_default">Magipoeng</string>
+  <string name="ERR_pb_barcode">Preferanser kunne ikke lastes inn fra strekkoden</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Innstillinger</string>
+  <string name="SP_address_hint">Din egendefinerte server</string>
+  <string name="SP_userID_title">Bruker ID</string>
+  <string name="SP_userID_summary">Din Bruker ID</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Din API Token</string>
+  <string name="Language_title">Språk</string>
+  <string name="Language_summary">Endre Habiticas språk</string>
+  <string name="SP_user_qr_code">Din QR Kode</string>
+  <string name="PS_contact_title">Kontakt meg</string>
+  <string name="unknown_error">En feil oppstod...</string>
+  <string name="pref_account_header">Bruker</string>
+  <string name="pref_first_day_of_the_week_title">Første dag i uken</string>
+  <string name="pref_first_day_of_the_week_summary">Første dag i uken i alle kalendere</string>
+  <string name="pref_reminder_header">Daglig påminnelse</string>
+  <string name="pref_reminder_checkbox">Aktiver Påminnelse</string>
+  <string name="pref_reminder_picker">Sett Tid For Påminnelse</string>
+  <string name="pref_cds_header">Egendefinert Starten På Dagen</string>
+  <string name="pref_cds_picker">Sett En Egendefinert Start På Dagen</string>
+  <string name="pref_push_notifications_checkbox">Bruker Push-Varslinger</string>
+  <string name="push_notifications">Push-Varslinger</string>
+  <string name="push_notifications_sum">Sett dine instillinger for push-varslinger</string>
+  <string name="preference_push_you_won_challenge">Du vant en utfordring!</string>
+  <string name="preference_push_received_a_private_message">Mottatt en Privat Melding</string>
+  <string name="preference_push_gifted_gems">Mottatte Juveler</string>
+  <string name="preference_push_gifted_subscription">Mottatt Abonnoment</string>
+  <string name="preference_push_invited_to_party">Invitert til en Klan</string>
+  <string name="preference_push_invited_to_guild">Invitert til et Laug</string>
+  <string name="preference_push_your_quest_has_begun">Ditt Oppdrag har Begynt</string>
+  <string name="preference_push_invited_to_quest">Invitert til et Oppdrag</string>
+  <!--Adding tasks-->
+  <string name="task_value">Verdi</string>
+  <string name="new_todo">Nytt Gjøremål</string>
+  <string name="new_reward">Ny Belønning</string>
+  <string name="new_daily">Nytt Daglig Gjøremål</string>
+  <string name="new_habit">Ny Vane</string>
+  <string name="action_edit">Rediger</string>
+  <string name="action_delete">Slett</string>
+  <string name="action_cancel">Avbryt</string>
+  <string name="login_btn">Logg inn</string>
+  <string name="register_btn">Registrer deg</string>
+  <string name="username">Brukernavn</string>
+  <string name="email_username">Epost eller Brukernavn</string>
+  <string name="password">Passord</string>
+  <string name="emailAddress">Epost adresse</string>
+  <string name="confirmpassword">Bekreft passord</string>
+  <string name="logout">Logg ut</string>
+  <string name="logout_description">Logg ut av din brukerkonto</string>
+  <string name="account_details">Brukerdetaljer</string>
+  <string name="LoginActivityName">Velkommen</string>
+  <string name="string_revive">Gjennoppliv</string>
+  <string name="please_connect">Vær så snill å koble gjennom applikasjonen før du bruker en widget</string>
+  <string name="about.title">Om</string>
+  <string name="about.libraries">Biblioteker</string>
+  <string name="about.versionhistory">Tidligere versjoner</string>
+  <string name="about.habitica_open_source">Habitica er tilgjengelig som et åpen-kilde program på Github</string>
+  <string name="about.rate_our_app">Ranger appen vår</string>
+  <string name="about.give_us_feedback">Send oss Tilbakemeldinger!</string>
+  <string name="about.bugreport">Rapporter en Feil</string>
+  <string name="about.source_code">Kildekode</string>
+  <string name="repeatEvery">Gjentas Hver</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Tilknytningsfeil</string>
+  <string name="network_error_no_network_body">Du er ikke koblet til internett.</string>
+  <string name="internal_error_api">Det ser ut som om det er et problem med serveren. Prøv igjen senere.</string>
+  <string name="authentication_error_title">Autentiseringsfeil</string>
+  <string name="authentication_error_body">Ditt Brukernavn og/eller Passord er feil</string>
+  <string name="login_validation_error_title">Verifiseringsfeil</string>
+  <string name="login_validation_error_fieldsmissing">Du må fylle ut alle feltene.</string>
+  <string name="save_changes">Lagre</string>
+  <string name="copy">Kopier</string>
+  <string name="notes">Notater</string>
+  <string name="text">Tekst</string>
+  <string name="difficulty">Vanskelighetsgrad</string>
+  <string name="tags">Merkelapper</string>
+  <string name="trivial">Triviell</string>
+  <string name="easy">Lett</string>
+  <string name="medium">Middels</string>
+  <string name="hard">Vanskelig</string>
+  <string name="start_date">Startdato</string>
+  <string name="positive_habit_form">Positiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Sjekkliste</string>
+  <string name="reminders">Påminnelser</string>
+  <string name="actions">Handlinger</string>
+  <string name="attributes">Egenskaper</string>
+  <string name="physical">Styrke</string>
+  <string name="mental">Visdom</string>
+  <string name="frequency">Frekvens</string>
+  <string name="frequency_weekly">På Speifikke Dager i Uka</string>
+  <string name="frequency_daily">Hver X Dag</string>
+  <string name="repeatables_summary_title">Oppsummering</string>
+  <string name="repeatables_title">Gjentagelser</string>
+  <string name="repeatables_on_title">Gjentas På</string>
+  <string name="repeatables_frequency_daily">Daglig</string>
+  <string name="repeatables_frequency_weekly">Ukentlig</string>
+  <string name="repeatables_frequency_monthly">Månedlig</string>
+  <string name="repeatables_frequency_yearly">Årlig</string>
+  <string name="repeatables_frequency_day_of_month">Dag i Måneden</string>
+  <string name="repeatables_frequency_day_of_week">Dag i Uka</string>
+  <string name="monday">Mandag</string>
+  <string name="tuesday">Tirsdag</string>
+  <string name="wednesday">Onsdag</string>
+  <string name="thursday">Torsdag</string>
+  <string name="friday">Fredag</string>
+  <string name="saturday">Lørdag</string>
+  <string name="sunday">Søndag</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Ikke fortvil!</string>
+  <string name="faint_header">Du gikk tom for Helsepoeng!</string>
+  <string name="faint_button">Fyll på Helse amp; Prøv Igjen</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Profilbilde</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Du brukte %1$s for %2$d magipoeng.</string>
+  <string name="used_skill_without_mana">Du brukte %1$s.</string>
+  <string name="new_checklist_item">Nytt punkt i sjekkliste</string>
+  <string name="add_checklist_item">Legg til</string>
+  <string name="skill_progress_title">Bruker Ferdighet</string>
+  <string name="coming_soon">Kommer Snart</string>
+  <string name="chat_flag_confirmation">Er du sikker på at du vil rapportere denne meldingen for overtredelse?</string>
+  <string name="flag_confirm">Flagg Melding</string>
+  <string name="unlock_lvl_11">Låses opp i Nivå 11</string>
+  <string name="no_party_message">Du er ikke i en klan. For å bli med i en klan, besøk nettsiden.</string>
+  <string name="forgot_pw_btn">Glemt Passord</string>
+  <string name="tavern.inn.checkOut">Reaktiver dine Daglige Gjøremål</string>
+  <string name="tavern.inn.rest">Pause dine Daglige Gjøremål</string>
+  <string name="reward.dialog.buy">Kjøp</string>
+  <string name="reward.dialog.dismiss">Avvis</string>
+  <string name="party">Klan</string>
+  <string name="chat">Chat</string>
+  <string name="members">Medlemmer</string>
+  <string name="habits">Vaner</string>
+  <string name="dailies">Daglige Gjøremål</string>
+  <string name="todos">Gjøremål</string>
+  <string name="rewards">Belønninger</string>
+  <string name="taskform.delete.title">Er du sikker?</string>
+  <string name="taskform.delete.message">Vil du virkelig slette?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nei</string>
+  <string name="quest">Oppdrag</string>
+  <string name="avatar_body">Kropp</string>
+  <string name="avatar_hair">Hår</string>
+  <string name="avatar_shirt">Skjorte</string>
+  <string name="avatar_skin">Hud</string>
+  <string name="avatar_ears">Dyreører</string>
+  <string name="avatar_base">Grunn</string>
+  <string name="avatar_color">Farge</string>
+  <string name="avatar_beard">Skjegg</string>
+  <string name="avatar_mustache">Bart</string>
+  <string name="avatar_flower">Blomst</string>
+  <string name="avatar_bangs">Pannelugg</string>
+  <string name="avatar_nothing">Ingenting satt</string>
+  <string name="avatar_size">Størrelse</string>
+  <string name="avatar_size_slim">Tynn</string>
+  <string name="avatar_size_broad">Bred</string>
+  <string name="avatar_background">Bakgrunn</string>
+  <string name="purchase_customization">Kjøp Tilpasning</string>
+  <string name="purchase_set_button">Lås opp sett for %d Juveler</string>
+  <string name="purchase_button">Kjøp</string>
+  <string name="purchase_set_title">Kjøp sett %s</string>
+  <string name="due_date">Forfallsdato</string>
+  <string name="quest.accept">Aksepter</string>
+  <string name="quest.reject">Avslå</string>
+  <string name="quest.begin">Start Oppdrag</string>
+  <string name="quest.cancel">Avslå Invitasjon</string>
+  <string name="quest.abort">Avbryt Oppdrag</string>
+  <string name="quest.leave">Forlat Oppdrag</string>
+  <string name="quest.pending">Venter</string>
+  <string name="quest.accepted">Akseptert</string>
+  <string name="quest.rejected">Avslått</string>
+  <string name="quest.participants">Deltakere</string>
+  <string name="version_info">Versjon %1$s (%2$d)</string>
+  <string name="sidebar_help">Hjelp &amp; FAQ</string>
+  <string name="complete_tutorial">Den er grei!</string>
+  <string name="dismiss_tutorial">Minn meg igjen</string>
+  <string name="intro_1_subtitle">Velkommen til</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Det er tid for å ha det gøy mens du får ting gjort. Bli med over %s andre som forbedrer livene sine med en oppgave om gangen.</string>
+  <string name="intro_2_subtitle">Fremskritt i spillet</string>
+  <string name="intro_2_title">Fremskritt i livet</string>
+  <string name="intro_2_description">Lås opp funksjoner i spillet ved å krysse av på dine virkelige oppgaver. Få rustninger, kjæledyr, og mer som belønning for å ha møtt dine mål.</string>
+  <string name="intro_3_subtitle">Bekjemp Monstre</string>
+  <string name="intro_3_title">Bli sosial</string>
+  <string name="intro_3_description">Hold styr på målene dine med hjelp fra dine venner. Støtt hverandre i livet og i kamp når dere blir bedre sammen!</string>
+  <string name="intro_finish_button">Kom i gang!</string>
+  <string name="previous_button">Forrige</string>
+  <string name="next_button">Neste</string>
+  <string name="skip_button">Hopp over</string>
+  <string name="setup_welcome_description">Velkommen til Habitica, hvor progresjon i spillet vil forbedre ditt virkelige liv! Når du oppnår mål i ditt virkelig liv, låser du opp utstyr, kjæledyr, oppdrag og mer.</string>
+  <string name="setup_welcome_title">Velkommen</string>
+  <string name="avatar_setup_description">Så, hvordan vil du se ut? Ikke bekymre deg, du kan endre dette senere.</string>
+  <string name="task_setup_description">Utmerket! Så, hva er du interessert i å jobbe med gjennom denne reisen?</string>
+  <string name="setup_group_work">Jobb</string>
+  <string name="setup_group_exercise">Trening</string>
+  <string name="setup_group_health">Helse</string>
+  <string name="setup_group_school">Skole</string>
+  <string name="setup_group_teams">Lag</string>
+  <string name="setup_group_chores">Husarbeid</string>
+  <string name="setup_group_creativity">Kreativitet</string>
+  <string name="setup_task_work_1">Behandle epost</string>
+  <string name="setup_task_work_2">Viktigste oppgave</string>
+  <string name="setup_task_work_3">Arbeidsprosjekt</string>
+  <string name="setup_task_exercise_1">10 min kondisjon</string>
+  <string name="setup_task_exercise_2">Tøying</string>
+  <string name="setup_task_exercise_3">Sett opp treningsplan</string>
+  <string name="setup_task_healthWellness_1">Spis sunt / søppelmat</string>
+  <string name="setup_task_healthWellness_2">Bruk tanntråd</string>
+  <string name="setup_task_healthWellness_3">Planlegg sjekk</string>
+  <string name="setup_task_school_1">Studer/Utsett</string>
+  <string name="setup_task_school_2">Gjør lekser</string>
+  <string name="setup_task_school_3">Fullfør skoleoppgave</string>
+  <string name="setup_task_teams_1">Sjekk inn med laget</string>
+  <string name="setup_task_teams_2">Oppdater laget om status</string>
+  <string name="setup_task_teams_3">Fullfør lagprosjekt</string>
+  <string name="setup_task_chores_1">10 minutter vasking</string>
+  <string name="setup_task_chores_2">Ta Oppvasken</string>
+  <string name="setup_task_chores_3">Organiser skapet</string>
+  <string name="setup_task_creativity_1">Studer en mester i håndverket</string>
+  <string name="setup_task_creativity_2">Jobb på kreativt prosjekt</string>
+  <string name="setup_task_creativity_3">Fullfør kreativt prosjekt</string>
+  <string name="gem.purchase.support">Vil du hjelpe oss å holde Habitica gående? Du kan støtte utviklerene ved å kjøpe juveler!\n\nJuveler lar deg kjøpe morsomme bonuser for avataren din, som inkluderer: \n\n - Kule kostymer for din figur\n - Heftige bakgrunner\n - Morsomme oppdrag som belønner deg med kjæredyrsegg\n - Muligheten å endre klasse før nivå 100\n\nTusen takk for at du hjelper oss gjøre Habitica så bra som mulig. Din støtte betyr masse for oss!</string>
+  <string name="my_guilds">Mine Laug</string>
+  <string name="public_guilds">Offentlige Laug</string>
+  <string name="guild">Laug</string>
+  <string name="leave">Forlat</string>
+  <string name="join">Bli med</string>
+  <string name="leader">Leder</string>
+  <string name="gems">Juveler</string>
+  <string name="copy_as_todo">Kopier som Gjøremål</string>
+  <string name="send_pm">Send PM</string>
+  <string name="flag">Flagg</string>
+  <string name="delete">Slett</string>
+  <string name="name">Navn</string>
+  <string name="description">Beskrivelse</string>
+  <string name="add_tag">Legg til ny Merkelapp</string>
+  <string name="privacy">Privatliv</string>
+  <string name="write_message">Skriv Melding</string>
+  <string name="post">Post</string>
+  <string name="guild_search_hint">Søk etter laug</string>
+  <string name="todo_due">Forfall: %s</string>
+  <string name="daily_streak">nåværende rekke: %d</string>
+  <string name="todo_has_duedate">Gjøremål har Forfallsdato</string>
+  <string name="battle_gear">Kamputstyr</string>
+  <string name="costume">Kostyme</string>
+  <string name="outfit_head">Hode</string>
+  <string name="outfit_headAccessory">Hodetilbehør</string>
+  <string name="outfit_eyewear">Øyeplagg</string>
+  <string name="outfit_armor">Rustning</string>
+  <string name="outfit_back">Rygg</string>
+  <string name="outfit_body">Kropp</string>
+  <string name="outfit_shield">Skjold</string>
+  <string name="outfit_weapon">Våpen</string>
+  <string name="wear_costume">Bruk Kostyme</string>
+  <string name="equipped">Utstyrt</string>
+  <string name="quest_cancel_message">Er du sikker på at du vil avbryte dette oppdraget? Alle aksepterte invitasjoner vil bli tapt. Eieren av oppdraget vil få beholde oppdragsrullen.</string>
+  <string name="quest.invitation">Oppdragsinvitasjon</string>
+  <string name="quest_begin_message">Er du sikker? Bare %1$d av dine %2$dklanmedlemmer har blitt med i dette oppdraget! Oppdraget starter automatisk når alle spillere har blitt med eller sa nei til invitasjonen.</string>
+  <string name="quest.invitation.text">Du har blitt invitert til å delta i et oppdrag!</string>
+  <string name="today">Idag</string>
+  <string name="sidebar_items">Gjenstander</string>
+  <string name="eggs">Egg</string>
+  <string name="hatching_potions">Klekkemikstur</string>
+  <string name="food">Mat</string>
+  <string name="quests">Oppdrag</string>
+  <string name="pets">Kjæledyr</string>
+  <string name="mounts">Ridedyr</string>
+  <string name="armoireEquipment">Du fant et stykke skjeldent Utstyr i Kabinettet: %s! Kjempemessig!</string>
+  <string name="armoireFood">Du ransaker Kabinettet og finner %1$s %2$s. Hva gjør den her?</string>
+  <string name="armoireExp">Du slåss med Kabinettet og får Erfaring. Ta den!</string>
+  <string name="armoireNotesFull">Åpne Kabinettet for å tilfeldig få spesielt Utstyr, Erfaring, eller mat! Utstyr som gjenstår: %d</string>
+  <string name="armoireLastItem">Du har funnet den siste resten av skjeldent Utstyr i det Fortryllede Kabinettet.</string>
+  <string name="armoireNotesEmpty">Kabinettet vill ha nytt Utstyr den første uka hver måned. Frem til da, fortsett å trykke for Erfaring og Mat!</string>
+  <string name="sell">Selg (%d Gull)</string>
+  <string name="hatch_with_potion">Klekk med mikstur</string>
+  <string name="feed_to_pet">Mat til kjæledyr</string>
+  <string name="hatch_egg">Klekk med egg</string>
+  <string name="invite_party">Inviter klan</string>
+  <string name="dialog_feeding">Mat %1$s %2$s med:</string>
+  <string name="use_animal">Bruk</string>
+  <string name="feed">Mat</string>
+  <string name="hatch_with">Klekk kjæledyr med %s</string>
+  <string name="hatched_pet_title">Du klekket en %1$s %2$s!</string>
+  <string name="close">Lukk</string>
+  <string name="share">Del</string>
+  <string name="notification_pet_fed">Du matet din %1$s %2$s!</string>
+  <string name="notification_purchase">Du kjøpte %s</string>
+  <string name="notification_purchase_reward">Du kjøpte en premie</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Magisk Eliksir</string>
+  <string name="sectionquestPets">Oppdrag</string>
+  <string name="sectionspecialPets">Sjelden</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Magisk Eliksir</string>
+  <string name="sectionquestMounts">Oppdrag</string>
+  <string name="sectionspecialMounts">Sjelden</string>
+  <string name="world_quest">Verdensoppdrag</string>
+  <string name="empty_items">Du har ingen %s</string>
+  <string name="user_level">Nivå %d</string>
+  <string name="user_level_with_class">Nivå %1$d %2$s</string>
+  <string name="warrior">Kriger</string>
+  <string name="rogue">Røver</string>
+  <string name="mage">Magiker</string>
+  <string name="healer">Healer</string>
+  <string name="mage_description">Magikere lærer raskt og får erfaring og nivåer raskere enn andre klasser. De får også en god del mana til sine spesielle ferdigheter. Spill som en Magiker hvis du nyter the taktiske aspektet rundt Habitica eller hvis du blir lett motivert av å avansere i nivåene og låse opp de mer avanserte funksjonene!</string>
+  <string name="rogue_description">Røvere elsker å samle opp rikdom, tjene mer gull enn alle andre, og er kjempeflinke til å finne tilfeldige gjenstander. Deres ikoniske usynlighetsevne lar dem unngå konsekvensene av glemte daglige oppgaver. Spill som Røver hvis du blir motivert av belønninger og bragder, og å jobbe for bytte og plaketter!</string>
+  <string name="healer_description">Helbredere er ugjennomtrengelige mot skade, og gir den beskyttelsen videre til andre. Glemte daglige oppgaver og dårlige vaner plager dem ikke mye, og de har måter å få bedre liv fra feiltrinn. Spill som Helbreder hvis du liker å hjelpe andre i Klanen din, eller om tanken på å lure døden gjennom hardt arbeid inspirerer deg!</string>
+  <string name="select_class">Velg Klasse</string>
+  <string name="opt_out_class">Reserver Deg</string>
+  <string name="opt_out_description">Gidder du ikke bry deg med klasser? Vil du velge sener? Avslå - du vil bli en Kriger uten spesielle muligheter. Du kan lese mer om klassesystemet på wiki-en og aktivere klasser når du vil under Bruker -&gt; Egenskaper.</string>
+  <string name="class_confirmation">Er du sikker på at du vil være en %s?</string>
+  <string name="class_changed">Du er nå en %s!</string>
+  <string name="class_changed_description">Du har nytt standard stridsutstyr som du kan bytte til under Utstyr!</string>
+  <string name="choose_class">Velg Klasse</string>
+  <string name="dialog_go_back">Gå Tilbake</string>
+  <string name="opt_out_confirmation">Er du sikker på at du vil reservere deg?</string>
+  <string name="change_class">Endre din klasse</string>
+  <string name="enable_class">Aktiver klassesystem</string>
+  <string name="changing_class_progress">Skifter Klasse</string>
+  <string name="by_email">Via Epost</string>
+  <string name="invite_existing_users">Inviter Eksisterende Brukere</string>
+  <string name="send">Send</string>
+  <string name="invite">Inviter Venner</string>
+  <string name="invite_id_description">Hvis du har venner som allerede bruker Habitica, så inviter dem med Bruker-ID her.</string>
+  <string name="invite_email_description">Hvis en venn blir medlem av Habitica via din epost, så vil de automatisk bli invitert til din klan!</string>
+  <string name="add_invites">Legg til invitasjoner</string>
+  <string name="user_id">Bruker ID</string>
+  <string name="email">Epost</string>
+  <string name="invite_users">Inviter til Klan</string>
+  <string name="share_using">Del via</string>
+  <string name="share_levelup">Jeg kom til nivå %d i Habitica ved å forbedre mine vaner</string>
+  <string name="share_hatched">Jeg klekket akkurat et %1$s %2$s kjæledyr i Habitica ved å fullføre mine virkelige oppgaver!</string>
+  <string name="share_raised">Jeg fikk akkurat et %1$s %2$s ridedyr i Habitica ved å fullføre mine daglige gjøremål!</string>
+  <string name="open_in_store">Åpne i Play Store</string>
+  <string name="change_class_confirmation">Er du sikker på at du vil bytte klasse? Det vil koste deg 3 juveler.</string>
+  <string name="change_class_equipment_warning">Advarsel: Du vil ikke lenger ha muligheten til å kjøpe utstyr fra %s klassen.</string>
+  <string name="leaderMessage">Melding fra %1$s</string>
+  <string name="leaderName">Leder: %1$s</string>
+  <string name="confirm">Bekreft</string>
+  <string name="market">Marked</string>
+  <string name="timeTravelers">Tidsreisende</string>
+  <string name="seasonalShop">Sesongbasert Butikk</string>
+  <string name="party_invite">Lås opp ved å invitere venner</string>
+  <string name="login_incentive">Lås opp ved å logge inn i Habitica ofte.</string>
+  <string name="create_account">Lås opp ved å lage en konto.</string>
+  <string name="no_gold">Ikke nok Gull</string>
+  <string name="no_potion">Du trenger ikke kjøpe helsemikstur</string>
+  <string name="successful_purchase">Kjøpte %1$s</string>
+  <string name="purchase_confirmation_title">Godta kjøp</string>
+  <string name="confirm_purchase_text">Kjøp %1$s for %2$s %3$s</string>
+  <string name="gem">juvel</string>
+  <string name="hourglass">timeglass</string>
+  <string name="hourglasses">timeglass</string>
+  <string name="gold_singular">gull</string>
+  <string name="gold_plural">gull</string>
+  <string name="chat_message_copied">Melding kopiert til utklippstavlen</string>
+  <string name="copy_chat_message">Copier til utklippstavlen</string>
+  <string name="edit_tag_title">Rediger Merkelapp</string>
+  <string name="edit_tag_btn_edit">Rediger</string>
+  <string name="edit_tag_btn_done">Ferdig</string>
+  <string name="edit_tag_btn_delete">Slett</string>
+  <string name="confirm_delete_tag_title">Er du sikker?</string>
+  <string name="confirm_delete_tag_message">Vil du virkelig slette?</string>
+  <string name="filter_drawer_edit_tags">Rediger Merkelapper</string>
+  <string name="filter_drawer_filter_tags">Filtrer etter Merkelapper</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Få noen til å invitere deg med denne QR Koden</string>
+  <string name="qr_save_message">QR kode lagret på</string>
+  <string name="qr_dialogue_title">Din QR Kode</string>
+  <string name="download">Last Ned</string>
+  <string name="send_new_message">Send ny melding</string>
+  <string name="choose_recipient_title">Velge Meldingsmottakeren</string>
+  <string name="action_continue">Fortsett</string>
+  <string name="scan_qr_code">Skann QR Kode</string>
+  <string name="enter_recipient_uuid">Tast mottakerens Bruker-ID</string>
+  <string name="invited_to_party">Du har blitt invitert til en klan!</string>
+  <string name="stats_widget_label">Habitica Statistikk</string>
+  <string name="add_task">Legg til Oppgave</string>
+  <string name="add_habit">Legg til Vane</string>
+  <string name="add_daily">Legg til Daglige Gjøremål</string>
+  <string name="add_todo">Legg til Gjøremål</string>
+  <string name="add_reward">Legg til Belønning</string>
+  <string name="all_dailies_completed">Du har fullført alle daglige gjøremål. Bra gjort!</string>
+  <string name="widget_habit_button">Habitica Gjør Vane</string>
+  <string name="widget_dailies">Habitica Daglige Gjøremål</string>
+  <string name="widget_todo_list">Habitica Liste over Gjøremål</string>
+  <string name="widget_add_task">Habitica Legg til Oppgave</string>
+  <string name="google_services_missing">Google play tjenester kunne ikke bli funnet.</string>
+  <string name="gem.purchase.toolbartitle">Kjøp</string>
+  <string name="gem.purchase.title">Ved å kjøpe juveler, så støtter du utviklerne og hjelper til med å holde Habitica i gang.</string>
+  <string name="gem.purchase.subtitle">Juveler tillater deg å kjøpe morsomme ekstramateriale til din konto, inkludert:</string>
+  <string name="gem.purchase.listitem1">Kule kostymer for din avatar</string>
+  <string name="gem.purchase.listitem2">Kule bakgrunner</string>
+  <string name="gem.purchase.listitem3">Oppdrag som belønner deg med kjæledyrsegg</string>
+  <string name="gem.purchase.listitem4">Evnen til å endre din klasse før nivå 100</string>
+  <string name="support_habitica">Støtt Habitica</string>
+  <string name="skill_transformation_use">bruke</string>
+  <string name="hatching_market_info">Får du ikke de riktige slippene? Sjekk ut markedet!</string>
+  <string name="feeding_market_info">Trenger du annen mat? Kjøp mer fra Markedet</string>
+  <string name="open_market">Åpne Marked</string>
+  <string name="cds_description">Dine Daglige Gjøremål vil tlibakestilles den første gangen du bruker Habitica etter %1$s. Pass på at du har fullført dine Daglige Gjøremål før dette!</string>
+  <string name="AudioTheme_title">Lydtema</string>
+  <string name="AudioTheme_summary">Bytt Habiticas Lydtema</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Ser deg imorgen!</string>
+  <string name="belongs_to_challenge">Hører til Utfordring</string>
+  <string name="has_reminder">Har Påminnelse</string>
+  <string name="has_tag">Har Merkelapp</string>
+  <string name="subscribe.title">Å abonnere  støtter utviklerne  og hjelper til med å holde Habitica gående</string>
+  <string name="subscribe_prompt">Bli en abonnent og få disse nyttige fordelene: </string>
+  <string name="subscribe.listitem1">Kjøp juveler med gull</string>
+  <string name="subscribe.listitem2">Eksklusive månedlige gjenstander</string>
+  <string name="subscribe.listitem3">Behold ytterligere historikk</string>
+  <string name="subscribe.listitem4">Daglig slippgrense er doblet</string>
+  <string name="subscriptions">Abonnomenter</string>
+  <string name="subscription_duration">Gjentas hver %s</string>
+  <string name="subscribe">Abonner</string>
+  <string name="subscribe.listitem1.description">Kjøpmann Alexander vil nå selge deg juveler for 20 gull hver!\n\nHans månedlige leveranser er i utgangspunktet begrenset til 25 Juveler hver måned, men kan øke basert på lengden på ditt abonnement. \n\nBegrensningen øker med 5 Juveler for hver tredje måned med sammenhengende abonnement, med en øvre takhøyde på 50 Juveler hver måned!</string>
+  <string name="subscribe.listitem2.description">Hver måned vil du få en unik kosmetisk gjenstand til din avatar!\n\nI tillegg, for hver tredje sammenhengende abonnement, så vil De Mystiske Tidsreisende gi deg tilgang til historiske (og futuristiske) kosmetiske gjenstander.</string>
+  <string name="subscribe.listitem3.description">Gjør fullførte Gjøremål og Oppgavehistorikk  tilgjengelig for en lengre periode.</string>
+  <string name="subscribe.listitem4.description">Dobbel slippgrense vil la deg motta flere gjenstander fra dine fullførte oppgaver hver dag og hjelper deg å fullføre stallen din fortere!</string>
+  <string name="subscription_hourglasses">+%d Mystisk Timeglass</string>
+  <string name="payment_method">Betalingsmetode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Avbryt ditt Abonnement</string>
+  <string name="cancel_subscription_google.description">Ønsker du ikke lenger å abonnere? Du finner muligheten til å melde deg av under \"My Apps\" i Google Play-butikken.</string>
+  <string name="cancel_subscription_notgoogle.description">Ønsker du ikke lenger å abonnere? På grunn av din betalingsmåte, så kan du bare si opp abonnementet via vår nettside. Klikk på knappen under for å åpne nettsiden i nettleseren din!</string>
+  <string name="visit_habitica_website">Besøk Habitica-nettsiden</string>
+  <string name="current_bonuses">Gjeldende Bonuser</string>
+  <string name="months_subscribed">Måneder abonnert</string>
+  <string name="current_hourclasses">Nåværende Mystiske Timeglass</string>
+  <string name="monthly_gem_cap">Månedlig juvelbegrensning</string>
+  <string name="inactive">Inaktiv</string>
+  <string name="one_month">1 Måned</string>
+  <string name="months">%d Måneder</string>
+  <string name="month">Måned</string>
+  <string name="three_months">3 måneder</string>
+  <string name="six_months">6 måneder</string>
+  <string name="twelve_months">12 måneder</string>
+  <string name="subscribe_prompt_thanks">Får å Abonnerer, så får du disse nyttige egenskapene:</string>
+  <string name="subscription_status">Abonnementstatus</string>
+  <string name="byLeader">av %s</string>
+  <string name="challenge_details">Utfordring Detaljer</string>
+  <string name="challenge_leave_title">Forlat Utfordring</string>
+  <string name="challenge_leave_text">Er du sikker på at du vil forlate Utfordringen \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Fjern oppgaver</string>
+  <string name="challenge_remove_tasks_text">Ønsker du å fjerne oppgavene?</string>
+  <string name="remove_tasks">Fjern</string>
+  <string name="keep_tasks">Behold</string>
+  <string name="my_challenges">Mine Utfordringer</string>
+  <string name="public_challenges">Offentlig</string>
+  <string name="challenges">Utfordringer</string>
+  <string name="daily">Daglig</string>
+  <string name="habit">Vane</string>
+  <string name="reward">Belønning</string>
+  <string name="todo">Gjøremål</string>
+  <string name="official">Offisiell</string>
+  <string name="participating">Deltakende</string>
+  <string name="challenge">Utfordring</string>
+  <string name="go_to_challenge">Gå til Utfordring</string>
+  <string name="not_part_of_a_challenge">Du er ikke del av noen Utfordringer akkurat nå!</string>
+  <string name="join_a_challenge">Bli med på en utfordring for å legge til ferdig organiserte oppgaver til din egen liste. Da kan du kjempe med andre brukere for å vinne prestasjoner og til og med juveler!</string>
+  <string name="check_the_public_challenge_tab">Klikk på \"Offentlig\" fanen for å finne en brukergenerert Utfordring som er best tilpasset dine behov!</string>
+  <string name="add_reminder">Legg til Påminnelse</string>
+  <string name="warning">Advarsel</string>
+  <string name="open_settings">Åpne Innstillinger</string>
+  <string name="dont_keep_activities_warning">Det virker som om du har utvikleralternativet \ \"Ikke behold Aktiviteter \\" aktiv. Foreløpig er dette alternativet som forårsaker problemer med habitica appen, så vi anbefaler at du deaktiverer den.</string>
+  <string name="FAQ">Ofte stilte spørsmål</string>
+  <string name="special">Spesiell</string>
+  <string name="gem_for_gold_description">Siden du abonnereer til Habitica, så kan du kjøpe et antall Juveler med Gull hver måned.</string>
+  <string name="limited_count">%d igjen</string>
+  <string name="gem_shop">Juvel</string>
+  <string name="mystery_item">Mysteriegjenstand</string>
+  <string name="myster_item_notes">Hver måned vil abonnenter motta en mysteriegjenstand. Dette blir som regel utgitt rundt en uke før slutten av måneden.</string>
+  <string name="open">Åpne</string>
+  <string name="notification_mystery_item">Du åpner esken og finner %s!</string>
+  <string name="checkInRewardEarned">Du hat fått en %1$s som en belønning for din dedikasjon til å forbedre livet ditt.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Din neste premie låses opp etter %1$d Innlogginger</string>
+  <string name="pending_approval">venter på godkjenning</string>
+  <string name="filters">Filtre</string>
+  <string name="done">Ferdig</string>
+  <string name="group_tasks_edit_description">Gruppeoppgaver can ikke bli redigert</string>
+  <string name="group_tasks_edit_title">Kan ikke endre denne oppgaven</string>
+  <string name="groups">Grupper</string>
+  <string name="all">Alle</string>
+  <string name="none">Ingen</string>
+  <string name="owned">Eid</string>
+  <string name="not_owned">Ikke eid</string>
+  <string name="new_game">Nytt\nSpill</string>
+  <string name="login_btn_fb">Logg inn med Facebook</string>
+  <string name="login_btn_google">Logg inn med Google</string>
+  <string name="action_back">Tilbake</string>
+  <string name="randomize">Randomiser</string>
+  <string name="avatar_extras">Ekstras</string>
+  <string name="avatar_skin_color">Hudfarge</string>
+  <string name="avatar_hair_color">Hårfarget</string>
+  <string name="avatar_hair_bangs">Fletter</string>
+  <string name="avatar_hair_ponytail">Hestehale</string>
+  <string name="avatar_glasses">Briller</string>
+  <string name="avatar_wheelchair">Rullestol</string>
+  <string name="weak">Svak</string>
+  <string name="strong">Sterk</string>
+  <string name="gray">Grå</string>
+  <string name="completed">Fullført</string>
+  <string name="setuP_group_other">Andre</string>
+  <string name="clear">Fjern</string>
+  <string name="empty_title_habits">Du har ingen Vaner</string>
+  <string name="empty_description_habits">Vaner er oppgaver som ikke har en fast timeplan. Du kan krysse dem av flere ganger på en dag, eller ikke i det hele tatt.</string>
+  <string name="empty_title_dailies">Du har ingen Daglige Gjøremål</string>
+  <string name="empty_description_dailies">Daglige Gjøremål er oppgaver som gjentas regelmessig. Velg en timeplan som fungerer for deg!</string>
+  <string name="empty_title_todos">Du har ingen Gjøremål</string>
+  <string name="empty_description_todos">Gjøremål er oppgaver som kun behøver å fullføres én gang. Legg til sjekklister til dine Gjøremål for å øke dets verdi.</string>
+  <string name="empty_title_rewards">Du har ingen Belønninger</string>
+  <string name="reset_walkthrough">Nullstill Justins Gjennomgang</string>
+  <string name="read_community_guidelines">Vennligst les våre Samfunnsretningslinjer før posting</string>
+  <string name="maintenance">Vedlikehold</string>
+  <string name="reload_content">Last inn Innhold på nytt</string>
+  <string name="dailyDueDefaultView">Sett Daglige Gjøremål i \"Forfall\"-fanen</string>
+  <string name="dailyDueDefaultViewDescription">Med disse alternativene vil de Daglige Gjøremålene settes i \"Forfall\" i stedet for \"Alle\"</string>
+  <string name="repeat_summary">Gjentas %1$s ganger hver %2$s %3$s %4$s</string>
+  <string name="no_billing_gems">Enheten din har ikke noen av de støttede betalingsmetodene. Vennligst gå til habitica nettsiden dersom du vil kjøpe juveler.</string>
+  <string name="no_billing_subscriptions">Enheten din har ikke noen av de støttede betalingsmetodene. Vennligst gå til habitica nettsiden dersom du vil kjøpe et abonnement.</string>
+  <string name="save">Lagre</string>
+  <string name="location">Lokasjon</string>
+  <string name="tasks">Oppgaver</string>
+  <string name="challenge_create_error_enough_gems">Du har ikke nok juveler til å opprette en utfordring.</string>
+  <string name="challenge_create_error_no_tasks">Du må legge til minst en oppgave for å opprette denne Utfordringen.</string>
+  <string name="challenge_create_error_title">Du trenger en tittel for å opprette denne Utfordringen.</string>
+  <string name="description_optional">Beskrivelse (frivillig)</string>
+  <string name="new_challenge_title">Tittel til ny utfordring</string>
+  <string name="ownership">Eierforhold</string>
+  <string name="inn">Vertshuset</string>
+  <string name="system">System</string>
+  <string name="start_quest">Start et nytt Oppdrag</string>
+  <string name="leave_party">Forlat Klan</string>
+  <string name="party_description">Klanbeskrivelse</string>
+  <string name="abort_confirmation">Er du sikker på at du vil avbryte dette oppdraget? Oppdraget avbrytes for alle i klanen og all fremskritt vil bli borte. Oppdragsrullen returneres til oppdragseier.</string>
+  <string name="leave_quest_confirmation">Er du sikker på av du vil forlate dette aktive oppdraget? All fremskritt du har gjort i oppdraget vil bli borte.</string>
+  <string name="number_participants">%1$dDeltakere</string>
+  <string name="welcome_back">Velkommen Tilbake</string>
+  <string name="yesterdaililes_prompt">Utførte du noen av disse Daglige Gjøremålene i går?</string>
+  <string name="start_day">Start Dagen Min</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Neste premie om %dinnlogginger</string>
+  <string name="accepted">Akseptert</string>
+  <string name="declined">Ikke akseptert</string>
+  <string name="participants">Deltakere</string>
+  <string name="invitations">Invitasjoner</string>
+  <string name="quest_leader_header" formatted="false">Startet av %s</string>
+  <string name="quest_abort_message">Er du sikker på at du vil avbryte dette oppdraget? Det vil avbryte det for alle i ditt team og alt fremskritt vil bli tapt. Oppdragsrullen vil bli returnert til oppdragseieren.</string>
+  <string name="reloading_content">Laster inn innhold på nytt</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+  <string name="your_balance">Din balanse:</string>
+  <string name="available_until" formatted="false">Tilgjengelig til %s</string>
+  <string name="gems_left_max" formatted="false">Månedlige juveler: %1$d/%2$d er igjen</string>
+  <string name="gems_left_nomax" formatted="false">Månedlige juveler: %d er igjen</string>
+  <string name="health">Helse</string>
+  <string name="collect">Samle</string>
+  <string name="rage_meter">Sinne-meter</string>
+  <string name="boss_quest">Sjefsuhyreoppdrag</string>
+  <string name="collection_quest">Oppsamlingsoppdrag</string>
+  <string name="quest_reward_count" formatted="false">%1$sx%2$d</string>
+  <string name="experience_reward" formatted="false">%derfaringspoeng</string>
+  <string name="gold_reward" formatted="false">%dGull</string>
+  <string name="quest_owner_rewards">Oppdragseier-premier</string>
+  <string name="str_abbrv">Str|</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
+  <string name="reset_account">Tilbakestill konto</string>
+  <string name="delete_account">Slett konto</string>
+  <string name="delete_account_description">Er du sikker? Dette vil slette kontoen din for alltid, og du kan ikke få den tilbake! Du vil bli nødt til å lage en ny konto for å bruke Habitica igjen. Juveler brukt eller som er i banken vil ikke bli returnert. Hvis du er helt sikker, skriv passordet ditt i tekstboksen under.</string>
+  <string name="reset_account_confirmation">Tilbakestill kontoen min</string>
+  <string name="delete_account_confirmation">Slett kontoen min</string>
+  <string name="danger_zone">Fare-sone</string>
+  <string name="nevermind">Bare glem det.</string>
+  <string name="resetting_account">Tilbakestilling av konto</string>
+  <string name="deleting_account">Sletting av konto</string>
+  <string name="insufficientGold">Du må fullføre flere oppgaver før du kan få råd til denne gjenstanden.</string>
+  <string name="insufficientGems">Du trenger flere juveler for å få råd til denne gjenstanden!</string>
+  <string name="purchase_gems">Kjøp juveler</string>
+  <string name="insufficientHourglasses">Du vil trenge flere mystiske timeglass for å kjøpe denne gjenstanden!</string>
+  <string name="get_hourglasses">Få timeglass</string>
+  <string name="subscribe_for_hourglasses">Abonner for timeglass</string>
+  <string name="want_to_subscribe">Jeg vil abonnere</string>
+  <string name="come_back_soon">Kom tilbake snart!</string>
+  <string name="level">Nivå</string>
+  <string name="streak_label">21-dags gjennomføringskjeder</string>
+  <string name="stats">Statistikk</string>
+  <string name="saving">Lagrer</string>
+  <string name="forgot_password_description">Skriv inn e-post adressen du brukte for å registrere din Habitica-konto.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Endre din offentlige profil</string>
+  <string name="photo_url">Bilde-URL</string>
+  <string name="about">Om</string>
+  <string name="app_settings">App-innstillinger</string>
+  <string name="authentication">Autentisering</string>
+  <string name="change_password">Endre passord</string>
+  <string name="change_email">Endre e-post adresse</string>
+  <string name="change">Endre</string>
+  <string name="strength">Styrke</string>
+</resources>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index fed0ad7f7..2e545c82b 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Poziom:</string>
     <string name="profile_class_bonus">Premia klasowa:</string>
     <string name="profile_allocated">Umieszczone:</string>
-    <string name="profile_boosts">Doładowania:</string>
     <string name="profile_private_message">Wiadomość prywatna</string>
     <string name="profile_achievements">Osiągnięcia</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Zamknij</string>
 
 </resources>
diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml
index 199edca2f..d76386bee 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <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">Wiadomości</string>
-  <string name="sidebar.tavern">Karczma</string>
-  <string name="sidebar.party">Drużyna</string>
-  <string name="sidebar.purchaseGems">Kup Klejnoty</string>
-  <string name="sidebar.guilds">Gildie</string>
-  <string name="sidebar.challenges">Wyzwania</string>
-  <string name="sidebar.section.inventory">Ekwipunek</string>
-  <string name="sidebar.avatar">Awatar</string>
-  <string name="sidebar.equipment">Ekwipunek</string>
-  <string name="sidebar.stable">Stajnia</string>
-  <string name="sidebar.news">Aktualności</string>
-  <string name="sidebar.settings">Ustawienia</string>
-  <string name="sidebar.about">O programie</string>
+  <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">Wiadomości</string>
+  <string name="sidebar_tavern">Karczma</string>
+  <string name="sidebar_party">Drużyna</string>
+  <string name="sidebar_purchaseGems">Kup Klejnoty</string>
+  <string name="sidebar_guilds">Gildie</string>
+  <string name="sidebar_challenges">Wyzwania</string>
+  <string name="sidebar_section_inventory">Ekwipunek</string>
+  <string name="sidebar_avatar">Awatar</string>
+  <string name="sidebar_equipment">Ekwipunek</string>
+  <string name="sidebar_stable">Stajnia</string>
+  <string name="sidebar_news">Aktualności</string>
+    <string name="sidebar_about">O programie</string>
   <string name="sidebar_shops">Sklepy</string>
   <string name="sidebar_stats">Statystyki</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.tutorial.xml b/Habitica/res/values-pl/strings.tutorial.xml
index 37c26ed23..334c1dbee 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Kup wyposażenie dla swojego awatara za złoto, które zarobiłeś!</string>
   <string name="tutorial_rewards_2">Możesz również robić realne nagrody, na podstawie tego, co Cię motywuje.</string>
   <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
-  <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
-  <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
-  <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce</string>
-  <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
+    <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
   <string name="tutorial_party">Tutaj Ty i Twoi przyjaciele pilnujecie wzajemnie swoich celów i walczycie z potworami poprzez swoje zadania!</string>
   <string name="tutorial_tavern">Witaj w Karczmie - publicznym czacie dla wszystkich grup wiekowych! Możecie tu rozmawiać o produktywności i zadawać pytania. Miłej zabawy!</string>
-  <string name="tutorial_classes">Wybierz, czy zostać Wojownikiem, Magiem, Uzdrowicielem, czy Łotrzykiem! Każda klasa ma unikalny zestaw wyposażenia i umiejętności. By dowiedzieć się więcej, stuknij (?) !</string>
-  <string name="tutorial_stats">Naciśnij szary przycisk by przydzielić dużo punktów statystyk na raz albo naciskaj strzałki by przydzielać je pojedynczo. </string>
+    <string name="tutorial_stats">Naciśnij szary przycisk by przydzielić dużo punktów statystyk na raz albo naciskaj strzałki by przydzielać je pojedynczo. </string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index d6915f774..c1f6050e3 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Doświadczenie</string>
   <string name="HP_default">Zdrowie</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferencje nie mogą być wczytane z kodu kreskowego</string>
   <!--Prefs-->
   <string name="PS_settings_title">Ustawienia</string>
-  <string name="SP_address_hint">Domyślny serwer</string>
   <string name="SP_userID_title">Identyfikator użytkownika</string>
   <string name="SP_userID_summary">Twój identyfikator</string>
   <string name="SP_APIToken_title">Token API</string>
   <string name="SP_APIToken_summary">Twój Token API</string>
   <string name="Language_title">Język</string>
   <string name="Language_summary">Zmień język Habitici</string>
-  <string name="SP_user_qr_code">Twój kod QR</string>
   <string name="PS_contact_title">Skontaktuj się ze mną</string>
-  <string name="unknown_error">Wystąpił błąd…</string>
   <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Pierwszy Dzień Tygodnia</string>
   <string name="pref_first_day_of_the_week_summary">Pierwszy dzień tygodnia we wszystkich kalendarzach</string>
@@ -24,7 +20,6 @@
   <string name="pref_reminder_checkbox">Aktywuj przypomnienie</string>
   <string name="pref_reminder_picker">Ustaw czas przypomnienia</string>
   <string name="pref_cds_header">Własny początek dnia</string>
-  <string name="pref_cds_picker">Ustaw czas własnego początku dnia</string>
   <string name="pref_push_notifications_checkbox">Powiadomienia użytkownika</string>
   <string name="push_notifications">Powiadomienia</string>
   <string name="push_notifications_sum">Ustaw swoje ustawienia powiadomień push</string>
@@ -37,13 +32,7 @@
   <string name="preference_push_your_quest_has_begun">Twoja misja się rozpoczęła</string>
   <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
   <!--Adding tasks-->
-  <string name="task_value">Wartość</string>
-  <string name="new_todo">Nowe Do-Zrobienia</string>
-  <string name="new_reward">Nowa nagroda</string>
-  <string name="new_daily">Nowe codzienne</string>
-  <string name="new_habit">Nowy nawyk</string>
   <string name="action_edit">Edytuj</string>
-  <string name="action_delete">Usuń</string>
   <string name="action_cancel">Anuluj</string>
   <string name="login_btn">Logowanie</string>
   <string name="register_btn">Rejestracja</string>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Potwierdź hasło</string>
   <string name="logout">Wyloguj</string>
   <string name="logout_description">Wyloguj się</string>
-  <string name="account_details">Szczegóły konta</string>
   <string name="LoginActivityName">Witaj</string>
-  <string name="string_revive">Odrodzenie</string>
-  <string name="please_connect">Proszę zaloguj się przez aplikację przed użyciem widgetu</string>
-  <string name="about.title">O programie</string>
-  <string name="about.libraries">Biblioteki</string>
-  <string name="about.versionhistory">Historia wersji</string>
-  <string name="about.habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
-  <string name="about.rate_our_app">Oceń aplikację</string>
-  <string name="about.give_us_feedback">Prześlij nam opinię!</string>
-  <string name="about.bugreport">Zgłoś błąd</string>
-  <string name="about.source_code">Kod źródłowy</string>
-  <string name="repeatEvery">Powtarzaj co</string>
+  <string name="about_title">O programie</string>
+  <string name="about_libraries">Biblioteki</string>
+  <string name="about_habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
+  <string name="about_rate_our_app">Oceń aplikację</string>
+  <string name="about_give_us_feedback">Prześlij nam opinię!</string>
+  <string name="about_bugreport">Zgłoś błąd</string>
+  <string name="about_source_code">Kod źródłowy</string>
   <!--Network Errors-->
-  <string name="network_error_title">Błąd połączenia</string>
-  <string name="network_error_no_network_body">Nie masz połączenia z internetem.</string>
-  <string name="internal_error_api">Utracono połączenie z serwerem</string>
+  <string name="internal_error_api">Wygląda na to, że mamy problem z serwerem. Spróbuj później.</string>
   <string name="authentication_error_title">Błąd autentykacji</string>
-  <string name="authentication_error_body">Twoja nazwa użytkownika lub hasło są niepoprawne.</string>
   <string name="login_validation_error_title">Błąd walidacji</string>
   <string name="login_validation_error_fieldsmissing">Musisz wypełnić wszystkie pola.</string>
   <string name="save_changes">Zapisz</string>
   <string name="copy">Kopiuj</string>
   <string name="notes">Notatki</string>
-  <string name="text">Tekst</string>
   <string name="difficulty">Trudność</string>
   <string name="tags">Tagi</string>
   <string name="trivial">Trywialny</string>
@@ -86,22 +66,11 @@
   <string name="medium">Średni</string>
   <string name="hard">Trudny</string>
   <string name="start_date">Data rozpoczęcia</string>
-  <string name="positive_habit_form">Pozytywne</string>
-  <string name="negative_habit_form">Negatywne</string>
+  <string name="positive_habit_form">Pozytywne ( + )</string>
+  <string name="negative_habit_form">Negatywne ( - )</string>
   <string name="checklist">Lista</string>
   <string name="reminders">Przypomnienia</string>
-  <string name="actions">Akcje</string>
   <string name="attributes">Atrybuty</string>
-  <string name="physical">Siła</string>
-  <string name="mental">Inteligencja</string>
-  <string name="social">Kondycja</string>
-  <string name="other">Percepcja</string>
-  <string name="frequency">Częstotliwość</string>
-  <string name="frequency_weekly">W konkretne dni tygodnia</string>
-  <string name="frequency_daily">Co X dni</string>
-  <string name="repeatables_summary_title">Podsumowanie</string>
-  <string name="repeatables_title">Powtórzenia</string>
-  <string name="repeatables_on_title">Powtarza się</string>
   <string name="repeatables_frequency_daily">Codzienny</string>
   <string name="repeatables_frequency_weekly">Cotygodniowy</string>
   <string name="repeatables_frequency_monthly">Co miesiąc </string>
@@ -122,23 +91,14 @@
   <string name="faint_header">Możesz stracić całe Zdrowie!</string>
   <string name="faint_button">Uzupełnij Zdrowie &amp; Spróbuj jeszcze raz</string>
   <string name="filter">Filtr</string>
-  <string name="profile_image">Obrazek profilowy</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Użyłeś %1$s za %2$d pkt many.</string>
   <string name="used_skill_without_mana">Użyto %1$s.</string>
-  <string name="new_checklist_item">nowy wpis na listę</string>
-  <string name="add_checklist_item">Dodaj</string>
-  <string name="skill_progress_title">Użycie umiejętności</string>
-  <string name="coming_soon">Wkrótce dostępne</string>
-  <string name="chat_flag_confirmation">Jesteś pewny że chcesz zgłosić tą wiadomość z powodu naruszeń?</string>
-  <string name="flag_confirm">Oznacz wiadomość</string>
+  <string name="new_checklist_item">nowa część zadania</string>
   <string name="unlock_lvl_11">Odblokuj na poziomie 11</string>
-  <string name="no_party_message">Nie jesteś w drużynie. Żeby dołączyć do drużyny odwiedź stronę internetową.</string>
   <string name="forgot_pw_btn">Zapomniane hasło</string>
-  <string name="tavern.inn.checkOut">Reaktywuj swoje codzienne</string>
-  <string name="tavern.inn.rest">Zapauzuj swoje codzienne</string>
-  <string name="reward.dialog.buy">Kup</string>
-  <string name="reward.dialog.dismiss">Anuluj</string>
+  <string name="tavern_inn_checkOut">Reaktywuj swoje codzienne</string>
+  <string name="tavern_inn_rest">Zapauzuj swoje codzienne</string>
+  <string name="reward_dialog_buy">Kup</string>
+  <string name="reward_dialog_dismiss">Anuluj</string>
   <string name="party">Drużyna</string>
   <string name="chat">Czat</string>
   <string name="members">Członkowie</string>
@@ -146,8 +106,6 @@
   <string name="dailies">Codzienne</string>
   <string name="todos">Do zrobienia</string>
   <string name="rewards">Nagrody</string>
-  <string name="taskform.delete.title">Jesteś pewien?</string>
-  <string name="taskform.delete.message">Czy na pewno chcesz usunąć?</string>
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
   <string name="quest">Misja</string>
@@ -155,14 +113,12 @@
   <string name="avatar_hair">Włosy</string>
   <string name="avatar_shirt">Koszulka</string>
   <string name="avatar_skin">Skóra</string>
-  <string name="avatar_ears">Zwierzęce uszy</string>
   <string name="avatar_base">Spód</string>
   <string name="avatar_color">Kolor</string>
   <string name="avatar_beard">Broda</string>
   <string name="avatar_mustache">Wąsy</string>
   <string name="avatar_flower">Kwiatek</string>
   <string name="avatar_bangs">Grzywka</string>
-  <string name="avatar_nothing">Nie wybrano</string>
   <string name="avatar_size">Rozmiar</string>
   <string name="avatar_size_slim">Szczupła</string>
   <string name="avatar_size_broad">Krzepka</string>
@@ -172,22 +128,16 @@
   <string name="purchase_button">Kup</string>
   <string name="purchase_set_title">Kup zestaw %s</string>
   <string name="due_date">Termin</string>
-  <string name="quest.accept">Akceptuj</string>
-  <string name="quest.reject">Odrzuć</string>
-  <string name="quest.begin">Rozpocznij Quest</string>
-  <string name="quest.cancel">Anuluj Zaproszenie</string>
-  <string name="quest.abort">Przerwij Quest</string>
-  <string name="quest.leave">Opuść Misję</string>
-  <string name="quest.pending">Oczekujące</string>
-  <string name="quest.accepted">Zaakceptowane</string>
-  <string name="quest.rejected">Odrzucone</string>
-  <string name="quest.participants">Uczestnicy</string>
+  <string name="quest_accept">Akceptuj</string>
+  <string name="quest_reject">Odrzuć</string>
+  <string name="quest_begin">Rozpocznij Quest</string>
+  <string name="quest_cancel">Anuluj Zaproszenie</string>
+  <string name="quest_abort">Przerwij Quest</string>
   <string name="version_info">Wersja %1$s (%2$d)</string>
   <string name="sidebar_help">Pomoc i FAQ</string>
   <string name="complete_tutorial">Jasne!</string>
   <string name="dismiss_tutorial">Przypomnij mi później</string>
   <string name="intro_1_subtitle">Witaj w</string>
-  <string name="intro_1_title">Habitica</string>
   <string name="intro_1_description">Nadszedł czas, by się bawić kiedy wykonujesz swoje zadania. Dołącz do ponad %s innych, którzy polepszyli swoje życie wykonując zadanie za zadaniem.</string>
   <string name="intro_2_subtitle">Postęp w grze</string>
   <string name="intro_2_title">Postęp w życiu</string>
@@ -196,11 +146,8 @@
   <string name="intro_3_title">Bądź społeczny</string>
   <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
   <string name="intro_finish_button">Zaczynajmy!</string>
-  <string name="previous_button">Poprzedni</string>
   <string name="next_button">Następny</string>
   <string name="skip_button">Pomiń</string>
-  <string name="setup_welcome_description">Witaj w Habitice, gdzie postęp w grze ulepszy Twoje życie! Osiągając cele w prawdziwym świecie, odblokowujesz ekwipunek, chowańce, misje i wiele więcej.</string>
-  <string name="setup_welcome_title">Witaj</string>
   <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
   <string name="task_setup_description">Świetnie! Teraz, nad czym chciałbyś popracować podczas tej podróży?</string>
   <string name="setup_group_work">Praca</string>
@@ -231,28 +178,19 @@
   <string name="setup_task_creativity_1">Studiować mistrzostwo rzemiosła</string>
   <string name="setup_task_creativity_2">Pracować nad twórczym projektem</string>
   <string name="setup_task_creativity_3">Ukończyć twórczy projekt</string>
-  <string name="gem.purchase.support">Chcesz nam pomóc w utrzymaniu Habitiki? Możesz wesprzeć deweloperów kupując Klejnoty!\n\nZa Klejnoty można kupować zabawne dodatki do konta, takie jak:\n\n - Fajne kostiumy dla Twojego awatara\n - Fantastyczne tła\n - Ciekawe misje, w których nagrodą są jaja chowańców\n - Możliwość zmiany klasy przed osiągnięciem poziomu 100\n\nStukrotne dzięki za pomaganie nam w czynieniu Habitiki najlepszą, jaka może być. Twoja pomoc wiele dla nas znaczy!</string>
   <string name="my_guilds">Moje Gildie</string>
   <string name="public_guilds">Publiczne Gildie</string>
   <string name="guild">Gildia</string>
   <string name="leave">Opuść</string>
   <string name="join">Dołącz</string>
-  <string name="leader">Lider</string>
   <string name="gems">Klejnoty</string>
-  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
-  <string name="send_pm">Wyślij wiadomość</string>
-  <string name="flag">Oznacz</string>
   <string name="delete">Usuń</string>
   <string name="name">Nazwa</string>
   <string name="description">Opis</string>
   <string name="add_tag">Dodaj nowy tag</string>
   <string name="privacy">Prywatność</string>
   <string name="write_message">Napisz wiadomość</string>
-  <string name="post">Wyślij</string>
   <string name="guild_search_hint">Szukaj gildii</string>
-  <string name="todo_due">Termin: %s</string>
-  <string name="daily_streak">licznik serii: %d</string>
-  <string name="todo_has_duedate">Zdania mają termin wykonania</string>
   <string name="battle_gear">Sprzęt Bojowy</string>
   <string name="costume">Kostium</string>
   <string name="outfit_head">Głowa</string>
@@ -266,9 +204,7 @@
   <string name="wear_costume">Użyj kostiumu</string>
   <string name="equipped">W użyciu</string>
   <string name="quest_cancel_message">Jesteś pewien że chcesz przerwać quest? Quest zostanie przerwany dla wszystkich uczestników. Zwołujący quest odzyska skrypt (quest scroll).</string>
-  <string name="quest.invitation">Zaproszenie do misji</string>
   <string name="quest_begin_message">Jesteś pewien? Tylko %1$d z %2$d członków twojej drużyny dołączyło do tej misji! Misje zaczynają się automatycznie kiedy wszyscy członkowie dołączą bądź odrzucą zaproszenie.</string>
-  <string name="quest.invitation.text">Zostałeś zaproszony do udziału w misji!</string>
   <string name="today">Dzisiaj</string>
   <string name="sidebar_items">Przedmioty</string>
   <string name="eggs">Jaja</string>
@@ -277,19 +213,14 @@
   <string name="quests">Misje</string>
   <string name="pets">Zwierzaki</string>
   <string name="mounts">Wierzchowce</string>
-  <string name="armoireEquipment">W Skrzyni znajdujesz %s</string>
+  <string name="armoireEquipment">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
   <string name="armoireFood">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</string>
   <string name="armoireExp">Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz!</string>
-  <string name="armoireNotesFull">Otwórz Skrzynię żeby losowo otrzymać specjalne Wyposażenie, Doświadczenie lub jedzenie! Pozostało elementów : %d</string>
-  <string name="armoireLastItem">Znalazłeś ostatni element rzadkiego Wyposażenia w Zaklętej Skrzyni.</string>
-  <string name="armoireNotesEmpty">Skrzynia otrzyma nowe Wyposażenie w pierwszym tygodniu każdego miesiąca. Do tego czasu klikaj aby otrzymać Doświadczenie i Jedzenie!</string>
   <string name="sell">Sprzedaj (%d Złoto)</string>
   <string name="hatch_with_potion">Wykluj za pomocą mikstury</string>
-  <string name="feed_to_pet">Nakarm chowańca</string>
   <string name="hatch_egg">Wykluj za pomocą jaja</string>
   <string name="invite_party">Zaproś drużynę</string>
-  <string name="dialog_feeding">Nakarm %1$s %2$s:</string>
-  <string name="dialog_feeding">Nakarm %s:</string>
+  <string name="dialog_feeding">Nakarm %s</string>
   <string name="use_animal">Użyj</string>
   <string name="feed">Nakarm</string>
   <string name="hatch_with">Wykluj za pomocą %s</string>
@@ -297,16 +228,7 @@
   <string name="close">Zamknij</string>
   <string name="share">Podziel się</string>
   <string name="notification_pet_fed">Nakarmiłeś/aś %s!</string>
-  <string name="notification_purchase">Kupiłeś %s</string>
   <string name="notification_purchase_reward">Kupiłeś nagrodę</string>
-  <string name="sectiondrop">Standardowe</string>
-  <string name="sectionpremium">Eliksir Magiczny</string>
-  <string name="sectionquest">Misja</string>
-  <string name="sectionspecial">Rzadkie</string>
-  <string name="sectionmounts">Standardowe</string>
-  <string name="sectionpremiumMounts">Eliksir Magiczny</string>
-  <string name="sectionquestMounts">Misja</string>
-  <string name="sectionspecialMounts">Rzadkie</string>
   <string name="world_quest">Zadanie ogólnoświatowe</string>
   <string name="inn_description">Potrzebujesz przerwy? Zamelduj się w Karczmie Daniela, aby wstrzymać niektóre z cięższych elementów Habitiki.
 • Pominięte Codzienne nie zadadzą Ci obrażeń.
@@ -320,12 +242,11 @@
   <string name="rogue">Łotrzyk</string>
   <string name="mage">Mag</string>
   <string name="healer">Uzdrowiciel</string>
-  <string name="mage_description">Magowie uczą się Umiejętności, które zadają obrażenia Bossom oraz zwiększają Doświadczenie i Manę. Graj jako Mag, jeśli motywuje cię szybkie zdobywanie poziomów! Magowie wykorzystują wysokie punkty Inteligencji.</string>
-  <string name="rogue_description">Łotrzyki uczą się umiejętności pozwalających im oraz członkom drużyny na zdobywanie większej ilości Złota i losowych nagród. Graj jako Łotrzyk jeśli pragniesz nagród i złota! Łotrzyki korzystają z wysokiej wartości punktów Percepcji.</string>
-  <string name="healer_description">Medycy uczą się Umiejętności, które potrafią leczyć i chronić siebie oraz Drużynę. Graj Medykiem jeśli lubisz pomagać innym lub chcesz chronić przyjaciół przed obrażeniami. Medycy korzystają z wysokiej wartości punktów Kondycji.</string>
+  <string name="mage_description">Magowie uczą się sprawnie, zyskując Doświadczenie i Poziomy szybciej niż inne klasy. Dostają także dużo Many na specjalne umiejętności. Graj jako Mag jeśli lubisz elementy gry taktycznej w Habit, lub jeśli jesteś silnie motywowany przez zdobywanie poziomów i odblokowywanie zaawansowanych aspektów gry!</string>
+  <string name="rogue_description">Łotrzyki uwielbiają gromadzić bogactwa, zyskując więcej Złota niż inni, oraz są adeptami w znajdowaniu losowych rzeczy. Ich umiejętność skradania pozwala im uniknąć konsekwencji pominięcia Codziennych. Graj jako Łotrzyk jeśli motywują Cię Nagrody i Osiągnięcia, walczenie o skarby i odznaki!</string>
+  <string name="healer_description">Medycy są odporni na obrażenia, i przedłużają tą ochronę na innych. Pominięte Codzienne i złe Nawyki nie robią na nich wrażenia, mają także sposoby na odzyskanie Zdrowia po porażce. Graj jako Medyk jeśli lubisz pomagać innym w Drużynie, lub jeśli koncepcja oszukania Śmierci dzięki ciężkiej pracy jest dla ciebie inspirująca!</string>
   <string name="select_class">Wybierz klasę postaci</string>
   <string name="opt_out_class">Wycofaj się</string>
-  <string name="opt_out_description">Nie zależy ci na klasach? Chcesz wybrać później? Wycofaj się - będziesz wojownikiem bez specjalnych umiejętności. Możesz przeczytać o systemie klas później na wiki i włączyć klasy w każdej chwili.</string>
   <string name="class_confirmation">Jesteś pewien, że chcesz być %s?</string>
   <string name="class_changed">Jesteś teraz %s!</string>
   <string name="class_changed_description">Masz nowe domyślne wyposażenie bojowe, które możesz zmienić pod Wyposażeniem!</string>
@@ -340,12 +261,9 @@
   <string name="invite_existing_users">Zaproś istniejących użytkowników</string>
   <string name="send">Wyślij</string>
   <string name="invite">Zaproś znajomych</string>
-  <string name="invite_id_description">Jeśli Twoi znajomi używają już Habitiki, zaproś ich za pomocą ID Użytkownika tutaj.</string>
   <string name="invite_email_description">Jeśli przyjaciel dołączył do Habitiki przez Twojego maila, zostanie automatycznie dodany do Twojej drużyny!</string>
   <string name="add_invites">Dodaj zaproszenia</string>
-  <string name="user_id">ID Użytkownika</string>
   <string name="email">Email</string>
-  <string name="invite_users">Zaproś do drużyny</string>
   <string name="share_using">Udostępnij używanie</string>
   <string name="share_levelup">Uzyskałem poziom %d w Habitice dzięki poprawie moich życiowych nawyków!</string>
   <string name="share_hatched">Właśnie wyklułem chowańca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
@@ -353,8 +271,6 @@
   <string name="open_in_store">Otwórz w sklepie Google Play</string>
   <string name="change_class_confirmation">Jesteś pewien, że chcesz zmienić klasę? Będzie to kosztować 3 kryształy.</string>
   <string name="change_class_equipment_warning">Ostrzeżenie: Nie będziesz nie będziesz mógł kupić wyposażenia dla klasy: %s.</string>
-  <string name="leaderMessage">Wiadomość od %1$s</string>
-  <string name="leaderName">Lider: %1$s</string>
   <string name="confirm">Potwierdź</string>
   <string name="market">Sklep</string>
   <string name="timeTravelers">Podróżnicy w czasie</string>
@@ -363,36 +279,15 @@
   <string name="party_invite">Odblokuj poprzez zapraszanie przyjaciół</string>
   <string name="login_incentive">Odblokuj regularnie odwiedzając Habitikę</string>
   <string name="create_account">Odblokuj tworząc konto</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">Kupiono %1$s</string>
-  <string name="purchase_confirmation_title">Potwierdź zakup</string>
-  <string name="confirm_purchase_text">Zakup %1$s za %2$s %3$s</string>
-  <string name="gem">diament</string>
-  <string name="hourglass">klepsydra</string>
-  <string name="hourglasses">klepsydry</string>
-  <string name="gold_singular">złoto</string>
   <string name="gold_plural">złoto</string>
   <string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
-  <string name="copy_chat_message">Kopiuj do schowka</string>
-  <string name="edit_tag_title">Edytuj tag</string>
   <string name="edit_tag_btn_edit">Edytuj</string>
-  <string name="edit_tag_btn_done">Zrobione</string>
-  <string name="edit_tag_btn_delete">Usuń</string>
   <string name="confirm_delete_tag_title">Jesteś pewien?</string>
   <string name="confirm_delete_tag_message">Czy na pewno chcesz usunąć?</string>
-  <string name="filter_drawer_edit_tags">Edytuj tagi</string>
-  <string name="filter_drawer_filter_tags">Filtruj po tagach</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Ktoś może zaprosić cię przy pomocy tego kodu QR</string>
-  <string name="qr_save_message">Kod QR zapisany w</string>
-  <string name="qr_dialogue_title">Twój kod QR</string>
-  <string name="download">Pobierz</string>
-  <string name="send_new_message">Wyślij nową wiadomość</string>
   <string name="choose_recipient_title">Wybierz odbiorcę wiadomości</string>
   <string name="action_continue">Kontynuuj</string>
-  <string name="scan_qr_code">Przeskanuj kod QR</string>
-  <string name="enter_recipient_uuid">Wpisz ID odbiorcy</string>
   <string name="invited_to_party">Zostałeś zaproszony do drużyny!</string>
   <string name="stats_widget_label">Statystyki Habitiki</string>
   <string name="add_task">Dodaj Zadanie</string>
@@ -404,15 +299,14 @@
   <string name="widget_habit_button">Nawyk Habitiki</string>
   <string name="widget_dailies">Codzienne Habitiki</string>
   <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
-  <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
   <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
-  <string name="gem.purchase.toolbartitle">Zamów</string>
-  <string name="gem.purchase.title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
-  <string name="gem.purchase.subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
-  <string name="gem.purchase.listitem1">Świetne kostiumy dla awatara</string>
-  <string name="gem.purchase.listitem2">Genialne tła</string>
-  <string name="gem.purchase.listitem3">Zadania, w których nagrodą są jaja</string>
-  <string name="gem.purchase.listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
+  <string name="gem_purchase_toolbartitle">Zamów</string>
+  <string name="gem_purchase_title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
+  <string name="gem_purchase_subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
+  <string name="gem_purchase_listitem1">Świetne kostiumy dla awatara</string>
+  <string name="gem_purchase_listitem2">Genialne tła</string>
+  <string name="gem_purchase_listitem3">Zadania, w których nagrodą są jaja</string>
+  <string name="gem_purchase_listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
   <string name="support_habitica">Wesprzyj Habitikę</string>
   <string name="skill_transformation_use">użyj</string>
   <string name="hatching_market_info">Nie znajdujesz poszukiwanych prezentów? Sprawdź na Targu!</string>
@@ -426,24 +320,24 @@
   <string name="belongs_to_challenge">Należy do wyzwania</string>
   <string name="has_reminder">Ma powiadomienie</string>
   <string name="has_tag">Ma tag</string>
-  <string name="subscribe.title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę</string>
+  <string name="subscribe_title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę</string>
   <string name="subscribe_prompt">Zostań abonentem i uzyskuj te użyteczne korzyści:</string>
-  <string name="subscribe.listitem1">Kup klejnoty za złoto</string>
-  <string name="subscribe.listitem2">Ekskluzywne przedmioty miesiąca </string>
-  <string name="subscribe.listitem3">Zachowuj dodatkowe wpisy w historii konta</string>
-  <string name="subscribe.listitem4">Dzienny limit łupów podwojony</string>
+  <string name="subscribe_listitem1">Kup klejnoty za złoto</string>
+  <string name="subscribe_listitem2">Ekskluzywne przedmioty miesiąca </string>
+  <string name="subscribe_listitem3">Zachowuj dodatkowe wpisy w historii konta</string>
+  <string name="subscribe_listitem4">Dzienny limit łupów podwojony</string>
   <string name="subscriptions">Subskrypcje</string>
   <string name="subscription_duration">Powtarzaj co %s</string>
   <string name="subscribe">Subskrybuj</string>
-  <string name="subscribe.listitem1.description">Kupiec Alexander będzie ci teraz sprzedawać Klejnoty po 20 złota każdy!\n\nJego miesięczne wysyłki są początkowo ograniczone do 25 Klejnotów na miesiąc, ale mogą się zwiększyć na podstawie długości twojego abonamentu.\n\nLimit zwiększa się o 5 Klejnotów co każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów na miesiąc!</string>
-  <string name="subscribe.listitem3.description">Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.</string>
+  <string name="subscribe_listitem1_description">Kupiec Alexander będzie ci teraz sprzedawać Klejnoty po 20 złota każdy!\n\nJego miesięczne wysyłki są początkowo ograniczone do 25 Klejnotów na miesiąc, ale mogą się zwiększyć na podstawie długości twojego abonamentu.\n\nLimit zwiększa się o 5 Klejnotów co każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów na miesiąc!</string>
+  <string name="subscribe_listitem3_description">Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.</string>
   <string name="subscription_hourglasses">+%d Mistycznej Klepsydry</string>
   <string name="payment_method">Metoda płatności</string>
   <string name="subscription">Subskrypcja</string>
   <string name="active">Aktywne</string>
   <string name="cancel_subscription">Anuluj Subskrypcję</string>
-  <string name="cancel_subscription_google.description">Nie chcesz dłużej subskrypcji\? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" w Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Nie chcesz dłużej subskrybować? Z powodu twojej metody płatności, możesz anulować subskrypcję tylko poprzez stronę internetową. Kliknij przycisk poniżej, aby otworzyć stronę w twojej przeglądarce!</string>
+  <string name="cancel_subscription_google_description">Nie chcesz dłużej subskrypcji\? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" w Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Nie chcesz dłużej subskrybować? Z powodu twojej metody płatności, możesz anulować subskrypcję tylko poprzez stronę internetową. Kliknij przycisk poniżej, aby otworzyć stronę w twojej przeglądarce!</string>
   <string name="visit_habitica_website">Odwiedź Stronę Habitiki</string>
   <string name="current_bonuses">Obecne Dodatki</string>
   <string name="months_subscribed">Miesięcy subskrypcji</string>
@@ -451,15 +345,13 @@
   <string name="monthly_gem_cap">Miesięczny limit Klejnotów</string>
   <string name="inactive">Nieaktywne</string>
   <string name="one_month">1 Miesiąc</string>
-  <string name="months">Miesięcy</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="subscribe_prompt_thanks">Za subskrypcję otrzymasz te użyteczne korzyści:</string>
   <string name="subscription_status">Status Subskrypcji</string>
-  <string name="byLeader">przez %s</string>
-  <string name="challenge_details">Szczegóły wyzwania</string>
   <string name="challenge_leave_title">Opuść wyzwanie</string>
   <string name="challenge_leave_text">Jesteś pewien, że chcesz opuścić wyzwanie “%s”?</string>
   <string name="challenge_remove_tasks_title">Usuń zadania</string>
@@ -467,45 +359,31 @@
   <string name="remove_tasks">Usuń</string>
   <string name="keep_tasks">Zachowaj</string>
   <string name="my_challenges">Moje wyzwania</string>
-  <string name="public_challenges">Publiczne</string>
-  <string name="challenges">Wyzwania</string>
   <string name="daily">Codzienny </string>
   <string name="habit">Nawyk</string>
   <string name="reward">Nagroda</string>
   <string name="todo">Do-Zrobienia</string>
   <string name="official">Oficjalne</string>
-  <string name="participating">Uczestnictwo </string>
   <string name="challenge">Wyzwanie</string>
-  <string name="go_to_challenge">Idź do wyzwania </string>
   <string name="not_part_of_a_challenge">Obecnie nie uczestniczysz w żadnym wyzwaniu!</string>
   <string name="check_the_public_challenge_tab">Puknij zakładkę \"Publiczne\", aby znaleźć wyzwania stworzone przez innych użytkowników, które najlepiej pasują do ciebie!</string>
-  <string name="add_reminder">Dodaj przypomnienie</string>
-  <string name="warning">Uwaga</string>
-  <string name="open_settings">Otwórz ustawienia</string>
-  <string name="dont_keep_activities_warning">Wygląda, że masz aktywną opcję deweloperską \\"\"Don\'t keep Activities\"\. Obecnie powoduje ona problemy z Habitiką, dlatego też sugerujemy jej wyłączenie.</string>
   <string name="inbox">Wiadomości</string>
-  <string name="FAQ">Najczęściej Zadawane Pytania</string>
   <string name="special">Specjalne</string>
   <string name="gem_for_gold_description">Ponieważ jesteś abonentem Habitiki, możesz co miesiąc kupić, za złoto, pewną ilość klejnotów.</string>
-  <string name="limited_count">%d zostało</string>
   <string name="gem_shop">Diament</string>
   <string name="mystery_item">Mistyczny Przedmiot</string>
   <string name="myster_item_notes">Każdego miesiąca, abonenci dostają tajemniczy przedmiot. Jest on zazwyczaj wydawany około tydzień przed końcem miesiąca.</string>
   <string name="open">Otwórz</string>
-  <string name="notification_mystery_item">Otwórz pudełko i znajdź %s!</string>
   <string name="checkInRewardEarned">Zdobyłeś %1$s jako nagrodę za poświęcenie w poprawie swojego życia.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Następna nagroda za %1$d wizyt</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Twoja następna nagroda zostanie odblokowana za %1$d wizyt</string>
   <string name="pending_approval">oczekująca aprobata</string>
   <string name="filters">Filtry</string>
   <string name="done">Zrobione</string>
-  <string name="group_tasks_edit_description">Grupowe zadanie nie mogą być edytowane.</string>
-  <string name="group_tasks_edit_title">Nie możesz edytować tego zadania</string>
   <string name="groups">Grupy</string>
   <string name="all">Wszystkie</string>
   <string name="none">Żadne</string>
   <string name="owned">Posiadane</string>
   <string name="not_owned">Nieposiadane</string>
-  <string name="new_game">Nowa\nGra</string>
   <string name="login_btn_fb">Zaloguj z Facebookiem</string>
   <string name="login_btn_google">Zaloguj z Google</string>
   <string name="action_back">Wróć</string>
@@ -531,12 +409,11 @@
   <string name="empty_title_todos">Nie posiadasz żadnych Do-Zrobienia</string>
   <string name="empty_description_todos">Do-Zrobienia są jednokrotnymi zadaniami. Dodaj listy kontrolne do swoich Do-Zrobienia, aby zwiększyć ich wartość.</string>
   <string name="empty_title_rewards">Nie posiadasz żadnych nagród</string>
-  <string name="reset_walkthrough">Zresetuj Przewodniki</string>
-  <string name="read_community_guidelines">Przejrzyj nasze <u>Wytyczne Społeczności</u> zanim umieścisz posta</string>
+  <string name="reset_walkthrough">Zresetuj przewodnik Justina</string>
+  <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
   <string name="maintenance">Utrzymanie</string>
   <string name="reload_content">Odśwież zawartość</string>
   <string name="dailyDueDefaultView">Ustaw codzienne ‘dzisiejsze’ jako domyślne</string>
-  <string name="repeat_summary">Powtarzaj %1$s co %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Twoje urządzenie nie posiada żadnych wspieranych metod płatności. Aby kupić klejnoty, użyj strony internetowej Habitiki.</string>
   <string name="no_billing_subscriptions">Twoje urządzenie nie posiada żadnych wspieranych metod płatności. Aby wykupić subskrypcję, użyj strony internetowej Habitiki.</string>
   <string name="save">Zapisz</string>
@@ -549,37 +426,34 @@
   <string name="new_challenge_title">Tytuł nowego wyzwania</string>
   <string name="ownership">Własność</string>
   <string name="inn">Karczma</string>
-  <string name="system">System</string>
   <string name="start_quest">Rozpocznij nową misję</string>
   <string name="leave_party">Opuść drużynę</string>
   <string name="party_description">Opis drużyny</string>
   <string name="number_participants">%1$d Uczestników</string>
   <string name="welcome_back">Witaj ponownie</string>
-  <string name="yesterdaililes_prompt">Zaznacz wykonane wczoraj Codzienne:</string>
+  <string name="yesterdaililes_prompt">Czy wykonałeś wczoraj któreś z tych Codziennych?</string>
   <string name="start_day">Rozpocznij mój dzień</string>
   <string name="leave_party_confirmation">Jesteś pewien, że chcesz opuścić drużynę ?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Następna nagroda za %d wizyt</string>
   <string name="pending">Oczekujące</string>
   <string name="accepted">Zaakceptowane</string>
   <string name="declined">Odrzucone</string>
   <string name="participants">Uczestnicy</string>
   <string name="invitations">Zaproszenia</string>
-  <string name="quest_leader_header" formatted="false">Rozpoczęta przez %s</string>
+  <string name="quest_leader_header">Rozpoczęta przez %s</string>
   <string name="reloading_content">Odświeżanie zawartości</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Twoje saldo:</string>
-  <string name="available_until" formatted="false">Dostępne do %s</string>
-  <string name="gems_left_nomax" formatted="false">Miesięczne Klejnoty: pozostało %d</string>
+  <string name="available_until">Dostępne do %s</string>
+  <string name="gems_left_nomax">Miesięczne Klejnoty: pozostało %d</string>
   <string name="health">Zdrowie</string>
   <string name="collect">Zbierz</string>
   <string name="rage_meter">Wskaźnik szału</string>
   <string name="boss_quest">Misja z bossem</string>
   <string name="collection_quest">Misja zbieracka</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d punktów doświadczenia</string>
-  <string name="gold_reward" formatted="false">%d Złoto</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d punktów doświadczenia</string>
+  <string name="gold_reward">%d Złoto</string>
   <string name="quest_owner_rewards">Nagroda dla właściciela misji</string>
   <string name="str_abbrv">Sił</string>
   <string name="per_abbrv">Per</string>
@@ -587,13 +461,11 @@
   <string name="con_abbrv">Kon</string>
   <string name="reset_account">Zresetuj konto</string>
   <string name="delete_account">Usuń konto</string>
-  <string name="reset_account_confirmation">Zresetuj moje konto</string>
+  <string name="reset_account_confirmation">zresetuj moje konto</string>
   <string name="delete_account_confirmation">Usuń moje konto</string>
   <string name="danger_zone">Strefa zagrożenia</string>
-  <string name="nevermind">Nieważne</string>
   <string name="resetting_account">Resetowanie konta</string>
   <string name="deleting_account">Usuwanie konta</string>
-  <string name="insufficientGold">Musisz wykonać więcej zadań, zanim będzie Cię stać na ten przedmiot!</string>
   <string name="insufficientGoldTitle">Za mało złota</string>
   <string name="insufficientGems">Potrzebujesz więcej klejnotów by kupić ten przedmiot!</string>
   <string name="purchase_gems">Kup klejnoty</string>
@@ -621,7 +493,6 @@
   <string name="authentication_summary">Zmień swoje ustawienia uwierzytelniania.</string>
   <string name="change_password">Zmień hasło</string>
   <string name="change_email">Zmień adres email</string>
-  <string name="change_login_name">Zmień swoją nazwę login</string>
   <string name="change">Zmień</string>
   <string name="character_level">Poziom postaci</string>
   <string name="auto_allocate_points">Automatyczne przydzielanie punktów</string>
@@ -636,7 +507,7 @@
   <string name="distribute_class">Rozdzielaj w oparciu o klasę</string>
   <string name="distribute_task">Rozdzielaj na podstawie zadań</string>
   <string name="no_points_to_allocate">Brak punktów do przydzielenia</string>
-  <string name="points_to_allocate" formatted="false">%d punkty do przydzielenia</string>
+  <string name="points_to_allocate">%d punkty do przydzielenia</string>
   <string name="distribute_evenly_help">Przydziel taka samą liczbę punktów do każdego atrybutu.</string>
   <string name="distribute_class_help">Przydziel więcej punktów do atrybutów ważnych dla twojej Klasy.</string>
   <string name="allocating_points">Przydzielanie Punktów</string>
@@ -644,8 +515,6 @@
   <string name="classless">Bez klasy</string>
   <string name="class_equipment_shop_dialog">Ten przedmiot jest dostępny tylko dla konkretnej klasy. \nMożesz zmienić swoją klasę w Ustawieniach.</string>
   <string name="class_gear_disclaimer">Możesz kupić wyposażenie wyłącznie dla swojej obecnej klasy</string>
-  <string name="available_stats" formatted="false">%d punktów</string>
-  <string name="toogle_emojis">Włącz Emoji</string>
   <string name="tavern_description">Witaj w Karczmie! Usiądź wygodnie na krześle i pogadaj lub zrób sobie przerwę od swoich zadań.</string>
   <string name="check_into_inn">Zamelduj się w Karczmie</string>
   <string name="community_guidelines">Zasady Społeczności</string>
@@ -656,14 +525,12 @@
   <string name="player_tiers">Rangi Graczy</string>
   <string name="staff_moderators">Załoga i Moderatorzy</string>
   <string name="world_boss">Boss ogólnoświatowy</string>
-  <string name="world_boss_art">Obrazek bossa</string>
   <string name="boss_art">Obrazek bossa</string>
   <string name="world_boss_description">Opis Ogólnoświatowego Bossa</string>
-  <string name="rage_strike_count" formatted="false">Ataki Szału: %d/%d</string>
+  <string name="rage_strike_count">Ataki Szału: %d/%d</string>
   <string name="pending_strike_title">Oczekujący Atak</string>
   <string name="strike_description_title">Czym jest Atak Szału?</string>
-  <string name="strike_description_subtitle">Są 3 możliwe Ataki Szału</string>
-  <string name="strike_active_title" formatted="false">%s został zaatakowany!</string>
+  <string name="strike_active_title">%s został zaatakowany!</string>
   <string name="questShop">Sklep z Misjami</string>
   <string name="market_owner_long">Kupiec Alex</string>
   <string name="tavern_owner_long">Gospodarz Karczmy Daniel</string>
@@ -671,9 +538,7 @@
   <string name="hide_boss_art">Ukryj Obrazek Bossa</string>
   <string name="active_world_boss">Aktywny Boss Ogólnoświatowy</string>
   <string name="no_party_title">Graj w Habitikę w Drużynie</string>
-  <string name="insufficientSubscriberGemsTitle">Miesięczny limit Klejnotów osiągnięty</string>
-  <string name="world_boss_action_prompt" formatted="false">Pokonaj Bossa by zdobyć specjalne nagrody i uratować Habitikę od terroru %s!</string>
-  <string name="world_boss_description_subtitle">%sataki!</string>
+  <string name="world_boss_action_prompt">Pokonaj Bossa by zdobyć specjalne nagrody i uratować Habitikę od terroru %s!</string>
   <string name="questShop_owner_long">Ian Przewodnik Misji</string>
   <string name="seasonalShop_owner_long">Sezonowa Czarodziejka</string>
   <string name="rage_attack">Atak szału:</string>
@@ -683,26 +548,21 @@
     <string name="ago_1hour">1 godzinę temu</string>
     <string name="invite_username_description">Jeśli masz już znajomych, którzy korzystają z Habitiki, zaproś ich, używając ich nazwy użytkownika tutaj.</string>
     <string name="create_challenge">Stwórz wyzwanie</string>
-    <string name="edit_challenge">Edytuj</string>
-    <string name="loading">Ładowanie…</string>
-    <string name="insufficientGold">Musisz najpierw wykonać więcej zadań, zanim będzie Cię stać na ten przedmiot!</string>
+  <string name="insufficientGold">Musisz najpierw wykonać więcej zadań, zanim będzie Cię stać na ten przedmiot!</string>
     <string name="change_username">Zmień nazwę użytkownika</string>
-    <string name="id_copied">ID skopiowane do schowka</string>
-    <string name="report">Zaraportuj</string>
-    <string name="like">Lubię to</string>
-    <string name="reply">Odpowiedz</string>
+  <string name="report">Zaraportuj</string>
+  <string name="reply">Odpowiedz</string>
     <string name="challenge_categories">Kategorie Wyzwań</string>
     <string name="joined">Dołączono</string>
     <string name="public_challenge">Wyzwanie Publiczne</string>
     <string name="next_day_reminder_title">Czy odznaczyłeś swoje zadania dzisiaj\?</string>
-    <string name="moderator">Mod</string>
+    <string name="moderator">Moderator</string>
     <string name="expand_notes">Czytaj więcej</string>
     <string name="collapse_notes">Pokaż mniej</string>
     <string name="week_reminder_title">Jak Ci idzie z zadaniami\?</string>
     <string name="two_handed">Dwuręczna</string>
     <string name="usernamePromptTitle">Czas ustawić Twoją nazwę użytkownika!</string>
-    <string name="confirmUsername">Potwierdź nazwę użytkownika</string>
-    <string name="cancel">Anuluj</string>
+  <string name="cancel">Anuluj</string>
     <string name="confirm_username">Potwierdź nazwę użytkownika</string>
     <string name="username_not_confirmed">Nazwa użytkownika nie została potwierdzona</string>
     <string name="username_confirmed">Nazwa użytkownika została potwierdzona</string>
@@ -715,20 +575,20 @@
     <string name="discover">Odkryj</string>
     <string name="preference_push_important_announcements">Ważne Ogłoszenia</string>
     <string name="faint_penalty_body">Straciłeś poziom, złoto i przedmiot z wyposażenia, ale możesz je odzyskać poprzez ciężką pracę! Powodzenia — uda ci się.</string>
-    <string name="reminder_title">Pamiętaj aby zaznaczyć swoje zadania</string>
+    <string name="reminder_title">Pamiętaj aby odznaczyć swoje zadania</string>
     <string name="ago_minutes">%d minut temu</string>
     <string name="ago_hours">%d godzin temu</string>
-    <string name="evolved_pet_title">Udało ci się oswoić %s, idź na przejażdżkę!</string>
+    <string name="evolved_pet_title">Oswoiłeś %s, idź na przejażdżkę!</string>
     <string name="opting_out_progress">Wycofywanie się</string>
     <string name="subscription_duration_norenew">Na %s</string>
-    <string name="subscribe.listitem2.description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
+    <string name="subscribe_listitem2_description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
 \n
 \nDodatkowo, za każde trzy miesiące ciągłej subskrypcji, Tajemniczy Podróżnicy w Czasie zapewnią ci dostęp do historycznych (i futurystycznych!) przedmiotów kosmetycznych.</string>
-    <string name="subscribe.listitem4.description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
-    <string name="subscribe1month.gemcap">Limit 25 klejnotów</string>
-    <string name="subscribe3month.gemcap">Limit 3 klejnotów</string>
-    <string name="subscribe6month.gemcap">Limit 35 klejnotów</string>
-    <string name="subscribe12month.gemcap">Limit 45 klejnotów</string>
+    <string name="subscribe_listitem4_description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
+    <string name="subscribe1month_gemcap">Limit 25 klejnotów</string>
+    <string name="subscribe3month_gemcap">Limit 3 klejnotów</string>
+    <string name="subscribe6month_gemcap">Limit 35 klejnotów</string>
+    <string name="subscribe12month_gemcap">Limit 45 klejnotów</string>
     <string name="due">Do</string>
     <string name="join_a_challenge">Dołącz do wyzwania aby dodać wybrany zastaw zadań do twojej listy i rywalizuj z innymi Habitikanami aby zdobyć osiągnięcia a nawet klejnoty!</string>
     <string name="welcome_text">Oh, musisz byś to nowy. Jestem Justin, będę twoim przewodnikiem po Habitice.
@@ -739,16 +599,14 @@
     <string name="dailyDueDefaultViewDescription">Włączenie opcji powoduje wyświetlanie zadań ‘dzisiejszych’ zamiast ‘wszystkich’</string>
     <string name="gem_reward">Nagroda w klejnotach</string>
     <string name="identify_your_challenge_with_a_tag">Określ wyzwanie krótką nazwą</string>
-    <string name="abort_confirmation">Czy na pewno chcesz przerwać tę misję\? Zostanie ona przerwana u wszystkich uczestników z twojej drużyny a cały postęp zostanie utracony. Zwój misji zostanie zwrócony do właściciela.</string>
-    <string name="leave_quest_confirmation">Czy na pewno chcesz opuścić trwającą misję\? Cały twój postęp w misji zostanie utracony.</string>
-    <string name="gems_left_max" formatted="false">Miesięczne Klejnoty: pozostało %1$d/%2$d</string>
+  <string name="gems_left_max">Miesięczne Klejnoty: pozostało %1$d/%2$d</string>
     <string name="forgot_password_confirmation">Instrukcja dotyczącą ustawiania nowego hasła zostanie wysłana na e-mail, o ile został on ustawiony w profilu.</string>
-    <string name="strike_active_description" formatted="false">Nasz ukochany %s został zdewastowany, gdy %s roztrzaskał %s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
+    <string name="strike_active_description">Nasz ukochany %s został zdewastowany, gdy %s roztrzaskał %s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
     <string name="equipment_str">SIŁ:</string>
     <string name="equipment_con">KON:</string>
     <string name="equipment_int">INT:</string>
     <string name="equipment_per">PER:</string>
-    <string name="warrior_description">Wojownicy zdobywają częstsze uderzenia krytyczne oraz zadają ciężkie obrażenia bossom. Graj jako Wojownik, jeżeli chcesz łatwo pokonywać potwory! Wojownik korzysta z wysokich punktów Siły.</string>
+    <string name="warrior_description">Wojownicy zdobywają częstsze i lepsze uderzenia krytyczne, które losowo dają dodatkowe złoto, doświadczenie i szansę na zdobycze, za wykonanie zadania. Zadają oni też duże obrażenia bossom. Graj jako Wojownik, jeżeli motywują cię nieprzewidywalne, losowe nagrody, albo jeśli chcesz zadawać duże obrażenia w misjach z bossem!</string>
     <string name="daily_tip_5">Weź kilka głębokich oddechów, aby się dobrze skupić. Dasz radę!</string>
     <string name="daily_tip_8">Możesz zmienić trudność zadania, żeby uzyskać większe nagrody za trudniejsze zadania!</string>
     <string name="staff">Personel</string>
@@ -760,7 +618,7 @@
   <string name="no_notifications_title">Teraz jesteś na bieżąco!</string>
   <string name="no_notifications_text">Wróżki powiadomień składają ci gromkie brawa. Dobra robota!</string>
   <string name="dismiss_all">Odrzuć wszystko</string>
-  <string name="new_bailey_update">Nowości od Bailey!</string>
+  <string name="new_bailey_update">Nowości od Bailey</string>
   <string name="new_msg_guild"><![CDATA[<b>%1$s</b> ma nowe posty]]></string>
   <string name="new_msg_party"><![CDATA[Twoja drużyna <b>%1$s</b> ma nowe posty]]></string>
   <string name="unallocated_stats_points"><![CDATA[Masz <b>nieprzydzielone Punkty Atrybutów: %1$s</b>]]></string>
@@ -769,33 +627,4 @@
   <string name="invited_to_private_guild"><![CDATA[Zostałeś/aś zaproszony/a do prywatnej Gildii <b>%1$s</b>]]></string>
   <string name="invited_to_public_guild"><![CDATA[Zostałeś/aś zaproszony/a do Gildii <b>%1$s</b>]]></string>
   <string name="invited_to_quest"><![CDATA[Zostałeś/aś zaproszony/a do Misji <b>%1$s</b>]]></string>
-<string name="sectionwacky">Zwariowane</string>
-    <string name="x_months">%d Miesięcy</string>
-    <string name="reset_account_description">UWAGA! Resetowanie dotyczy różnych części twojego konta. Jest to wysoce niezalecane, chociaż niektórzy mogą uznać to za przydatne na początku przygody, gdy grali przez krótki czas.
-\n
-\nStracisz wszystkie poziomy, złoto i punkty doświadczenia. Wszystkie twoje zadania (z wyjątkiem tych z wyzwań) zostaną bezpowrotnie usunięte oraz utracisz wszystkie historyczne dane. Stracisz również cały swój ekwipunek, ale będziesz mógł go ponownie kupić, włączając wszystkie limitowane edycje, tajemnicze przedmioty subskrybenta (musisz mieć odpowiednią klasę, żeby odkupić ekwipunek specyficzny dla klasy). Zachowasz swoją obecną klasę, swoje zwierzęta i wierzchowce. Zamiast tego resetowania możesz skorzystać z Kuli Odrodzenia, która jest znacznie bezpieczniejszą opcją i która pozwala zachować twoje zadania i ekwipunek.</string>
-    <string name="delete_account_description">Jesteś pewna/y\? Spowoduje to usunięcie konta na zawsze i nie będzie możliwości jego przywrócenia! Aby ponownie korzystać z Habitica trzeba będzie zarejestrować nowe konto. Bankowe lub wydane klejnoty nie będą zwrócone. Jeśli masz całkowitą pewność, wpisz poniżej swoje hasło.</string>
-    <string name="delete_oauth_account_description">Jesteś pewna/y\? Spowoduje to usunięcie konta na zawsze i nie będzie możliwości jego przywrócenia! Aby ponownie korzystać z Habitica trzeba będzie zarejestrować nowe konto. Bankowe lub wydane klejnoty nie będą zwrócone. Jeśli masz całkowitą pewność, wpisz DELETE do poniższego pola tekstowego.</string>
-    <string name="seasonal_closed_description">Wielkie Gale mają miejsce w pobliżu przesilenia i równonocy, więc zajrzyj tu później aby znaleźć zabawny asortyment specjalnych przedmiotów sezonowych!</string>
-    <string name="subscribe_for_hourglasses">Subskrybuj w celu uzyskania Klepsydr</string>
-    <string name="character_build">Rozwój postaci</string>
-    <string name="character_build_description">Każdy zdobyty poziom daje Ci jeden punkt, który możesz przydzielić do wybranego przez siebie atrybutu. Możesz zrobić to ręcznie lub pozwolić, by gra zdecydowała za Ciebie, używając jednej z opcji automatycznego przydzielania.</string>
-    <string name="strength_description">Zwiększa premię za trafienia krytyczne i podwyższa ich prawdopodobieństwo przy zaliczaniu zadania. Również podwyższa obrażenia zadawane bossom.</string>
-    <string name="intelligence_description">Zwiększa PD otrzymane za wykonanie zadania. Zwiększa również maksymalną ilość many i szybkość regeneracji many w czasie.</string>
-    <string name="constitution_description">Zmniejsza ilość obrażeń otrzymanych z zadań. Nie zmniejsza jednak obrażeń zadanych przez bossów.</string>
-    <string name="perception_description">Zwiększa prawdopodobieństwo znajdowania przedmiotów przy kończeniu zadań, limit przedmiotów do zdobycia w ciągu dnia, premii za ciągłość wykonania zadań i ilość złota zdobywanego za zadania.</string>
-    <string name="distribute_task_help">Przydziela punkty w oparciu o kategorie Siły, Inteligencji, Kondycji oraz Percepcji przydzielone zadaniom, które wykonujesz.</string>
-    <string name="equipment_empty">Masz już całe wyposażenie! Spodziewaj się kolejnych przedmiotów, które będą dodawane podczas Wielkich Gali zaczynających się w okolicach równonocy i przesileń.</string>
-    <string name="join_party_description">Przekaż członkowi grupy poniższą nazwę użytkownika, aby mógł Ci wysłać zaproszenie</string>
-    <string name="sidebar_achievements">Osiągnięcia</string>
-    <string name="basic_achievements">Podstawowe Osiągnięcia</string>
-    <string name="seasonal_achievements">Sezonowe Osiągnięcia</string>
-    <string name="special_achievements">Specjalne Osiągnięcia</string>
-    <string name="switch_to_list_view">Przełącz na widok listy</string>
-    <string name="switch_to_grid_view">Przełącz na widok tabeli</string>
-    <string name="confirm_deletion">Potwierdź usunięcie</string>
-    <string name="new_task">Nowe zadanie</string>
-    <string name="create_task">Utwórz %s</string>
-    <string name="details">Szczegóły</string>
-    <string name="share_challenge_with">Udostępnij wyzwanie</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
index c561e157d..3536adfcf 100644
--- a/Habitica/res/values-pt-rBR/strings.profile.xml
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_qrcode_close">Fechar</string>
 
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml
index e1a3da91f..081e2bdc5 100644
--- a/Habitica/res/values-pt-rBR/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tarefas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Mensagens</string>
-  <string name="sidebar.tavern">Taverna</string>
-  <string name="sidebar.party">Grupo</string>
-  <string name="sidebar.purchaseGems">Gemas &amp; Inscrição</string>
-  <string name="sidebar.guilds">Guildas</string>
-  <string name="sidebar.challenges">Desafios</string>
-  <string name="sidebar.section.inventory">Inventário</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipamento</string>
-  <string name="sidebar.stable">Estábulo</string>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Configurações</string>
-  <string name="sidebar.about">Sobre</string>
+  <string name="sidebar_tasks">Tarefas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_inbox">Mensagens</string>
+  <string name="sidebar_tavern">Taverna</string>
+  <string name="sidebar_party">Grupo</string>
+  <string name="sidebar_purchaseGems">Gemas &amp; Inscrição</string>
+  <string name="sidebar_guilds">Guildas</string>
+  <string name="sidebar_challenges">Desafios</string>
+  <string name="sidebar_section_inventory">Inventário</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipamento</string>
+  <string name="sidebar_stable">Estábulo</string>
+  <string name="sidebar_news">Noticias</string>
+    <string name="sidebar_about">Sobre</string>
   <string name="sidebar_shops">Compras</string>
   <string name="sidebar_stats">Atributos</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.tutorial.xml b/Habitica/res/values-pt-rBR/strings.tutorial.xml
index d7554d12a..80bcb9e36 100644
--- a/Habitica/res/values-pt-rBR/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rBR/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Compre equipamento para seu personagem com o ouro que você ganha!</string>
   <string name="tutorial_rewards_2">Você também pode fazer recompensas reais personalizadas baseadas em o que motiva você.</string>
   <string name="tutorial_tasks_complete">Isso é tudo por enquanto. Se você precisa de um lembrete, cheque a seção de Perguntas Frequentes.</string>
-  <string name="tutorial_equipment">Quando você compra equipamentos, eles aparecem aqui. Seu Equipamento de Batalha afeta seus status e suas Fantasias (se habilitadas) afetam o que o seu avatar veste.</string>
-  <string name="tutorial_items">Obtenha itens ao completar tarefas e subir de nível. Selecione um item para usá-lo!</string>
-  <string name="tutorial_pets">Ao completar tarefas do mundo real, você tem uma chance aleatória de encontrar ovos e poções. Combine-os para obter mascotes</string>
-  <string name="tutorial_skills">Habilidades são especiais e têm efeitos poderosos! Selecione uma Habilidade para usá-la. Isso vai consumir Mana (a barra azul), que você consegue usando o Habitica todos os dias e completando suas tarefas da vida real. Confira as Perguntas Frequentes no menu para mais informações!</string>
+    <string name="tutorial_skills">Habilidades são especiais e têm efeitos poderosos! Selecione uma Habilidade para usá-la. Isso vai consumir Mana (a barra azul), que você consegue usando o Habitica todos os dias e completando suas tarefas da vida real. Confira as Perguntas Frequentes no menu para mais informações!</string>
   <string name="tutorial_party">É aqui que você e seus amigos podem se ajudar em seus objetivos e lutar contra monstros usando suas tarefas!</string>
-  <string name="tutorial_tavern">Seja bem vindo à Taberna, uma sala de bate-papo pública e para todas as idades! Aqui você pode conversar sobre produtividade e fazer perguntas. Divirta-se!</string>
-  <string name="tutorial_classes">Escolha se será um Guerreiro, Mago, Curandeiro ou Andarilho. Cada classe tem Equipamentos e Habilidades únicos. Selecione (?) para saber mais! </string>
-  <string name="tutorial_stats">Toque no botão cinza para alocar todos seus atributos de uma vez ou toque nas setas para adicionar um ponto de cada vez.</string>
+  <string name="tutorial_tavern">Seja bem-vindo à Taberna, uma sala de bate-papo pública e para todas as idades! Aqui você pode conversar sobre produtividade e fazer perguntas. Divirta-se!</string>
+    <string name="tutorial_stats">Toque no botão cinza para alocar todos seus atributos de uma vez ou toque nas setas para adicionar um ponto de cada vez.</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index c8ecbc1c3..197e4c8e9 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferências não puderam ser carregadas do código de barras</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Configurações</string>
-  <string name="SP_address_hint">Seu servidor personalizado</string>
-  <string name="SP_userID_title">ID de usuário</string>
+    <string name="SP_userID_title">ID de usuário</string>
   <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 QR Code</string>
-  <string name="PS_contact_title">Contate-me</string>
-  <string name="unknown_error">Aconteceu um erro…</string>
-  <string name="pref_account_header">Conta</string>
+    <string name="PS_contact_title">Contate-me</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 Hora do Lembrete</string>
   <string name="pref_cds_header">Início do Dia Personalizado</string>
-  <string name="pref_cds_picker">Definir Início do Dia Personalizado</string>
-  <string name="pref_push_notifications_checkbox">Notificações Push</string>
+    <string name="pref_push_notifications_checkbox">Notificações Push</string>
   <string name="push_notifications">Notificações Push</string>
   <string name="push_notifications_sum">Configurar suas notificações push</string>
   <string name="preference_push_you_won_challenge">Você venceu um Desafio!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Sua missão começou</string>
   <string name="preference_push_invited_to_quest">Convidado para uma missão</string>
   <!--Adding tasks-->
-  <string name="task_value">Valor</string>
-  <string name="new_todo">Novo Afazer</string>
-  <string name="new_reward">Nova Recompensa</string>
-  <string name="new_daily">Nova Diária</string>
-  <string name="new_habit">Novo Hábito</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Deletar</string>
-  <string name="action_cancel">Cancelar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Entrar</string>
   <string name="register_btn">Registrar</string>
   <string name="username">Usuário</string>
@@ -54,55 +43,35 @@
   <string name="confirmpassword">Confirmar senha</string>
   <string name="logout">Sair</string>
   <string name="logout_description">Sair da sua conta</string>
-  <string name="account_details">Detalhes da Conta</string>
-  <string name="LoginActivityName">Bem-vindo</string>
-  <string name="string_revive">Reviver</string>
-  <string name="please_connect">Por favor conecte-se pela aplicação antes de usar um widget</string>
-  <string name="about.title">Sobre</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Histórico de versão</string>
-  <string name="about.habitica_open_source">Habitica está disponível como software de código aberto no Github</string>
-  <string name="about.rate_our_app">Avalie nosso Aplicativo</string>
-  <string name="about.give_us_feedback">Nos envie Feedback!</string>
-  <string name="about.bugreport">Reportar um Erro</string>
-  <string name="about.source_code">Código Fonte</string>
-  <string name="repeatEvery">Repete a Cada</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erro de Conexão</string>
-  <string name="network_error_no_network_body">Você não está conectado(a) à internet.</string>
-  <string name="internal_error_api">Problemas de conexão com o servidor</string>
+    <string name="LoginActivityName">Bem-vindo</string>
+    <string name="about_title">Sobre</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">Habitica está disponível como software de código aberto no Github</string>
+  <string name="about_rate_our_app">Avalie nosso Aplicativo</string>
+  <string name="about_give_us_feedback">Nos envie Feedback!</string>
+  <string name="about_bugreport">Reportar um Erro</string>
+  <string name="about_source_code">Código Fonte</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Parece haver um problema com o servidor. Tente novamente mais tarde.</string>
   <string name="authentication_error_title">Erro de Autenticação</string>
-  <string name="authentication_error_body">Seu usuário e/ou senha estavam errados.</string>
-  <string name="login_validation_error_title">Erro de Validação</string>
+    <string name="login_validation_error_title">Erro de Validação</string>
   <string name="login_validation_error_fieldsmissing">Você precisa preencher todos os campos.</string>
   <string name="save_changes">Salvar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificuldade</string>
+    <string name="difficulty">Dificuldade</string>
   <string name="tags">Marcadores</string>
   <string name="trivial">Trivia</string>
   <string name="easy">Fácil</string>
   <string name="medium">Médio</string>
   <string name="hard">Dificil</string>
   <string name="start_date">Data de inicio</string>
-  <string name="positive_habit_form">Positivo</string>
-  <string name="negative_habit_form">Negativo</string>
+  <string name="positive_habit_form">Positivo ( + )</string>
+  <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Lista</string>
   <string name="reminders">Lembretes</string>
-  <string name="actions">Ações</string>
-  <string name="attributes">Atributos</string>
-  <string name="physical">Força</string>
-  <string name="mental">Inteligência</string>
-  <string name="social">Constituição</string>
-  <string name="other">Percepção</string>
-  <string name="frequency">Frequência</string>
-  <string name="frequency_weekly">Em Certos Dias da Semana</string>
-  <string name="frequency_daily">A cada X Dias</string>
-  <string name="repeatables_summary_title">Sumário</string>
-  <string name="repeatables_title">Repete</string>
-  <string name="repeatables_on_title">Repete em</string>
-  <string name="repeatables_frequency_daily">Diário</string>
+    <string name="attributes">Atributos</string>
+    <string name="repeatables_frequency_daily">Diário</string>
   <string name="repeatables_frequency_weekly">Semanal</string>
   <string name="repeatables_frequency_monthly">Mensal</string>
   <string name="repeatables_frequency_yearly">Anual</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Sua vida caiu abaixo de zero!</string>
   <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">%d PM</string>
-  <string name="used_skill">Você usou %1$s, custando %2$d mana.</string>
-  <string name="used_skill_without_mana">Você usou %1$s.</string>
+    <string name="used_skill_without_mana">Você usou %1$s.</string>
   <string name="new_checklist_item">Novo item de Lista</string>
-  <string name="add_checklist_item">Adicionar</string>
-  <string name="reminder_title">Lembre-se de marcar suas Diárias</string>
-  <string name="skill_progress_title">Usando Habilidade</string>
-  <string name="coming_soon">Em Breve</string>
-  <string name="chat_flag_confirmation">Você tem certeza que quer reportar esta mensagem por violação?</string>
-  <string name="flag_confirm">Reportar Mensagem</string>
-  <string name="unlock_lvl_11">Desbloqueie no nível 11</string>
-  <string name="no_party_message">Você não está em um grupo. Para entrar em um grupo, por favor visite o site.</string>
-  <string name="forgot_pw_btn">Esqueci a senha</string>
-  <string name="tavern.inn.checkOut">Reativar Diárias</string>
-  <string name="tavern.inn.rest">Pausar Diárias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Desfazer</string>
+    <string name="reminder_title">Lembre-se de marcar suas Diárias</string>
+    <string name="unlock_lvl_11">Desbloqueie no nível 11</string>
+    <string name="forgot_pw_btn">Esqueci a senha</string>
+  <string name="tavern_inn_checkOut">Reativar Diárias</string>
+  <string name="tavern_inn_rest">Pausar Diárias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Desfazer</string>
   <string name="party">Grupo</string>
   <string name="chat">Bate-papo</string>
   <string name="members">Membros</string>
@@ -148,24 +108,20 @@
   <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>
-  <string name="yes">Sim</string>
+    <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="quest">Missão</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Cabelo</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Pele</string>
-  <string name="avatar_ears">Orelhas de Animal</string>
-  <string name="avatar_base">Básico</string>
+    <string name="avatar_base">Básico</string>
   <string name="avatar_color">Cor</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigode</string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Franja</string>
-  <string name="avatar_nothing">Nada selecionado</string>
-  <string name="avatar_size">Tamanho</string>
+    <string name="avatar_size">Tamanho</string>
   <string name="avatar_size_slim">Magro</string>
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Cenário</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Comprar</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>
-  <string name="quest.begin">Iniciar Missão</string>
-  <string name="quest.cancel">Cancelar Convite</string>
-  <string name="quest.abort">Abortar Missão</string>
-  <string name="quest.leave">Abandonar Missão</string>
-  <string name="quest.pending">Pendente</string>
-  <string name="quest.accepted">Aceito</string>
-  <string name="quest.rejected">Rejeitado</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versão %1$s (%2$d)</string>
+  <string name="quest_accept">Aceitar</string>
+  <string name="quest_reject">Rejeitar</string>
+  <string name="quest_begin">Iniciar Missão</string>
+  <string name="quest_cancel">Cancelar Convite</string>
+  <string name="quest_abort">Abortar Missão</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_subtitle">Bem-vindo(a) ao</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">É hora de se divertir enquanto faz suas coisas. Junte-se a mais de%s pessoas melhorando suas vidas uma tarefa por vez.</string>
+    <string name="intro_1_description">É hora de se divertir enquanto faz suas coisas. Junte-se a mais de%s pessoas melhorando suas vidas uma tarefa por vez.</string>
   <string name="intro_2_subtitle">Progresso no jogo</string>
   <string name="intro_2_title">Progresso na vida</string>
   <string name="intro_2_description">Desbloqueie recursos no jogo ao completar suas tarefas da vida real. Ganhe armaduras, mascotes e mais como recompensas por atingir suas metas.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Socialize</string>
   <string name="intro_3_description">Mantenha suas metas sob controle com a ajuda de seus amigos. Ajudem-se na vida e na batalha enquanto melhoram juntos!</string>
   <string name="intro_finish_button">Vamos começar!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Próximo</string>
+    <string name="next_button">Próximo</string>
   <string name="skip_button">Pular</string>
-  <string name="setup_welcome_description">Bem vindo ao Habitica, onde avançar no jogo vai melhorar sua vida real! Completando metas do mundo real, você vai desbloquear equipamentos, mascotes, missões e mais.</string>
-  <string name="setup_welcome_title">Bem-vindo(a)</string>
-  <string name="avatar_setup_description">Então, como você quer se parecer? Não se preocupe, você pode mudar isso depois.</string>
+    <string name="avatar_setup_description">Então, como você quer se parecer? Não se preocupe, você pode mudar isso depois.</string>
   <string name="task_setup_description">Ótimo! Então, no que você está interessado em trabalhar ao longo desta jornada?</string>
   <string name="setup_group_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Estudar um guru</string>
   <string name="setup_task_creativity_2">Trabalhar em um projeto criativo</string>
   <string name="setup_task_creativity_3">Terminar um projeto criativo</string>
-  <string name="gem.purchase.support">Quer nos ajudar a manter o Habitica funcionando? Você pode contribuir com os desenvolvedores ao comprar gemas!\n\nGemas permitem que você compre extras legais para sua conta, incluindo:  \n\n - Fantasias legais para seu avatar\n - Cenários\n - Missões divertidas que te recompensam com ovos\n - A habilidade de mudar de classe antes do nível 100\n\n Muito obrigado por nos ajudar a manter o Habita o melhor possível. Sua ajuda significa muito para nós!</string>
-  <string name="my_guilds">Minhas Guildas</string>
+    <string name="my_guilds">Minhas Guildas</string>
   <string name="public_guilds">Guildas Públicas</string>
   <string name="guild">Guildas</string>
   <string name="leave">Sair</string>
   <string name="join">Entrar</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como Afazer</string>
-  <string name="send_pm">Enviar Inbox</string>
-  <string name="flag">Reportar</string>
-  <string name="delete">Excluir</string>
+    <string name="gems">Gemas</string>
+    <string name="delete">Excluir</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
   <string name="add_tag">Adicionar nova etiqueta</string>
   <string name="privacy">Privacidade</string>
   <string name="write_message">Escrever Mensagem</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Procurar Guildas</string>
-  <string name="todo_due">Data limite: %s</string>
-  <string name="daily_streak">Combo atual: %d</string>
-  <string name="todo_has_duedate">Tarefa com Data</string>
-  <string name="battle_gear">Equipamento de Batalha</string>
+    <string name="guild_search_hint">Procurar Guildas</string>
+    <string name="battle_gear">Equipamento de Batalha</string>
   <string name="costume">Traje</string>
   <string name="outfit_head">Cabeça</string>
   <string name="outfit_headAccessory">Acessório de Cabeça</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Habilitar Traje</string>
   <string name="equipped">Equipado</string>
   <string name="quest_cancel_message">Tem certeza que deseja cancelar esta missão? Todos os convites aceitos serão perdidos. O proprietário da missão manterá posse do pergaminho da missão.</string>
-  <string name="quest.invitation">Convite para Missão</string>
-  <string name="quest_begin_message">Tem certeza? Apenas %1$d de seus %2$d membros do grupo aceitaram esta missão! Missões iniciam automaticamente quando todos os jogadores tiverem aceitado ou rejeitado o convite.</string>
-  <string name="quest.invitation.text">Você foi convidado a participar de uma missão!</string>
-  <string name="ago_1day">1d atrás</string>
+    <string name="quest_begin_message">Tem certeza? Apenas %1$d de seus %2$d membros do grupo aceitaram esta missão! Missões iniciam automaticamente quando todos os jogadores tiverem aceitado ou rejeitado o convite.</string>
+    <string name="ago_1day">1d atrás</string>
   <string name="ago_days">%dd atrás</string>
   <string name="ago_1Minute">1min atrás</string>
   <string name="ago_minutes">%dmin atrás</string>
@@ -285,16 +221,12 @@
   <string name="quests">Missões</string>
   <string name="pets">Mascotes</string>
   <string name="mounts">Montarias</string>
-  <string name="armoireEquipment">Você encontrou %s no Armário</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">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">Vender (%d 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="hatch_egg">Chocar com ovo</string>
   <string name="invite_party">Convidar Grupo</string>
   <string name="dialog_feeding">Alimentar %s com:</string>
   <string name="use_animal">Usar</string>
@@ -305,17 +237,8 @@
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
   <string name="notification_pet_fed">Você alimentou seu %s!</string>
-  <string name="notification_purchase">Você comprou %s</string>
-  <string name="notification_purchase_reward">Você comprou uma recompensa</string>
-  <string name="sectiondrop">Base</string>
-  <string name="sectionpremium">Poção Mágica</string>
-  <string name="sectionquest">Missão</string>
-  <string name="sectionspecial">Especial</string>
-  <string name="sectionmounts">Base</string>
-  <string name="sectionpremiumMounts">Poção Mágica</string>
-  <string name="sectionquestMounts">Missão</string>
-  <string name="sectionspecialMounts">Especial</string>
-  <string name="world_quest">Missão Global</string>
+    <string name="notification_purchase_reward">Você comprou uma recompensa</string>
+    <string name="world_quest">Missão Global</string>
   <string name="inn_description">Precisa de um descanso? Faça uma visita à Pousada do Daniel e pare algumas das mecânicas de jogo mais difíceis do Habitica.
 • Diárias não feitas não lhe causarão dano
 • As tarefas não vão perder seus combos ou decair de cor
@@ -328,16 +251,15 @@
   <string name="rogue">Gatuno</string>
   <string name="mage">Mago</string>
   <string name="healer">Curandeiro</string>
-  <string name="warrior_description">Guerreiros obtêm mais acertos críticos e causam grandes danos aos Chefões. Jogue como Guerreiro se você quiser derrotar monstros facilmente! Guerreiro se beneficia com altos pontos de Força.</string>
-  <string name="mage_description">Magos aprendem Habilidades que causam danos aos Chefões, impulsionando Experiência e Mana. Jogue como Mago se você está motivado a passar de nível rapidamente. Magos se beneficiam com altos pontos de Inteligência.</string>
-  <string name="rogue_description">Ladinos aprendem Habilidades que permitem que eles e seu Grupo encontrem mais Ouro e itens aleatórios. Jogue como Ladino se você quiser muitos itens e Ouro! Ladinos se beneficiam com altos pontos de Percepção.</string>
-  <string name="healer_description">Curandeiros aprendem Habilidades que podem curar e proteger a si e ao seu Grupo. Jogue como Curandeiro se você gosta de ajudar os outros ou evitar danos! Curandeiros se beneficiam com altos pontos de Constituição.</string>
+  <string name="warrior_description">Guerreiros dão mais e melhores \\"danos críticos\\", o que aleatoriamente dá Ouro, Experiência e melhores chances de drop ao marcar uma tarefa. Eles também dão grandes danos a monstros. Jogue como guerreiro se você acha motivadoras recompensas imprevisíveis, como um caça-níqueis, ou quer arrasar nas missões de Chefão!</string>
+  <string name="mage_description">Magos aprendem rapidamente, ganhando Experiência e Níveis mais rápido que as outras classes. Eles também recebem bastante Mana para usar Habilidades especiais. Jogue como mago se você gosta dos aspectos táticos do jogo ou se você é fortemente motivado por subir de níveis e desbloquear recursos avançados!</string>
+  <string name="rogue_description">Ladinos adoram acumular riqueza, ganhar mais ouro que qualquer um e são adeptos de achar itens aleatórios. Suas icônicas habilidades furtivas os permitem evitar as consequências de suas Diárias não realizadas. Jogue como Gatuno se você encontra forte motivação nas Recompensas e Conquistas, esforçando-se por saques e medalhas!</string>
+  <string name="healer_description">Curandeiros odeiam danos e estendem esta proteção ao Grupo. Diárias não realizadas e maus Hábitos não os afetam muito e eles têm formas de recuperar Vida. Jogue como Curandeiro se você gosta de ajudar seu Grupo ou se a ideia de enganar a morte com trabalho duro te inspira!</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">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ê recebeu um novo Equipamento de Batalha padrão, que pode ser utilizado no menu Equipamentos!</string>
+  <string name="class_changed_description">Você tem o novo Equipamento de Batalha padrão, que você pode alterar em Equipamentos!</string>
   <string name="choose_class">Escolha sua Classe</string>
   <string name="dialog_go_back">Voltar</string>
   <string name="opt_out_confirmation">Você tem certeza que quer cancelar?</string>
@@ -349,24 +271,18 @@
   <string name="invite_existing_users">Convide usuários existentes</string>
   <string name="send">Enviar</string>
   <string name="invite">Convidar amigos</string>
-  <string name="invite_id_description">Se você tem amigos que já usam o Habitica, convide-os através do ID de Usuário aqui.</string>
-  <string name="invite_username_description">Se você já tem amigos usando o Habitica, convide-os pelo nome de usuário aqui.</string>
+    <string name="invite_username_description">Se você já tem amigos usando o Habitica, convide-os pelo nome de usuário aqui.</string>
   <string name="invite_email_description">Se um amigo entra no Habitica pelo seu e-mail, ele automaticamente é convidado ao seu grupo!</string>
   <string name="add_invites">Adicionar convites</string>
-  <string name="user_id">ID de usuário
-</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="email">E-mail</string>
+    <string name="share_using">Compartilhar via</string>
   <string name="share_levelup">Eu cheguei ao nível %d em Habitica, melhorando meus hábitos da 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 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">Mensagem de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
-  <string name="confirm">Confirmar</string>
+    <string name="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes do Tempo</string>
   <string name="seasonalShop">Loja Sazonal</string>
@@ -374,37 +290,16 @@
   <string name="party_invite">Desbloqueie ao convidar amigos</string>
   <string name="login_incentive">Desbloqueia ao logar regularmente no Habitica</string>
   <string name="create_account">Desbloqueia ao criar sua conta</string>
-  <string name="no_gold">Ouro insuficiente</string>
-  <string name="no_potion">Você não precisa comprar uma poção de vida</string>
-  <string name="successful_purchase">Comprado %1$s</string>
-  <string name="purchase_confirmation_title">Confirmar compra</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>
-  <string name="gold_singular">ouro</string>
-  <string name="gold_plural">ouros</string>
+    <string name="successful_purchase">Comprado %1$s</string>
+    <string name="gold_plural">ouros</string>
   <string name="chat_message_copied">Mensagem copiada para Área de Transferência</string>
-  <string name="copy_chat_message">Copiar para Área de Transferência</string>
-  <string name="edit_tag_title">Editar Etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Feito</string>
-  <string name="edit_tag_btn_delete">Deletar</string>
-  <string name="confirm_delete_tag_title">Você tem certeza?</string>
+    <string name="edit_tag_btn_edit">Editar</string>
+    <string name="confirm_delete_tag_title">Você tem certeza?</string>
   <string name="confirm_delete_tag_message">Você realmente quer deletar?</string>
-  <string name="filter_drawer_edit_tags">Editar Etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por Etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Deixe que te convidem com esse QR Code</string>
-  <string name="qr_save_message">QR Code salvo em</string>
-  <string name="qr_dialogue_title">Seu QR Code</string>
-  <string name="download">Baixar</string>
-  <string name="send_new_message">Enviar uma nova mensagem</string>
-  <string name="choose_recipient_title">Escolha o destinatário da mensagem</string>
+    <!--QR Strings-->
+    <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">Insira o ID de Usuário do convidado</string>
-  <string name="invited_to_party">Você foi convidado para um grupo!</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>
@@ -415,15 +310,14 @@
   <string name="widget_habit_button">Habitica Fazer Hábito</string>
   <string name="widget_dailies">Habitica Diárias</string>
   <string name="widget_todo_list">Lista de Afazeres do Habitica</string>
-  <string name="widget_add_task">Habitica Adicionar Tarefa</string>
-  <string name="google_services_missing">Servidores da Google Play não foram encontrados.</string>
-  <string name="gem.purchase.toolbartitle">Comprar</string>
-  <string name="gem.purchase.title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
-  <string name="gem.purchase.subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
-  <string name="gem.purchase.listitem1">Fantasias super legais para o seu avatar</string>
-  <string name="gem.purchase.listitem2">Cenários Super Legais</string>
-  <string name="gem.purchase.listitem3">Missões que recompensam você com ovos de mascotes</string>
-  <string name="gem.purchase.listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
+    <string name="google_services_missing">Servidores da Google Play não foram encontrados.</string>
+  <string name="gem_purchase_toolbartitle">Comprar</string>
+  <string name="gem_purchase_title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
+  <string name="gem_purchase_subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
+  <string name="gem_purchase_listitem1">Fantasias super legais para o seu avatar</string>
+  <string name="gem_purchase_listitem2">Cenários Super Legais</string>
+  <string name="gem_purchase_listitem3">Missões que recompensam você com ovos de mascotes</string>
+  <string name="gem_purchase_listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
   <string name="support_habitica">Contribua com o Habitica</string>
   <string name="skill_transformation_use">usar</string>
   <string name="hatching_market_info">Não conseguindo o drop certo? Dê uma olhada no Mercado!</string>
@@ -437,34 +331,34 @@
   <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_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">Quantidade máxima de drop duplicada</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">Quantidade máxima de drop duplicada</string>
   <string name="subscriptions">Assinaturas</string>
   <string name="subscription_duration">Acontece a cada %s</string>
   <string name="subscription_duration_norenew">Por%s</string>
   <string name="subscribe">Assinar</string>
-  <string name="subscribe.listitem1.description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
-  <string name="subscribe.listitem2.description">Cada mês você irá receber um item cosmético único para o seu personagem!
+  <string name="subscribe_listitem1_description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
+  <string name="subscribe_listitem2_description">Cada mês você irá receber um item cosmético único para o seu personagem!
 \n
 \nAlém disso, para cada três meses de inscrição, os Viajantes Misteriosos do Tempo irão te dar acesso a itens cosméticos históricos (e futuristas).</string>
-  <string name="subscribe.listitem3.description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
-  <string name="subscribe.listitem4.description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
-  <string name="subscribe1month.gemcap">Limite de 25 Gemas</string>
-  <string name="subscribe3month.gemcap">Limite de 30 Gemas</string>
-  <string name="subscribe6month.gemcap">Limite de 35 Gemas</string>
-  <string name="subscribe12month.gemcap">Limite de 45 Gemas </string>
+  <string name="subscribe_listitem3_description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
+  <string name="subscribe_listitem4_description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
+  <string name="subscribe1month_gemcap">Limite de 25 Gemas</string>
+  <string name="subscribe3month_gemcap">Limite de 30 Gemas</string>
+  <string name="subscribe6month_gemcap">Limite de 35 Gemas</string>
+  <string name="subscribe12month_gemcap">Limite de 45 Gemas </string>
   <string name="subscription_hourglasses">+%d Ampola Mística</string>
   <string name="payment_method">Método de pagamento</string>
   <string name="subscription">Assinatura</string>
   <string name="active">Ativo</string>
   <string name="due">Data de vencimento</string>
   <string name="cancel_subscription">Cancelar Assinatura</string>
-  <string name="cancel_subscription_google.description">Não quer mais ser Assinante\? Você pode achar a opção de Cancelar a Assinatura na seção \"Meus Apps\" da Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Não quer mais ser Assinante\? Devido ao seu método de pagamento, você precisará cancelar em nosso site. Para fazer isso, toque no botão abaixo, faça login na sua conta, toque no ícone do usuário no canto superior direito e vá para Assinatura. Nós sentiremos sua falta. Só e possível cancelar sua inscrição pelo site. Clique no botão abaixo para abrir o site no seu navegador!</string>
+  <string name="cancel_subscription_google_description">Não quer mais ser Assinante\? Você pode achar a opção de Cancelar a Assinatura na seção \"Meus apps\" no menu do Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Não quer mais ser Assinante\? Devido ao seu método de pagamento, você precisará cancelar em nosso site. Para fazer isso, toque no botão abaixo, faça login na sua conta, toque no ícone do usuário no canto superior direito e vá para Assinatura. Nós sentiremos sua falta. Só e possível cancelar sua inscrição pelo site. Clique no botão abaixo para abrir o site no seu navegador!</string>
   <string name="visit_habitica_website">Visite o site do Habitica</string>
   <string name="current_bonuses">Bônus Atuais</string>
   <string name="months_subscribed">Meses Assinando</string>
@@ -472,63 +366,47 @@
   <string name="monthly_gem_cap">Capacidade mensal de Gemas</string>
   <string name="inactive">Inativo</string>
   <string name="one_month">1 Mês</string>
-  <string name="months">Meses</string>
+  <string name="months">%d Meses</string>
   <string name="month">mês</string>
   <string name="three_months">3 meses</string>
   <string name="six_months">6 meses</string>
   <string name="twelve_months">12 meses</string>
   <string name="subscribe_prompt_thanks">Por Assinar você está recebendo estes úteis benefícios:</string>
   <string name="subscription_status">Status da Assinatura</string>
-  <string name="byLeader">em %s</string>
-  <string name="challenge_details">Detalhes do Desafio</string>
-  <string name="challenge_leave_title">Sair do Desafio</string>
+    <string name="challenge_leave_title">Sair do Desafio</string>
   <string name="challenge_leave_text">Tem certeza que deseja sair do Desafio “%s”?</string>
   <string name="challenge_remove_tasks_title">Remover tarefas</string>
   <string name="challenge_remove_tasks_text">Você quer remover as tarefas?</string>
   <string name="remove_tasks">Remover</string>
   <string name="keep_tasks">Manter</string>
   <string name="my_challenges">Meus Desafios</string>
-  <string name="public_challenges">Públicos</string>
-  <string name="challenges">Desafios</string>
-  <string name="daily">Diária</string>
+    <string name="daily">Diária</string>
   <string name="habit">Hábito</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="challenge">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="dont_keep_activities_warning">Parece que você tem a opção de Desenvolvedor \\"Não manter Atividades\\" ativa. Atualmente, esta opção causa problemas com o aplicativo Habitica, por isso sugerimos desativá-la.</string>
-  <string name="inbox">Mensagens</string>
-  <string name="FAQ">Perguntas Frequentes</string>
-  <string name="special">Especial</string>
+    <string name="inbox">Mensagens</string>
+    <string name="special">Especial</string>
   <string name="gem_for_gold_description">Por você ter Assinado o Habitica, você pode comprar um número de Gemas cada mês usando Ouro.</string>
-  <string name="limited_count">%d saiu</string>
-  <string name="gem_shop">Gema</string>
+    <string name="gem_shop">Gema</string>
   <string name="mystery_item">Item Misterioso</string>
   <string name="myster_item_notes">Cada mês, Assinantes irão receber um item misterioso. Isso é geralmente liberado cerca de uma semana antes do final do mês.</string>
   <string name="open">Abrir</string>
-  <string name="notification_mystery_item">Você abre a caixa e encontra %s!</string>
-  <string name="checkInRewardEarned">Você ganhou um %1$s como recompensa por sua devoção para melhorar sua vida.</string>
+    <string name="checkInRewardEarned">Você ganhou um %1$s como recompensa por sua devoção para melhorar sua vida.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Próximo prêmio em %1$d Check-Ins</string>
   <string name="pending_approval">aprovação pendente</string>
   <string name="filters">Filtros</string>
   <string name="done">Feito</string>
-  <string name="group_tasks_edit_description">Tarefas de grupo não podem ser editadas.</string>
-  <string name="group_tasks_edit_title">Não é possível editar esta tarefa</string>
-  <string name="groups">Grupos</string>
+    <string name="groups">Grupos</string>
   <string name="all">Todos</string>
   <string name="none">Nenhum</string>
   <string name="owned">Possuído</string>
   <string name="not_owned">Não possuído</string>
-  <string name="new_game">Novo\nJogo</string>
-  <string name="login_btn_fb">Logar com Facebook</string>
+    <string name="login_btn_fb">Logar com Facebook</string>
   <string name="login_btn_google">Logar com Google</string>
   <string name="action_back">Voltar</string>
   <string name="welcome_text">Oh, você deve ser novo aqui. Eu sou o Justin e serei seu guia no Habitica.\n\nPrimeiro, como devemos chamá-lo? Sinta-se livre para mudar o nome que eu havia escolhido. Quando você estiver com tudo definido, vamos criar seu avatar!</string>
@@ -554,13 +432,12 @@
   <string name="empty_title_todos">Você não tem nenhum Afazer</string>
   <string name="empty_description_todos">Afazeres são tarefas que só precisam ser completadas uma única vez. Adicione Listas aos seus Afazeres para aumentar o valor deles.</string>
   <string name="empty_title_rewards">Você não tem nenhuma Recompensa</string>
-  <string name="reset_walkthrough">Refazer Tutoriais</string>
-  <string name="read_community_guidelines">Consulte nossas <u>Diretrizes da comunidade</u> antes de postar</string>
+  <string name="reset_walkthrough">Refazer o Tutorial do Justin</string>
+  <string name="read_community_guidelines">Por favor leia as nossas Diretrizes de Comunidade antes de postar</string>
   <string name="maintenance">Manutenção</string>
   <string name="reload_content">Recarregar Conteúdo</string>
   <string name="dailyDueDefaultView">Diárias por padrão na aba \"Ativas\"</string>
   <string name="dailyDueDefaultViewDescription">Com esta opção habilitada, suas Diárias irão começar na aba \"Ativas\" em vez de \"Todas\",</string>
-  <string name="repeat_summary">Repete %1$s toda %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Seu aparelho não possui nenhum dos métodos de pagamento suportados. Por favor, use o site do Habitica se você quiser comprar gemas.</string>
   <string name="no_billing_subscriptions">Seu aparelho não possui nenhum dos métodos de pagamento suportados. Por favor, use o site do Habitica se você quiser comprar a Assinatura.</string>
   <string name="save">Salvar</string>
@@ -568,8 +445,7 @@
   <string name="gem_reward">Prêmio de Gemas</string>
   <string name="tasks">Tarefas</string>
   <string name="create_challenge">Criar Desafio</string>
-  <string name="edit_challenge">Editar</string>
-  <string name="challenge_create_error_tavern_one_gem">Você necessita de pelo menos 1 Gema para criar um desafio público.</string>
+    <string name="challenge_create_error_tavern_one_gem">Você necessita de pelo menos 1 Gema para criar um desafio público.</string>
   <string name="challenge_create_error_enough_gems">Você não possui gemas suficiente para criar um desafio.</string>
   <string name="identify_your_challenge_with_a_tag">Classifique seus desafios com um nome curto</string>
   <string name="challenge_create_error_tag">Você necessita de um nome curto para criar esse Desafio.</string>
@@ -579,42 +455,36 @@
   <string name="new_challenge_title">Novo titulo do desafio</string>
   <string name="ownership">Propriedade</string>
   <string name="inn">Pousada</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Começar uma nova Missão</string>
+    <string name="start_quest">Começar uma nova Missão</string>
   <string name="leave_party">Deixar Grupo</string>
   <string name="party_description">Descrição do grupo</string>
-  <string name="abort_confirmation">Tem certeza que quer abortar a missão? Isso vai abortar para todos do seu grupo e todo o progresso será perdido. O pergaminho de missão será devolvido ao dono.</string>
-  <string name="leave_quest_confirmation">Tem certeza que você quer abandonar a missão ativa? Todo o progresso da missão será perdido.</string>
-  <string name="number_participants">%1$d Participantes</string>
+    <string name="number_participants">%1$d Participantes</string>
   <string name="welcome_back">Bem vindo(a) de volta</string>
-  <string name="yesterdaililes_prompt">Marque as Diárias que você fez ontem:</string>
+  <string name="yesterdaililes_prompt">Fez alguma dessas Diárias ontem?</string>
   <string name="start_day">Começar Meu Dia</string>
   <string name="leave_party_confirmation">Você tem certeza de que quer sair do grupo?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Próximo prêmio em %d Check-ins</string>
-  <string name="pending">Pendente</string>
+    <string name="pending">Pendente</string>
   <string name="accepted">Aceito</string>
   <string name="declined">Negado</string>
   <string name="participants">Participantes</string>
   <string name="invitations">Convites</string>
-  <string name="quest_leader_header" formatted="false">Iniciado por %s</string>
+  <string name="quest_leader_header">Iniciado por %s</string>
   <string name="quest_abort_message">Tem certeza que quer abortar a missão? Isso vai abortar para todos do seu grupo e todo o progresso será perdido. O pergaminho de missão será devolvido ao dono.</string>
-  <string name="loading">Carregando…</string>
-  <string name="reloading_content">Recarregando Conteúdo</string>
+    <string name="reloading_content">Recarregando Conteúdo</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mi</string>
   <string name="billion_abbrev">bi</string>
-  <string name="your_balance">Seu saldo:</string>
-  <string name="available_until" formatted="false">Disponível até %s</string>
-  <string name="gems_left_max" formatted="false">Gemas Mensais: %1$d/%2$d Restando</string>
-  <string name="gems_left_nomax" formatted="false">Gemas Mensais: %d Restando</string>
+    <string name="available_until">Disponível até %s</string>
+  <string name="gems_left_max">Gemas Mensais: %1$d/%2$d Restando</string>
+  <string name="gems_left_nomax">Gemas Mensais: %d Restando</string>
   <string name="health">Vida</string>
   <string name="collect">Colete</string>
   <string name="rage_meter">Indicador de Fúria</string>
   <string name="boss_quest">Missão de Chefão</string>
   <string name="collection_quest">Missão de Coleta</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Pontos de Experiência</string>
-  <string name="gold_reward" formatted="false">%d Ouro</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Pontos de Experiência</string>
+  <string name="gold_reward">%d Ouro</string>
   <string name="quest_owner_rewards">Recompensas do Dono da Missão</string>
   <string name="str_abbrv">For</string>
   <string name="per_abbrv">Per</string>
@@ -624,11 +494,10 @@
   <string name="reset_account_description">ATENÇÃO! Isto resetará várias partes da sua conta. Essa ação é bastante desencorajada, mas algumas pessoas acreditam ser útil começo após brincar com o site por um curto período.\n\nVocê irá perder todos os seus níveis, ouro e pontos de experiência. Todas as suas tarefas (exceto as de desafios) será permanentemente deletadas e você irá perder todo o histórico delas. Você irá perder todo o seu equipamento mas ainda os poderá comprar de volta, incluindo todos os equipamentos de edição limitada ou os Itens Misteriosos de Assinantes que você já possuir (você precisará ser da classe correta para comprar equipamentos específicos de classe). Você manterá sua classe atual e seus mascotes e montarias. Talvez você prefira usar um Orbe do Renascimento ao invés de reiniciar sua conta, que é uma opção muito mais segura e na qual você manterá todas as suas tarefas e equipamentos.</string>
   <string name="delete_account">Deletar Conta</string>
   <string name="delete_account_description">Tem certeza? Sua conta será deletada para sempre e nunca poderá ser restaurada! Você precisará registrar uma nova conta para usar o Habitica de novo. Gemas usadas ou guardas não serão devolvidas. Se você tiver total certeza, digite sua senha abaixo.</string>
-  <string name="reset_account_confirmation">Redefinir minha Conta</string>
-  <string name="delete_account_confirmation">Deletar minha Conta</string>
+  <string name="reset_account_confirmation">resetar minha conta</string>
+  <string name="delete_account_confirmation">deletar minha conta</string>
   <string name="danger_zone">Zona de Perigo</string>
-  <string name="nevermind">Deixa Pra Lá</string>
-  <string name="resetting_account">Resetando Conta</string>
+    <string name="resetting_account">Resetando Conta</string>
   <string name="deleting_account">Deletando Conta</string>
   <string name="insufficientGold">Você precisa completar mais tarefas antes de conseguir comprar este item!</string>
   <string name="insufficientGems">Você precisará de mais Gemas para comprar este item!</string>
@@ -661,8 +530,7 @@
   <string name="authentication_summary">Mudar suas opções de autenticação.</string>
   <string name="change_password">Mudar Senha</string>
   <string name="change_email">Alterar Endereço de Email</string>
-  <string name="change_login_name">Alterar Nome de Login</string>
-  <string name="change_username">Mudar nome de usuário</string>
+    <string name="change_username">Mudar nome de usuário</string>
   <string name="change">Alterar</string>
   <string name="character_level">Nível do Personagem</string>
   <string name="auto_allocate_points">Distribuir Pontos Automaticamente</string>
@@ -683,7 +551,7 @@
   <string name="distribute_class">Distribuir baseado na classe</string>
   <string name="distribute_task">Distribuir baseado nas tarefas</string>
   <string name="no_points_to_allocate">Sem Pontos para Distribuir</string>
-  <string name="points_to_allocate" formatted="false">%d pontos para Distribuir</string>
+  <string name="points_to_allocate">%d pontos para Distribuir</string>
   <string name="distribute_evenly_help">Distribui o mesmo número de pontos para cada atributo.</string>
   <string name="distribute_class_help">Distribui mais pontos para os atributos importantes para sua classe.</string>
   <string name="distribute_task_help">Distribui pontos com base nas categorias Força, Inteligência, Constituição e Percepção, associadas às tarefas que você completa.</string>
@@ -693,9 +561,7 @@
   <string name="classless">Sem classe</string>
   <string name="class_equipment_shop_dialog">Este item está disponível apenas para uma classe específica.\nVocê pode alterar sua classe em Configurações.</string>
   <string name="class_gear_disclaimer">Você apenas pode comprar equipamento para sua classe atual</string>
-  <string name="available_stats" formatted="false">%dPontos</string>
-  <string name="toogle_emojis">Alternar emojis</string>
-  <string name="tavern_description">Bem-vindo a Taverna. Puxe uma cadeira e se junte ao chat ou dê um descanso de suas tarefas. </string>
+    <string name="tavern_description">Bem-vindo a Taverna. Puxe uma cadeira e se junte ao chat ou dê um descanso de suas tarefas. </string>
   <string name="check_into_inn">Entrar na Pousada</string>
   <string name="community_guidelines">Diretrizes da Comunidade</string>
   <string name="view_community_guidelines">Veja as Diretrizes da Comunidade</string>
@@ -709,19 +575,13 @@
   <string name="navigation_drawer_open">Abrir o painel de navegação</string>
   <string name="navigation_drawer_close">Fechar o painel de navegação</string>
   <string name="world_boss">Chefão Global</string>
-  <string name="world_boss_art">Arte do Chefão</string>
-  <string name="boss_art">Arte do Chefão</string>
+    <string name="boss_art">Arte do Chefão</string>
   <string name="world_boss_description">Descrição do Chefão Global</string>
-  <string name="rage_strike_count" formatted="false">Strikes de Raiva: %d/%d</string>
-  <string name="pending_strike_description">Este strike ainda não aconteceu! \ O Chefão Global vai atacar um dos nossos amigos comerciantes, uma vez que sua barra de raiva encher. Continue completando suas Diárias para tentar e evitar que isso aconteça!</string>
-  <string name="pending_strike_title">Strike Pendente</string>
+  <string name="rage_strike_count">Strikes de Raiva: %d/%d</string>
+    <string name="pending_strike_title">Strike Pendente</string>
   <string name="strike_description_title">O que é um Strike de Raiva?</string>
-  <string name="strike_description_subtitle">Há 3 potenciais Strikes de Raiva</string>
-  <string name="strike_description_description">Essa barra enche quando os Habiticanos esquecem suas tarefas diárias. Caso encha, o Descoraçador usa seu Ataque do Coração Partido em um dos comerciantes de Habitica, então lembre-se de completar suas tarefas!</string>
-  <string name="pending_strike_subtitle">Este Strike ainda não aconteceu!</string>
-  <string name="strike_active_title" formatted="false">O %s foi Atacado!</string>
-  <string name="strike_active_subtitle" formatted="false">%s está de Coração Partido!</string>
-  <string name="strike_active_description" formatted="false">Nossa amada %s foi devastada quando o %s quebrou o %s. Rápido, enfrente suas tarefas para derrotar o monstro e ajudar a reconstruir!!</string>
+    <string name="strike_active_title">O %s foi Atacado!</string>
+    <string name="strike_active_description">Nossa amada %s foi devastada quando o %s quebrou o %s. Rápido, enfrente suas tarefas para derrotar o monstro e ajudar a reconstruir!!</string>
   <string name="questShop">Loja de Missões</string>
   <string name="market_owner_long">Alex o Mercante</string>
   <string name="tavern_owner_long">Daniel o estalajadeiro</string>
@@ -731,29 +591,21 @@
   <string name="no_party_description">Faça missões com amigos ou por conta própria. Combata monstros, crie desafios e ajude a si mesmo a continuar responsável através dos Grupos.</string>
   <string name="no_party_title">Jogar Habitica em um Grupo</string>
   <string name="join_party_description">Dê a um membro do Grupo o nome de usuário abaixo e eles poderão enviá-lo um convite</string>
-  <string name="join_party_description_id">Informe o seu ID de usuário ou faça com que eles digitalizem seu código QR para convidar</string>
-  <string name="join_party_title">Deseja entrar em um grupo?</string>
-  <string name="create_party_website">Entre no site para criar um grupo</string>
-  <string name="id_copied">ID copiado para a área de transferência</string>
-  <string name="insufficientSubscriberGems">Você comprou todas as gemas que pode este mês. Mais gemas tornam-se disponíveis nos primeiros três dias de cada mês. Obrigado por ser um assinante!</string>
-  <string name="insufficientSubscriberGemsTitle">Capacidade Mensal de Gemas Atiginda</string>
-  <string name="chat_message">Mensagem de bate-papo</string>
-  <string name="world_boss_description_title">O que é um Chefão Global?</string>
-  <string name="world_boss_description_description">Um Chefão Global é um evento especial onde a comunidade inteira trabalha junto para derrotar um monstro poderoso com suas tarefas!\nComplete tarefas para causar dano ao Chefão\nO Chefão não te atacará por suas tarefas esquecidas, mas a sua barra de Fúria irá aumentar. Se a barra ficar cheia, o Chefão atacará um dos mercadores!\nVocê pode continuar nos Chefões das missões normais, danos se aplicarão aos dois\nVisite a Taverna para ver o Progresso do Chefão e os Ataques de Fúria</string>
-  <string name="world_boss_description_intro">Um Chefão Global é um evento especial onde a comunidade inteira trabalha junto para derrotar um monstro poderoso com suas tarefas!</string>
+    <string name="join_party_title">Deseja entrar em um grupo?</string>
+    <string name="insufficientSubscriberGems">Você comprou todas as gemas que pode este mês. Mais gemas tornam-se disponíveis nos primeiros três dias de cada mês. Obrigado por ser um assinante!</string>
+    <string name="world_boss_description_title">O que é um Chefão Global?</string>
+    <string name="world_boss_description_intro">Um Chefão Global é um evento especial onde a comunidade inteira trabalha junto para derrotar um monstro poderoso com suas tarefas!</string>
   <string name="world_boss_description_1">Complete tarefas para causar dano no Chefão</string>
   <string name="world_boss_description_2">O Chefão não te atacará por suas tarefas esquecidas, mas a sua barra de Fúria irá aumentar. Se a barra ficar cheia, o Chefão atacará um dos mercadores!</string>
   <string name="world_boss_description_3">Você pode continuar nos Chefões das missões normais, danos se aplicarão aos dois</string>
   <string name="world_boss_description_4">Visite a Taverna para ver o Progresso do Chefão e os Ataques de Fúria</string>
-  <string name="world_boss_action_prompt" formatted="false">Derrote o Chefão para obter recompensas especiais e salvar Habitica do Terror do %s!</string>
-  <string name="world_boss_description_subtitle">%s ataca!</string>
-  <string name="questShop_owner_long">Ian o Guia das Missões</string>
+  <string name="world_boss_action_prompt">Derrote o Chefão para obter recompensas especiais e salvar Habitica do Terror do %s!</string>
+    <string name="questShop_owner_long">Ian o Guia das Missões</string>
   <string name="seasonalShop_owner_long">Feiticeira Sazonal</string>
   <string name="rage_attack">Ataque de Fúria:</string>
   <string name="tavern_description_world_boss">Oh parça, não esquenta com o bicho lá embaixo — aqui ainda é seguro pra trocar ideia enquanto descansa.</string>
   <string name="report">Reportar</string>
-  <string name="like">Curtir</string>
-  <string name="reply">Responder</string>
+    <string name="reply">Responder</string>
   <string name="challenge_prize">Prêmio do desafio</string>
   <string name="challenge_categories">Categorias do desafio</string>
   <string name="created_challenge">Desafio criado</string>
@@ -787,17 +639,15 @@
   <string name="two_handed">Duas mãos</string>
   <string name="usernamePromptTitle">É hora de definir seu nome de usuário!</string>
   <string name="usernamePromptBody">Nomes de login agora são nomes de usuário únicos e estarão visíveis ao lado do seu nome de exibição e serão usados para convites, @menções em bate-papo e mensagens.</string>
-  <string name="usernamePromptWiki">Se você quiser saber mais sobre essa mudança, <a href="https://habitica.wikia.com/wiki/Player_Names">visite nossa wiki.</a></string>
-  <string name="confirmUsername">Confirmar nome de usuário</string>
-  <string name="usernamePromptDisclaimer">Nomes de usuários devem estar de acordo com os nossos <a href="https://habitica.com/static/terms">Termos de Serviço</a> e <a href="https://habitica.com/static/community-guidelines">Diretrizes da Comunidade</a>. Se você não definiu um nome de login anteriormente, seu nome de usuário foi gerado automaticamente.</string>
+  <string name="usernamePromptWiki">Se você quiser saber mais sobre essa mudança, <a href="https://habitica.wikia_com/wiki/Player_Names">visite nossa wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Nomes de usuários devem estar de acordo com os nossos <a href="https://habitica.com/static/terms">Termos de Serviço</a> e <a href="https://habitica_com/static/community-guidelines">Diretrizes da Comunidade</a>. Se você não definiu um nome de login anteriormente, seu nome de usuário foi gerado automaticamente.</string>
   <string name="confirm_username_title">Você ter certeza que deseja confirmar seu nome de usuário atual?</string>
   <string name="confirm_username_description">Confirmar seu nome de usuário o tornará público para convites, @menções e mensagens. Você pode alterar seu nome de usuário nas configurações a qualquer momento.</string>
   <string name="cancel">Cancelar</string>
   <string name="confirm_username">Confirmar nome de usuário</string>
   <string name="username_not_confirmed">Nome de usuário não confirmado</string>
   <string name="username_confirmed">Nome de Usuário Confirmado</string>
-  <string name="username_level">\@%s・Nível %d</string>
-  <string name="enter_recipient_username">Digite o @ nome de usuário do destinatário</string>
+    <string name="enter_recipient_username">Digite o @ nome de usuário do destinatário</string>
   <string name="username_copied">Nome de usuário copiado para Área de Transferência</string>
   <string name="verification_pet">Um desses Mascotes Veteranos estará esperando por você depois que tiver terminado de confirmar!</string>
   <string name="welcomeNameTitle">Como devemos chamá-lo?</string>
@@ -821,8 +671,6 @@
   <string name="send_gift">Enviar Presente</string>
   <string name="server">Servidor</string>
   <string name="gift_confirmation_title">Seu presente foi enviado!</string>
-  <string name="gift_confirmation_text_g1g1">Sua assinatura de presente foi enviada e uma outra assinatura foi aplicada à sua conta!</string>
-  <string name="gift_confirmation_text">Sua assinatura de presente foi enviada e uma outra assinatura foi aplicada à sua conta.</string>
   <string name="opting_out_progress">Cancelando</string>
   <string name="delete_oauth_account_description">Você tem certeza\? Isso vai apagar sua conta para sempre e voce nao vai poder restaurar-la! You vai precisar registrar uma nova conta para usar o Habitica novamente. As Gems salvas ou gastas não serão reembolsadas. Se você estiver absolutamente certo, digite DELETE na caixa de texto abaixo.</string>
   <string name="discover">Explorar</string>
@@ -844,76 +692,4 @@
   <string name="invited_to_private_guild"><![CDATA[Você foi convidado para entrar em uma Guilda privada <b>%1$s</b>]]></string>
   <string name="invited_to_public_guild"><![CDATA[Você foi convidado para entrar em uma Guilda <b>%1$s</b>]]></string>
   <string name="invited_to_quest"><![CDATA[Você foi convidado para a Missão <b>%1$s</b>]]></string>
-<string name="sectionwacky">Maluco</string>
-    <string name="x_months">%d Meses</string>
-    <string name="insufficientGoldTitle">Não há Ouro suficiente</string>
-    <string name="join_party_description_guild">Dê o nome de usuário abaixo para um amigo ou vá até a % s para encontrar possíveis companheiros</string>
-    <string name="defeat">Derrotar</string>
-    <string name="add_local_authentication">Adicionar Autenticação Local</string>
-    <string name="task_title">Título da Tarefa</string>
-
-    <string name="old_password">Senha Antiga</string>
-    <string name="new_password">Nova Senha</string>
-    <string name="new_password_repeat">Repetir a nova Senha</string>
-    <string name="adjust_streak">Ajustar Combo</string>
-    <string name="password_changed">Senha alterada com sucesso</string>
-    <string name="assigned_stat">Pontos Atribuídos</string>
-    <string name="monthly">Mensalmente</string>
-    <string name="weekly">Semanalmente</string>
-    <string name="repeats">Repetições</string>
-    <string name="every">A cada</string>
-    <string name="scheduling">Agendamento</string>
-    <string name="days">Dias</string>
-    <string name="weeks">Semanas</string>
-    <string name="years">Anos</string>
-    <string name="checklist_text">Texto da Lista</string>
-    <string name="new_reminder">Novo lembrete</string>
-    <string name="streak">Combo</string>
-    <string name="update_available">Atualização disponível: %1$s (%2$d)</string>
-    <string name="need_help_header_description">Poste uma mensagem na %s para ter suas dúvidas respondidas por outro jogador.</string>
-    <string name="need_more_help">Precisa de mais ajuda\?</string>
-    <string name="become_x">Bem-vindo a %s</string>
-    <string name="x_class">%s Classe</string>
-    <string name="report_explanation">Reporte uma mensagem **apenas** se esta violar as [Diretrizes da Comunidade](https://habitica.com/static/community-guidelines) e/ou os [Termos de Serviço](https://habitica.com/static/terms). Reportar inadequadamente um post pode lhe dar uma infração.</string>
-    <string name="report_message_title">Reportar %s por violação:</string>
-    <string name="reason_for_report">Razões para reportar (opcional)</string>
-    <string name="mystery_sets">Conjuntos Misteriosos</string>
-    <string name="guild_description">Descrição da Guilda</string>
-    <string name="invite_to_guild">Convidar para a Guilda</string>
-    <string name="join_guild">Juntar-se à Guilda</string>
-    <string name="garden">Jardim</string>
-    <string name="i_agree_to_follow_the_guidelines">Eu concordo em seguir as diretrizes</string>
-    <string name="report_violation">Reportar Violação</string>
-    <string name="trillion_abbrev">t</string>
-    <string name="leave_guild">Sair da Guilda</string>
-    <string name="left_guild">Você saiu da guilda</string>
-    <string name="joined_guild">Você juntou-se à guilda</string>
-    <string name="cost">Custo</string>
-    <string name="setup_task_habit_1">Adicione uma tarega ao Habitica</string>
-    <string name="setup_task_habit_1_notes">Ou um Hábito, uma Diária ou um Afazer</string>
-    <string name="setup_task_habit_2">Toque aqui para transformar isso em um mau hábito que você gostaria de abandonar</string>
-    <string name="setup_task_habit_2_notes">Ou exclua isso na tela de edição</string>
-    <string name="guild_summary">Resumo da Guilda</string>
-    <string name="guild_members">Membros da Guilda</string>
-    <string name="guild_bank">Banco da Guilda</string>
-    <string name="invite_to_party">Convidar para o Grupo</string>
-    <string name="are_you_sure">Você tem certeza\?</string>
-    <string name="delete_task">Deletar Tarefa</string>
-    <string name="not_now">Não agora</string>
-    <string name="levelup_detail_10">Escolha uma classe que se adapte ao seu estilo de jogo e desbloqueie habilidades especiais e armaduras para ajudá-lo em sua jornada</string>
-    <string name="levelup_title_10">Sistema de Classes desbloqueado!</string>
-    <string name="pin">Fixar</string>
-    <string name="unpin">Desafixar</string>
-    <string name="take_me_back">Leve-me de volta</string>
-    <string name="sidebar_achievements">Conquistas</string>
-    <string name="basic_achievements">Conquistas Básicas</string>
-    <string name="seasonal_achievements">Conquistas Sazonais</string>
-    <string name="special_achievements">Conquistas Especiais</string>
-    <string name="switch_to_list_view">Mudar para visualização em lista</string>
-    <string name="switch_to_grid_view">Mudar para visualização em grade</string>
-    <string name="confirm_deletion">Confirmar exclusão</string>
-    <string name="new_task">Nova Tarefa</string>
-    <string name="create_task">Criar %s</string>
-    <string name="details">Detalhes</string>
-    <string name="share_challenge_with">Compartilhar Desafio com</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
index c35ab4618..5b217ef86 100644
--- a/Habitica/res/values-pt-rPT/strings.profile.xml
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
     <string name="profile_achievements">Conquistas</string>
-    <string name="profile_achievement_ok">ACEITAR</string>
-    <string name="profile_qrcode_close">Fechar</string>
 
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index 90b547baf..4b414a156 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tarefas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Mensagens</string>
-  <string name="sidebar.tavern">Taberna</string>
-  <string name="sidebar.party">Equipa</string>
-  <string name="sidebar.purchaseGems">Comprar Gemas</string>
-  <string name="sidebar.guilds">Guildas</string>
-  <string name="sidebar.challenges">Desafios</string>
-  <string name="sidebar.section.inventory">Inventário</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipamento</string>
-  <string name="sidebar.stable">Estábulo</string>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Definições</string>
-  <string name="sidebar.about">Sobre</string>
+  <string name="sidebar_tasks">Tarefas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar_section_social">Social</string>
+  <string name="sidebar_inbox">Mensagens</string>
+  <string name="sidebar_tavern">Taberna</string>
+  <string name="sidebar_party">Equipa</string>
+  <string name="sidebar_purchaseGems">Comprar Gemas</string>
+  <string name="sidebar_guilds">Guildas</string>
+  <string name="sidebar_challenges">Desafios</string>
+  <string name="sidebar_section_inventory">Inventário</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipamento</string>
+  <string name="sidebar_stable">Estábulo</string>
+  <string name="sidebar_news">Noticias</string>
+    <string name="sidebar_about">Sobre</string>
   <string name="sidebar_shops">Lojas</string>
   <string name="sidebar_stats">Estatísticas</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.tutorial.xml b/Habitica/res/values-pt-rPT/strings.tutorial.xml
index e944e871a..03bf66215 100644
--- a/Habitica/res/values-pt-rPT/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rPT/strings.tutorial.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Quando comprar equipamento, este aparece aqui. O seu Equipamento de Batalha afeta as suas estatísticas, e o seu Vestuário (se ativado) afeta o que o seu avatar pode vestir.</string>
-  <string name="tutorial_items">Ganhe itens completando as tarefas e subindo de nível. Toque num item para o usar!</string>
-  <string name="tutorial_pets">Ao completar as suas tarefas do mundo real, tem agora uma hipótese de aleatória para encontrar ovos e poções. Combina-os para gerar animais</string>
-  <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_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 pública para todas as idades! Aqui pode conversar sobre a produtividade e colocar questões. Divirta-se!</string>
-  <string name="tutorial_classes">Escolha para se tornar num Guerreiro, Mago, Curandeiro ou Bandido! Cada classe tem equipamento e habilidades únicos. Toque em (?) para saber mais!</string>
-<string name="tutorial_overview">Aqui estamos! Inseri algumas tarefas para ti com base nos teus interesses. Experimenta adicionar algumas por tua conta. Podes editar qualquer tarefa ao tocar o título.</string>
+    <string name="tutorial_overview">Aqui estamos! Inseri algumas tarefas para ti com base nos teus interesses. Experimenta adicionar algumas por tua conta. Podes editar qualquer tarefa ao tocar o título.</string>
     <string name="tutorial_habits_1">Primeiro os Hábitos. Podem ser Hábitos positivos que queres melhorar ou Hábitos negativos que queres deixar.</string>
     <string name="tutorial_habits_2">Sempre que realizares um hábito positivo, clica no + para receberes experiência e ouro!</string>
     </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index f93f5f340..1780ae77d 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Não foi possível carregar as predefinições do código de barras</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Definições</string>
-  <string name="SP_address_hint">O seu servidor personalizado</string>
-  <string name="SP_userID_title">Id. do Utilizador</string>
+    <string name="SP_userID_title">Id. do Utilizador</string>
   <string name="SP_userID_summary">A Sua Id. de Utilizador</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">O teu token API</string>
   <string name="Language_title">Língua </string>
   <string name="Language_summary">Mudar a língua do Habitica</string>
-  <string name="SP_user_qr_code">O Seu Código QR</string>
-  <string name="PS_contact_title">Contactar-me</string>
-  <string name="unknown_error">Ocorreu um erro…</string>
-  <string name="pref_account_header">Conta</string>
+    <string name="PS_contact_title">Contactar-me</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 Hora do Lembrete</string>
   <string name="pref_cds_header">Início do Dia Personalizado</string>
-  <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="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>
@@ -37,14 +32,8 @@
   <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-->
-  <string name="task_value">Valor</string>
-  <string name="new_todo">Novo Afazer</string>
-  <string name="new_reward">Nova Recompensa</string>
-  <string name="new_daily">Nova Tarefa Diária</string>
-  <string name="new_habit">Novo Hábito</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Eliminar</string>
-  <string name="action_cancel">Cancelar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Iniciar Sessão</string>
   <string name="register_btn">Registar</string>
   <string name="username">Nome de utilizador</string>
@@ -54,32 +43,23 @@
   <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">Detalhes da Conta</string>
-  <string name="LoginActivityName">Bem-vindo</string>
-  <string name="string_revive">Reanimar</string>
-  <string name="please_connect">Por favor, ligue-se através da aplicação antes de usar a widget</string>
-  <string name="about.title">Sobre</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Histórico da versão</string>
-  <string name="about.habitica_open_source">O Habitica está disponível como software de código aberto no GitHub</string>
-  <string name="about.rate_our_app">Classifique a nossa Aplicação</string>
-  <string name="about.give_us_feedback">Envie-nos Comentários!</string>
-  <string name="about.bugreport">Comunique um Erro</string>
-  <string name="about.source_code">Código Fonte</string>
-  <string name="repeatEvery">Repetir a Cada</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erro de Ligação</string>
-  <string name="network_error_no_network_body">Não está ligado à Internet.</string>
-  <string name="internal_error_api">Parece que existe um problema com o servidor. Tente novamente mais tarde.</string>
+    <string name="LoginActivityName">Bem-vindo</string>
+    <string name="about_title">Sobre</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">O Habitica está disponível como software de código aberto no GitHub</string>
+  <string name="about_rate_our_app">Classifique a nossa Aplicação</string>
+  <string name="about_give_us_feedback">Envie-nos Comentários!</string>
+  <string name="about_bugreport">Comunique um Erro</string>
+  <string name="about_source_code">Código Fonte</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Parece que existe um problema com o servidor. Tente novamente mais tarde.</string>
   <string name="authentication_error_title">Erro de Autenticação</string>
-  <string name="authentication_error_body">O seu Nome de Utilizador e/ou Palavra-passe está incorreto.</string>
-  <string name="login_validation_error_title">Erro de Validação</string>
+    <string name="login_validation_error_title">Erro de Validação</string>
   <string name="login_validation_error_fieldsmissing">Tem de preencher todos os campos.</string>
   <string name="save_changes">Guardar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificuldade</string>
+    <string name="difficulty">Dificuldade</string>
   <string name="tags">Etiquetas</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Fácil</string>
@@ -90,17 +70,8 @@
   <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">Força</string>
-  <string name="mental">Inteligência</string>
-  <string name="social">Constituição</string>
-  <string name="other">Perceção</string>
-  <string name="frequency">Frequência</string>
-  <string name="frequency_weekly">Em certos dias da semana</string>
-  <string name="frequency_daily">A cada X dias</string>
-  <string name="repeatables_summary_title">Resumo</string>
-  <string name="repeatables_frequency_daily">Diariamente</string>
+    <string name="attributes">Atributos</string>
+    <string name="repeatables_frequency_daily">Diariamente</string>
   <string name="repeatables_frequency_weekly">Semanalmente</string>
   <string name="repeatables_frequency_monthly">Mensalmente</string>
   <string name="repeatables_frequency_yearly">Anualmente</string>
@@ -118,23 +89,14 @@
   <string name="faint_header">Gastou a sua Vida!</string>
   <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">%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="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="skill_progress_title">Utilizando habilidade</string>
-  <string name="coming_soon">Brevemente</string>
-  <string name="chat_flag_confirmation">Tem a certeza que pretende denunciar esta mensagem por violação?</string>
-  <string name="flag_confirm">Marcar Mensagem</string>
-  <string name="unlock_lvl_11">Desbloquear no nível 11</string>
-  <string name="no_party_message">Não faz parte de nenhuma equipa. Para se juntar a uma equipa, por favor, visite o site da Web.</string>
-  <string name="forgot_pw_btn">Esqueci-me da Palavra-passe</string>
-  <string name="tavern.inn.checkOut">Reativar as suas Tarefas Diárias</string>
-  <string name="tavern.inn.rest">Pausar as suas Tarefes Diárias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Rejeitar</string>
+    <string name="unlock_lvl_11">Desbloquear no nível 11</string>
+    <string name="forgot_pw_btn">Esqueci-me da Palavra-passe</string>
+  <string name="tavern_inn_checkOut">Reativar as suas Tarefas Diárias</string>
+  <string name="tavern_inn_rest">Pausar as suas Tarefes Diárias</string>
+  <string name="reward_dialog_buy">Comprar</string>
+  <string name="reward_dialog_dismiss">Rejeitar</string>
   <string name="party">Equipa</string>
   <string name="chat">Conversar</string>
   <string name="members">Membros</string>
@@ -142,24 +104,20 @@
   <string name="dailies">Tarefas Diárias</string>
   <string name="todos">Afazeres</string>
   <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">Tem a certeza?</string>
-  <string name="taskform.delete.message">Quer mesmo eliminar?</string>
-  <string name="yes">Sim</string>
+    <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="quest">Missão</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Cabelo</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Pele</string>
-  <string name="avatar_ears">Ouvidos do Animal</string>
-  <string name="avatar_base">Base</string>
+    <string name="avatar_base">Base</string>
   <string name="avatar_color">Cor</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigode</string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Franjas</string>
-  <string name="avatar_nothing">Nada definido</string>
-  <string name="avatar_size">Tamanho</string>
+    <string name="avatar_size">Tamanho</string>
   <string name="avatar_size_slim">Magro</string>
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Fundo</string>
@@ -168,32 +126,23 @@
   <string name="purchase_button">Comprar</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>
-  <string name="quest.begin">Iniciar Missão</string>
-  <string name="quest.cancel">Cancelar Convite</string>
-  <string name="quest.abort">Abortar Missão</string>
-  <string name="quest.leave">Sair da Missão</string>
-  <string name="quest.pending">Pendente</string>
-  <string name="quest.accepted">Aceite</string>
-  <string name="quest.rejected">Rejeitado</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versão %1$s (%2$d)</string>
+  <string name="quest_accept">Aceitar</string>
+  <string name="quest_reject">Rejeitar</string>
+  <string name="quest_begin">Iniciar Missão</string>
+  <string name="quest_cancel">Cancelar Convite</string>
+  <string name="quest_abort">Abortar Missão</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_subtitle">Bem-vindo ao</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">É hora de se divertir enquanto faz as coisas. Junte-se a mais de %s de outros, melhorando as suas vidas com uma tarefa de cada vez.</string>
+    <string name="intro_1_description">É hora de se divertir enquanto faz as coisas. Junte-se a mais de %s de outros, melhorando as suas vidas com uma tarefa de cada vez.</string>
   <string name="intro_2_subtitle">Progresso no jogo</string>
   <string name="intro_3_description">Mantém os teus objectivos sob vigilância com a ajuda dos teus amigos. Suportem-se uns aos outros na vida e lutem enquanto melhoram simultâneamente!</string>
   <string name="intro_finish_button">Vamos começar!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Seguinte</string>
+    <string name="next_button">Seguinte</string>
   <string name="skip_button">Ignorar</string>
-  <string name="setup_welcome_description">Bem-vindo ao Habitica, onde avançar no jogo irá melhor a sua vida real! Ao realizar os objetivos do mundo real, irá desbloquear equipamento, animais, tarefas, e muito mais.</string>
-  <string name="setup_welcome_title">Bem-vindo</string>
-  <string name="setup_group_work">Trabalho</string>
+    <string name="setup_group_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
   <string name="setup_group_health">Vida</string>
   <string name="setup_group_school">Escola</string>
@@ -221,28 +170,19 @@
   <string name="setup_task_creativity_1">Estudar a mestria de um ofício</string>
   <string name="setup_task_creativity_2">Trabalhe num projeto criativo</string>
   <string name="setup_task_creativity_3">Termine um projeto criativo</string>
-  <string name="gem.purchase.support">Quer ajudar-nos a manter o Habitica a funcionar? Pode suportar os programadores ao comprar gemas!\n\nAs gemas permitem-te comprar extras divertidos para a sua conta, incluindo: \n\n - Fatos engraçados para o teu avatar\n - Fundos fantásticos\n - Missões engraçadas que o recompensam com ovos de mascotes\n - A possibilidade de alterar a sua classe antes do nível 100\n\nMuito obrigado por nos ajudar a tornar o Habitica no melhor que este pode ser. O seu suporte significa muito para nós!</string>
-  <string name="my_guilds">As Minhas Guildas</string>
+    <string name="my_guilds">As Minhas Guildas</string>
   <string name="public_guilds">Guildas Públicas</string>
   <string name="guild">Guilda</string>
   <string name="leave">Sair</string>
   <string name="join">Aderir</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como Afazer</string>
-  <string name="send_pm">Enviar Mensagem Pessoal</string>
-  <string name="flag">Marcar</string>
-  <string name="delete">Eliminar</string>
+    <string name="gems">Gemas</string>
+    <string name="delete">Eliminar</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
   <string name="privacy">Privacidade</string>
   <string name="write_message">Escrever Mensagem</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Procurar por guildas</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="guild_search_hint">Procurar por guildas</string>
+    <string name="battle_gear">Equipamento de Batalha</string>
   <string name="costume">Traje</string>
   <string name="outfit_head">Cabeça</string>
   <string name="outfit_headAccessory">Acessório de Cabeça</string>
@@ -255,9 +195,7 @@
   <string name="wear_costume">Usar Traje</string>
   <string name="equipped">Equipado</string>
   <string name="quest_cancel_message">Tem a certeza que deseja cancelar esta missão? Todos os convites aceites serão perdidos. O dono da missão manterá a posse do pergaminho da missão.</string>
-  <string name="quest.invitation">Convite de Missão</string>
-  <string name="quest.invitation.text">Foi convidado para participar numa missão!</string>
-  <string name="ago_minutes">%dm atrás</string>
+    <string name="ago_minutes">%dm atrás</string>
   <string name="ago_hours">%dh atrás</string>
   <string name="ago_1hour">1h atrás</string>
   <string name="today">Hoje</string>
@@ -271,13 +209,9 @@
   <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">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">Vender (%d 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="hatch_egg">Nascimento com ovo</string>
   <string name="invite_party">Convidar a equipa</string>
   <string name="dialog_feeding">Alimente %s com:</string>
   <string name="use_animal">Usar</string>
@@ -287,17 +221,8 @@
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
   <string name="notification_pet_fed">Alimentou o seu %s!</string>
-  <string name="notification_purchase">Comprou %s</string>
-  <string name="notification_purchase_reward">Comprou uma recompensa</string>
-  <string name="sectiondrop">Padrão</string>
-  <string name="sectionpremium">Porção Mágica</string>
-  <string name="sectionquest">Missão</string>
-  <string name="sectionspecial">Raro</string>
-  <string name="sectionmounts">Padrão</string>
-  <string name="sectionpremiumMounts">Porção Mágica</string>
-  <string name="sectionquestMounts">Missão</string>
-  <string name="sectionspecialMounts">Rara</string>
-  <string name="world_quest">Missão Mundial</string>
+    <string name="notification_purchase_reward">Comprou uma recompensa</string>
+    <string name="world_quest">Missão Mundial</string>
   <string name="empty_items">Não tem quaisquer %s</string>
   <string name="user_level">Nível %d</string>
   <string name="user_level_with_class">Nível %1$d %2$s</string>
@@ -310,8 +235,7 @@
   <string name="healer_description">Curandeiros são impenetráveis contra o mal, e extendem essa protecção aos outros. Tarefas Diárias falhadas e maus Hábitos não incomodam muito, e eles têm formas de recuperar Vida quando falham. Joga como Curandeiro se gostares de ajudar os teus colegas de Equipe, ou se a ideia de enganar a Morte através de trabalho duro inspira-te!</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">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>
@@ -323,56 +247,30 @@
   <string name="invite_existing_users">Convidar Utilizadores Existentes</string>
   <string name="send">Enviar</string>
   <string name="invite">Convidar Amigos</string>
-  <string name="invite_id_description">Se já tiver amigos a utilziar o Habitica, convide-os atarvés da Id. do Utilizador aqui.</string>
-  <string name="invite_email_description">Se um amigo se juntar ao Habitica através do seu e-mail, eles serão convidados automaticamente para a sua equipa!</string>
+    <string name="invite_email_description">Se um amigo se juntar ao Habitica através do seu e-mail, eles serão convidados automaticamente para a sua equipa!</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 Equipa</string>
-  <string name="share_using">Partilhe, utilizando</string>
+    <string name="email">E-mail</string>
+    <string name="share_using">Partilhe, utilizando</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 montaria %1$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="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="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes no Tempo</string>
   <string name="seasonalShop">Loja Sazonal</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">Comprou %1$s</string>
-  <string name="purchase_confirmation_title">Confirmar compra</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>
-  <string name="gold_singular">ouro</string>
-  <string name="gold_plural">ouro</string>
+    <string name="successful_purchase">Comprou %1$s</string>
+    <string name="gold_plural">ouro</string>
   <string name="chat_message_copied">Mensagem copiada para a Área de Transferência</string>
-  <string name="copy_chat_message">Copie para a área de transferência</string>
-  <string name="edit_tag_title">Editar Etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Concluído</string>
-  <string name="edit_tag_btn_delete">Eliminar</string>
-  <string name="confirm_delete_tag_title">Tem certeza?</string>
+    <string name="edit_tag_btn_edit">Editar</string>
+    <string name="confirm_delete_tag_title">Tem certeza?</string>
   <string name="confirm_delete_tag_message">Quer mesmo eliminar?</string>
-  <string name="filter_drawer_edit_tags">Editar Etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por Etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Tenha alguém convidar-lhe com esse Código QR</string>
-  <string name="qr_save_message">Código QR salvo no</string>
-  <string name="qr_dialogue_title">O Seu Código QR</string>
-  <string name="download">Transferir</string>
-  <string name="send_new_message">Envie nova mensagem</string>
-  <string name="choose_recipient_title">Escolher Destinatário da Mensagem</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Escolher Destinatário da Mensagem</string>
   <string name="action_continue">Continuar</string>
-  <string name="scan_qr_code">Digitalizar Código QR</string>
-  <string name="enter_recipient_uuid">Insira a Id. do Utilizador Destinatário</string>
-  <string name="invited_to_party">Foi convidado para se juntar à equipa!</string>
+    <string name="invited_to_party">Foi convidado para se juntar à equipa!</string>
   <string name="stats_widget_label">Habitica Estatísticas </string>
   <string name="add_task">Adicionar uma Tarefa</string>
   <string name="add_habit">Adicionar um Hábito </string>
@@ -383,15 +281,14 @@
   <string name="widget_habit_button">Habitica Fazer Hábito</string>
   <string name="widget_dailies">Tarefas Diárias do Habitica</string>
   <string name="widget_todo_list">Habitica - Lista de Afazeres</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>
-  <string name="gem.purchase.title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
-  <string name="gem.purchase.subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
-  <string name="gem.purchase.listitem1">Disfarces divertidos para o teu avatar</string>
-  <string name="gem.purchase.listitem2">Fundos de Ecrã fantásticos</string>
-  <string name="gem.purchase.listitem3">Missões que recompensam com ovos de animal</string>
-  <string name="gem.purchase.listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
+    <string name="google_services_missing">Os serviços Google play não pode ser achado.</string>
+  <string name="gem_purchase_toolbartitle">Comprar</string>
+  <string name="gem_purchase_title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
+  <string name="gem_purchase_subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
+  <string name="gem_purchase_listitem1">Disfarces divertidos para o teu avatar</string>
+  <string name="gem_purchase_listitem2">Fundos de Ecrã fantásticos</string>
+  <string name="gem_purchase_listitem3">Missões que recompensam com ovos de animal</string>
+  <string name="gem_purchase_listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
   <string name="support_habitica">Suportar o Habitica</string>
   <string name="skill_transformation_use">Usar</string>
   <string name="hatching_market_info">Não encontras os objectos certos? Dá uma olhada no Mercado!</string>
@@ -405,8 +302,8 @@
   <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.listitem1">Compre gemas com ouro</string>
-  <string name="subscribe.listitem2">Itens exclusivos mensalmente</string>
+  <string name="subscribe_listitem1">Compre gemas com ouro</string>
+  <string name="subscribe_listitem2">Itens exclusivos mensalmente</string>
   <string name="subscriptions">Subscrições</string>
   <string name="subscribe">Subscreber</string>
   <string name="payment_method">Método de pagamento</string>
@@ -424,49 +321,34 @@
   <string name="six_months">6 meses</string>
   <string name="twelve_months">12 meses</string>
   <string name="subscription_status">Estado da Subscrição</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="challenge_leave_title">Sair do Desafio</string>
   <string name="challenge_remove_tasks_title">Remover tarefas</string>
   <string name="challenge_remove_tasks_text">Deseja remover as tarefas?</string>
   <string name="remove_tasks">Remover</string>
   <string name="keep_tasks">Manter</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="daily">Diariamente</string>
   <string name="habit">Hábito</string>
   <string name="reward">Prémio</string>
   <string name="todo">Afazer</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="challenge">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">Mensagens</string>
-  <string name="FAQ">Perguntas Mais Frequentes</string>
-  <string name="special">Especial</string>
+    <string name="inbox">Mensagens</string>
+    <string name="special">Especial</string>
   <string name="gem_for_gold_description">Porque subscreveu o Habitica, pode comprar um número de Gemas cada mês, usando Ouro.</string>
-  <string name="limited_count">%d restante</string>
-  <string name="gem_shop">Gema</string>
+    <string name="gem_shop">Gema</string>
   <string name="mystery_item">Item Mistério</string>
   <string name="myster_item_notes">Cada mês, os subscritores irão receber um item mistério. Isto geralmente é lançado cerca de uma semana antes do final do mês.</string>
   <string name="open">Abrir</string>
   <string name="pending_approval">pendente de aprovação</string>
   <string name="filters">Filtros</string>
   <string name="done">Concluir</string>
-  <string name="group_tasks_edit_description">As tarefas de grupo não podem ser editadas.</string>
-  <string name="group_tasks_edit_title">Não é possível editar esta tarefa</string>
-  <string name="groups">Grupos</string>
+    <string name="groups">Grupos</string>
   <string name="all">Tudo</string>
   <string name="none">Nenhum</string>
-  <string name="new_game">Novo\nJogo</string>
-  <string name="login_btn_fb">Iniciar Sessão com Facebook</string>
+    <string name="login_btn_fb">Iniciar Sessão com Facebook</string>
   <string name="login_btn_google">Iniciar Sessão com Google</string>
   <string name="action_back">Anterior</string>
   <string name="randomize">Aleatorizar</string>
@@ -487,15 +369,12 @@
   <string name="save">Guardar</string>
   <string name="location">Localização</string>
   <string name="tasks">Tarefas</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Iniciar uma nova Missão</string>
+    <string name="start_quest">Iniciar uma nova Missão</string>
   <string name="welcome_back">Seja Bem-vindo</string>
   <string name="boss_quest">Chefe de Missão</string>
   <string name="collection_quest">Recolha de Missão</string>
   <string name="quest_owner_rewards">Recompensas do Dono de Missão</string>
   <string name="tavern_description">Bem-vindo à Pousada! Puxe uma cadeira para conversar, ou efetue uma pausa das suas tarefas.</string>
-<string name="repeatables_title">Repete</string>
-    <string name="repeatables_on_title">Repete em</string>
     <string name="levelup_header">Alcançaste o Nível %1$d!</string>
     <string name="levelup_detail">Por completares os teus objectivos na vida real, subiste de nível e agora estás totalmente curado!</string>
     <string name="faint_penalty_body">Perdeste um Nível. o teu Ouro, e uma peça de Equipamento, mas podes recuperá-los de volta com trabalho árduo! Boa sorte — Vais-te sair bem.</string>
@@ -511,7 +390,7 @@
     <string name="ago_1day">1d atrás</string>
     <string name="ago_days">%dd atrás</string>
     <string name="ago_1Minute">1m atrás</string>
-    <string name="evolved_pet_title">Domaste %1$s %2$s, vamos dar um passeio!</string>
+    <string name="evolved_pet_title">Domaste %s, vamos dar um passeio!</string>
     <string name="inn_description">Preciso de um descanso\? Visite o Daniel\'s Inn para pausar alguns dos mecanismos de jogo mais difíceis do Habitica:
 \n
 \n • As diárias perdidas não o prejudicarão
diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml
new file mode 100755
index 000000000..6531f7410
--- /dev/null
+++ b/Habitica/res/values-ro/strings.xml
@@ -0,0 +1,721 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Reimprospateaza</string>
+  <string name="XP_default">Experienţă</string>
+  <string name="HP_default">Sănătate</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Preferințele nu au putut fi încărcate din codul de bare</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Setari</string>
+  <string name="SP_address_hint">Serverul dvs. personalizat</string>
+  <string name="SP_userID_title">Nume Utilizator</string>
+  <string name="SP_userID_summary">Numele tau de utilizator</string>
+  <string name="SP_APIToken_title">Token API</string>
+  <string name="SP_APIToken_summary">Tokenul tau API</string>
+  <string name="Language_title">Limba</string>
+  <string name="Language_summary">Schimbă limba în Habitica</string>
+  <string name="SP_user_qr_code">Codul tau QR</string>
+  <string name="PS_contact_title">Contacteaza-ma</string>
+  <string name="unknown_error">A aparut o eroare…</string>
+  <string name="pref_account_header">Cont</string>
+  <string name="pref_first_day_of_the_week_title">Prima zi a saptamanii</string>
+  <string name="pref_first_day_of_the_week_summary">Prima zi a saptamanii in toate calendarele</string>
+  <string name="pref_reminder_header">Memento zilnic</string>
+  <string name="pref_reminder_checkbox">Activați Memento</string>
+  <string name="pref_reminder_picker">Setați ora pentru memento</string>
+  <string name="pref_cds_header">Ziua de pornire personalizată</string>
+  <string name="pref_cds_picker">Setează-ți o oră personalizată de început a zilei</string>
+  <string name="pref_push_notifications_checkbox">Utilizează Notificări Push</string>
+  <string name="push_notifications">Notificări Push</string>
+  <string name="push_notifications_sum">Setează-ți notificările push</string>
+  <string name="preference_push_you_won_challenge">Ai câștigat o competiție!</string>
+  <string name="preference_push_received_a_private_message">Mesaj Privat primit</string>
+  <string name="preference_push_gifted_gems">Nestemate făcute cadou</string>
+  <string name="preference_push_gifted_subscription">Abonament făcut cadou</string>
+  <string name="preference_push_invited_to_party">Invitat în Ceată</string>
+  <string name="preference_push_invited_to_guild">Invititat în Breaslă</string>
+  <string name="preference_push_your_quest_has_begun">Expediția ta a inceput</string>
+  <string name="preference_push_invited_to_quest">Invitat în Expediție</string>
+  <!--Adding tasks-->
+  <string name="task_value">Valoare</string>
+  <string name="new_todo">Nou To-Do</string>
+  <string name="new_reward">Răsplată noua</string>
+  <string name="new_daily">Sarcină Zilnică Noua</string>
+  <string name="new_habit">Obicei Nou</string>
+  <string name="action_edit">Editare</string>
+  <string name="action_delete">Șterge</string>
+  <string name="action_cancel">Anulare</string>
+  <string name="login_btn">Autentificare</string>
+  <string name="register_btn">Inregistrare</string>
+  <string name="username">Nume Utilizator</string>
+  <string name="email_username">E-mail sau Nume Utilizator</string>
+  <string name="password">Parolă</string>
+  <string name="emailAddress">Adresa e-mail</string>
+  <string name="confirmpassword">Confrimare parolă</string>
+  <string name="logout">Deconectare</string>
+  <string name="logout_description">Deconectați-vă din cont</string>
+  <string name="account_details">Detalii cont</string>
+  <string name="LoginActivityName">Bun venit</string>
+  <string name="string_revive">Renaște</string>
+  <string name="please_connect">Conectați-vă prin intermediul aplicației înainte de a utiliza un widget</string>
+  <string name="about.title">Despre</string>
+  <string name="about.libraries">Biblioteci</string>
+  <string name="about.versionhistory">Istoricul versiunilor</string>
+  <string name="about.habitica_open_source">Habitica este disponibil ca software open source pe Github</string>
+  <string name="about.rate_our_app">Evaluați aplicația noastră</string>
+  <string name="about.give_us_feedback">Trimiteți-ne feedback!</string>
+  <string name="about.bugreport">Raporteaza o eroare</string>
+  <string name="about.source_code">Cod sursă</string>
+  <string name="repeatEvery">Repetați fiecare</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Eroare de conexiune</string>
+  <string name="network_error_no_network_body">Nu sunteți conectat(ă) la internet.</string>
+  <string name="internal_error_api">Se pare că există o problemă cu serverul. Încercați mai târziu.</string>
+  <string name="authentication_error_title">Eroare de autentificare</string>
+  <string name="authentication_error_body">Numele de utilizator și / sau parola dvs. au fost incorecte.</string>
+  <string name="login_validation_error_title">Eroare de validare</string>
+  <string name="login_validation_error_fieldsmissing">Trebuie să completați toate câmpurile.</string>
+  <string name="save_changes">Salvează</string>
+  <string name="copy">Copiază</string>
+  <string name="notes">undefined</string>
+  <string name="text">Text</string>
+  <string name="difficulty">Dificultate</string>
+  <string name="tags">Etichete</string>
+  <string name="trivial">Banal</string>
+  <string name="easy">Ușor</string>
+  <string name="medium">Mediu</string>
+  <string name="hard">Greu</string>
+  <string name="start_date">Data de început</string>
+  <string name="positive_habit_form">Pozitiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Listă de verificare</string>
+  <string name="reminders">Mementouri</string>
+  <string name="actions">Acțiuni</string>
+  <string name="attributes">Atribute</string>
+  <string name="physical">Forță</string>
+  <string name="mental">Inteligență</string>
+  <string name="social">Constituție</string>
+  <string name="other">Percepție</string>
+  <string name="frequency">Frecvență</string>
+  <string name="frequency_weekly">În anumite zile ale săptămânii</string>
+  <string name="frequency_daily">La fiecare X Zile</string>
+  <string name="repeatables_summary_title">Rezumat</string>
+  <string name="repeatables_title">Repetiții</string>
+  <string name="repeatables_on_title">Se repetă pe</string>
+  <string name="repeatables_frequency_daily">Zilnic</string>
+  <string name="repeatables_frequency_weekly">Săptămânal</string>
+  <string name="repeatables_frequency_monthly">Lunar</string>
+  <string name="repeatables_frequency_yearly">Anual</string>
+  <string name="repeatables_frequency_day_of_month">Ziua lunii</string>
+  <string name="repeatables_frequency_day_of_week">Zi a săptămânii</string>
+  <string name="monday">Luni</string>
+  <string name="tuesday">Marți</string>
+  <string name="wednesday">Miercuri</string>
+  <string name="thursday">Joi</string>
+  <string name="friday">Vineri</string>
+  <string name="saturday">Sâmbătă</string>
+  <string name="sunday">Duminică</string>
+  <string name="levelup_button">Huzzah!</string>
+  <string name="faint_subtitle">Nu dispera!</string>
+  <string name="faint_header">Ai rămas fără Viață</string>
+  <string name="faint_button">Reumple-ți Viața &amp; Încearcă din Nou</string>
+  <string name="filter">Filtru</string>
+  <string name="profile_image">Imagine de profil</string>
+  <string name="mana_price_button">%dPM</string>
+  <string name="used_skill">Ai folosit %1$s pentru %2$d mana</string>
+  <string name="used_skill_without_mana">Ai folosit %1$s.</string>
+  <string name="new_checklist_item">obiect nou în checklist</string>
+  <string name="add_checklist_item">Adaugă</string>
+  <string name="skill_progress_title">Folosind abilitatea</string>
+  <string name="coming_soon">In curând</string>
+  <string name="chat_flag_confirmation">Sigur doriți să raportați acest mesaj pentru încălcarea regulilor?</string>
+  <string name="flag_confirm">Marchează mesajul</string>
+  <string name="unlock_lvl_11">Deblocați la nivelul 11</string>
+  <string name="no_party_message">Nu ești într-o ceată. Pentru a te alătura uneia, te rugăm să vizitezi site-ul.</string>
+  <string name="forgot_pw_btn">Parolă uitată</string>
+  <string name="tavern.inn.checkOut">Reactivează-ți Cotidienele</string>
+  <string name="tavern.inn.rest">Pune pauză Cotidienelor tale</string>
+  <string name="reward.dialog.buy">Cumpără</string>
+  <string name="reward.dialog.dismiss">Ignoră</string>
+  <string name="party">Ceată</string>
+  <string name="chat">Chat</string>
+  <string name="members">Membri</string>
+  <string name="habits">Obiceiuri</string>
+  <string name="dailies">Sarcini Zilnice</string>
+  <string name="todos">De-Făcut</string>
+  <string name="rewards">Recompense</string>
+  <string name="taskform.delete.title">Esti sigur?</string>
+  <string name="taskform.delete.message">Chiar vrei să ștergi?</string>
+  <string name="yes">Da</string>
+  <string name="no">Nu</string>
+  <string name="quest">Expediție</string>
+  <string name="avatar_body">Corp</string>
+  <string name="avatar_hair">Păr</string>
+  <string name="avatar_shirt">Tricou</string>
+  <string name="avatar_skin">Piele</string>
+  <string name="avatar_ears">Urechi Animal</string>
+  <string name="avatar_base">Bază</string>
+  <string name="avatar_color">Culoare</string>
+  <string name="avatar_beard">Barbă</string>
+  <string name="avatar_mustache">Mustață</string>
+  <string name="avatar_flower">Floare</string>
+  <string name="avatar_bangs">Breton</string>
+  <string name="avatar_nothing">Nimic setat</string>
+  <string name="avatar_size">Mărime</string>
+  <string name="avatar_size_slim">Suplu</string>
+  <string name="avatar_size_broad">Mare</string>
+  <string name="avatar_background">Decor</string>
+  <string name="purchase_customization">Achiziționați personalizarea</string>
+  <string name="purchase_set_button">Deblochează setul pentru %d nestemate</string>
+  <string name="purchase_button">Cumpără</string>
+  <string name="purchase_set_title">Cumpără setul pentru %s</string>
+  <string name="due_date">Dată limită</string>
+  <string name="quest.accept">Acceptă</string>
+  <string name="quest.reject">Respinge</string>
+  <string name="quest.begin">Incepe expediția</string>
+  <string name="quest.cancel">Anulează Invitația</string>
+  <string name="quest.abort">Abandonează Expediția</string>
+  <string name="quest.leave">Părăsește Expediția</string>
+  <string name="quest.pending">Iminent</string>
+  <string name="quest.accepted">Acceptat</string>
+  <string name="quest.rejected">Respins</string>
+  <string name="quest.participants">Participanți</string>
+  <string name="version_info">Versiunea %1$s (%2$d)</string>
+  <string name="sidebar_help">Ajutor &amp; FAQ</string>
+  <string name="complete_tutorial">Am înțeles!</string>
+  <string name="dismiss_tutorial">Reamintește-mi</string>
+  <string name="intro_1_subtitle">Bine ai venit la</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">E timpul să te distrezi în timp ce îți rezolvi activitățile. Alătură-te celor peste %s alți jucători care-și îmbunătățesc viața cu fiecare sarcină executată. </string>
+  <string name="intro_2_subtitle">Progres în joc</string>
+  <string name="intro_2_title">Progresul în viață</string>
+  <string name="intro_2_description">Deblochează facilități în joc bifându-ți sarcinile din viața reală. Câștigă armură, animale de companie, și multe altele ca recompense pentru atingerea scopurilor pe care le ai. </string>
+  <string name="intro_3_subtitle">Lupta cu monștrii</string>
+  <string name="intro_3_title">Fii social</string>
+  <string name="intro_3_description">Păstrează-ți țelurile sub control cu ajutorul prietenilor. Sprijiniți-vă unii pe ceilalți în viață și în bătălii, îmbunătățindu-vă împreună!</string>
+  <string name="intro_finish_button">Să începem!</string>
+  <string name="previous_button">Anterior</string>
+  <string name="next_button">Următor</string>
+  <string name="skip_button">Ocolire</string>
+  <string name="setup_welcome_description">Bine ai venit la Habitica, unde avansând în joc îți va îmbunătăți viața reală! Cu cât îți îndeplinești scopurile din lumea reală, cu atât vei debloca mai mult echipament, mai multe animale de companie, expediții, și altele.</string>
+  <string name="setup_welcome_title">Bun venit!</string>
+  <string name="avatar_setup_description">Așadar, cum ai vrea să arăți? Nu-ți face griji, poți modifica asta mai târziu.</string>
+  <string name="task_setup_description">Grozav! Acum, la ce ai vrea să lucrezi în timpul acestei călătorii?</string>
+  <string name="setup_group_work">Muncă</string>
+  <string name="setup_group_exercise">Exercițiu</string>
+  <string name="setup_group_health">Sănătate</string>
+  <string name="setup_group_school">Școală</string>
+  <string name="setup_group_teams">Echipe</string>
+  <string name="setup_group_chores">Activități</string>
+  <string name="setup_group_creativity">Creativitate</string>
+  <string name="setup_task_work_1">Procesează email-ul</string>
+  <string name="setup_task_work_2">Cea mai importantă sarcină</string>
+  <string name="setup_task_work_3">Proiect de lucru</string>
+  <string name="setup_task_exercise_1">10 minute cardio</string>
+  <string name="setup_task_exercise_2">Întindere</string>
+  <string name="setup_task_exercise_3">Stabiliți programul de antrenament</string>
+  <string name="setup_task_healthWellness_1">Mănâncă sănătos / mănâncă fastfood</string>
+  <string name="setup_task_healthWellness_2">Spală-te pe dinți</string>
+  <string name="setup_task_healthWellness_3">Programează-ți un consult medical</string>
+  <string name="setup_task_school_1">Studiază/Pierde timpul</string>
+  <string name="setup_task_school_2">Fa tema</string>
+  <string name="setup_task_school_3">Completează proiectul pentru școală/facultate</string>
+  <string name="setup_task_teams_1">Vezi ce îți face echipa</string>
+  <string name="setup_task_teams_2">Actualizează statusul echipei</string>
+  <string name="setup_task_teams_3">Completează un proiect în echipă</string>
+  <string name="setup_task_chores_1">10 minute de curățenie</string>
+  <string name="setup_task_chores_2">Spală vasele</string>
+  <string name="setup_task_chores_3">Organizați dulapul</string>
+  <string name="setup_task_creativity_1">Studiază un o meserie</string>
+  <string name="setup_task_creativity_2">Lucrează la un proiect de creativitate</string>
+  <string name="setup_task_creativity_3">Finalizează proiectul de creativitate</string>
+  <string name="gem.purchase.support">Vrei să menții Habitica funcțională? Îi poți susține pe developeri cumpărând nestemate!\n\nNestematele îți permit să cumperi lucruri extra amuzante pentru contul tău, incluzând: \n\n - Costume cool pentru avatarul tău\n - Background-uri super\n - Expediții distractive care te recompensează cu ouă de animale de companie\n - Abilitatea de a-ți schimba clasa înainte de nivelul 100\n\nMulțumim foarte mult pentru că ne ajuți să menținem Habitica pe cât de bună poate să fie. Susținerea ta înseamnă mult pentru noi!</string>
+  <string name="my_guilds">Breslele mele</string>
+  <string name="public_guilds">Bresle publice</string>
+  <string name="guild">Breaslă</string>
+  <string name="leave">Părăsește</string>
+  <string name="join">Alătură-te</string>
+  <string name="leader">Lider</string>
+  <string name="gems">Nestemate</string>
+  <string name="copy_as_todo">Copiază ca lucru De-Făcut</string>
+  <string name="send_pm">Trimite Mesaj Privat</string>
+  <string name="flag">Steag</string>
+  <string name="delete">Șterge</string>
+  <string name="name">Nume</string>
+  <string name="description">Descriere</string>
+  <string name="add_tag">Adaugă Etichetă nouă</string>
+  <string name="privacy">Intimitate</string>
+  <string name="write_message">Scrie Mesaj</string>
+  <string name="post">Postează</string>
+  <string name="guild_search_hint">Caută bresle</string>
+  <string name="todo_due">Termen: %s</string>
+  <string name="daily_streak">Șir curent: %d</string>
+  <string name="todo_has_duedate">Sarcina are Dată Limită</string>
+  <string name="battle_gear">Echipament de Luptă</string>
+  <string name="costume">Costum</string>
+  <string name="outfit_head">Cap</string>
+  <string name="outfit_headAccessory">Accesoriu pentru cap</string>
+  <string name="outfit_eyewear">Accesoriu pentru ochi</string>
+  <string name="outfit_armor">Armură</string>
+  <string name="outfit_back">Spate</string>
+  <string name="outfit_body">Corp</string>
+  <string name="outfit_shield">Scut</string>
+  <string name="outfit_weapon">Armă</string>
+  <string name="wear_costume">Poartă Costum</string>
+  <string name="equipped">Echipat</string>
+  <string name="quest_cancel_message">Ești sigur că vrei să anulezi această expediție? Toate invitațiile acceptate vor fi pierdute. Posesorul aventurii va păstra răvașul expediției.</string>
+  <string name="quest.invitation">Invitație în Expediție</string>
+  <string name="quest_begin_message">Ești sigur? Doar %1$d din %2$d dintre membrii cetei tale s-au alăturat acestei expediții! Expedițiile încep automat atunci când toți jucătorii se alătură sau refuză invitația.</string>
+  <string name="quest.invitation.text">Ai fost invitat să participi într-o expediție!</string>
+  <string name="today">Astăzi</string>
+  <string name="sidebar_items">Obiecte</string>
+  <string name="eggs">Ouă</string>
+  <string name="hatching_potions">Poțiuni de Eclozat</string>
+  <string name="food">Hrană</string>
+  <string name="quests">Expediții</string>
+  <string name="pets">Animale de Companie</string>
+  <string name="mounts">Animale de Călărit</string>
+  <string name="armoireEquipment">Ai găsit o piesă rară de Echipament în Cufăr: %s! Super!</string>
+  <string name="armoireFood">Scotocești prin Cufăr și găsești %1$s %2$s. Ce caută asta aici?</string>
+  <string name="armoireExp">Te lupți împotriva cufărului și primești Experiență. Ia-o!</string>
+  <string name="armoireNotesFull">Deschide cufărul pentru a primi aleator Echipament special, Experiență, sau hrană! Piese de Echipament rămase: %d</string>
+  <string name="armoireLastItem">Ai găsit ultima piesă rară de Echipament în Cufărul Fermecat</string>
+  <string name="armoireNotesEmpty">Cufărul va conține Echipament nou în prima săptămână din fiecare lună. Până atunci, apasă pentru Experiență și Hrană!</string>
+  <string name="sell">Vinde (%d Aur)</string>
+  <string name="hatch_with_potion">Eclozează cu o poțiune</string>
+  <string name="feed_to_pet">Hrănește animalul de companie</string>
+  <string name="hatch_egg">Eclozează cu un ou</string>
+  <string name="invite_party">Invită ceata</string>
+  <string name="dialog_feeding">Hrănește %1$s %2$s cu:</string>
+  <string name="use_animal">Utilizează</string>
+  <string name="feed">Hrănește</string>
+  <string name="hatch_with">Eclozează animalul de companie cu %s</string>
+  <string name="hatched_pet_title">Ai eclozat un %1$s %2$s!</string>
+  <string name="evolved_pet_title">Ai domesticit %1$s %2$s, hai să mergem într-o călătorie!</string>
+  <string name="close">Închide</string>
+  <string name="share">Distribuie</string>
+  <string name="notification_pet_fed">Ți-ai hrănit %1$s %2$s!</string>
+  <string name="notification_purchase">Ai achiziționat %s</string>
+  <string name="notification_purchase_reward">Ai achiziționat o recompensă</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Poțiune Magică</string>
+  <string name="sectionquestPets">Expediție</string>
+  <string name="sectionspecialPets">Rar</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Poțiune Magică</string>
+  <string name="sectionquestMounts">Expediție</string>
+  <string name="sectionspecialMounts">Rar</string>
+  <string name="world_quest">Expediție Globală</string>
+  <string name="inn_description">Ai nevoie de o pauză? Cazează-te în Hanul lui Daniel pentru a pune pauză unora din atributele dificile ale jocului:\n\n
+• Cotidienele ratate nu te vor deteriora\n
+• Sarcinile nu-și vor pierde șirurile și nu își vor pierde culoarea\n
+• Căpcăunii nu-ți vor aduce prejudicii pentru Cotidienele ratate\n
+• Deteriorarea Căpcăunilor tăi și obiectele din expedițiile de colecție vor rămâne iminente până ieși din Han</string>
+  <string name="empty_items">Nu ai deloc %s</string>
+  <string name="user_level">Nvl %d</string>
+  <string name="user_level_with_class">Nvl %1$d%2$s</string>
+  <string name="warrior">Luptător</string>
+  <string name="rogue">Bandit</string>
+  <string name="mage">Vrăjitor</string>
+  <string name="healer">Vraci</string>
+  <string name="mage_description">Vrăjitorii învață rapid, obținând Experiență și Niveluri mai rapid decât celelalte clase. Primesc de asemenea o cantitate sporită de Mana pentru utilizarea abilităților speciale. Joacă ca și Mag dacă îți place aspectul tactic al Habitica, sau dacă ești puternic motivat de creșterea în nivel și deblocarea facilităților avansate!</string>
+  <string name="rogue_description">Bandiților le place să acumuleze bogății. Ei primesc mai mult Aur decât oricine altcineva și se pricep să găsească obiecte aleator. Discreția specifică le permite să scape de consecințele Cotidienelor ratate. Fă-te Bandit dacă ești puternic motivat de Răsplăți și Realizări, luptându-te pentru pradă și insigne!</string>
+  <string name="healer_description">Vracii sunt protejați împotriva loviturilor și aplică această protecție și altora. Cotidienele ratate și obiceiurile proaste nu îi deranjează așa mult și au modalități de recuperare a sănătății în caz de eșec. Fă-te Vraci dacă îți face plăcere să-i ajuți pe alții din echipa ta sau dacă te inspiră ideea de a trișa Moartea prin muncă asiduă!</string>
+  <string name="select_class">Selectează-ți Clasa</string>
+  <string name="opt_out_class">Alege să nu iei parte</string>
+  <string name="opt_out_description">Nu te interesează clasele? Vrei să alegi mai târziu? Alege să nu participi - vei fi un luptător fără abilități speciale. Poți citi despre sistemul de clase mai târziu pe wiki și poți activa clasele oricând.</string>
+  <string name="class_confirmation">Ești sigur că vrei să fii %s?</string>
+  <string name="class_changed">De acum ești %s!</string>
+  <string name="class_changed_description">Acum ai Echipament de Luptă de bază, pe care îl poți schimba de la Echipament!</string>
+  <string name="choose_class">Alege Clasa</string>
+  <string name="dialog_go_back">Mergi înapoi</string>
+  <string name="opt_out_confirmation">Ești sigur că vrei să nu iei parte?</string>
+  <string name="change_class">Schimbă-ți clasa</string>
+  <string name="change_class_description">Schimbă-ți clasa și resetează punctele de status pentru 3 nestemate</string>
+  <string name="enable_class">Activează Sistemul de Clase</string>
+  <string name="changing_class_progress">Schimbă Clasa</string>
+  <string name="by_email">Prin Email</string>
+  <string name="invite_existing_users">Invită Utilizatori existenți</string>
+  <string name="send">Trimite</string>
+  <string name="invite">Invită Prieteni</string>
+  <string name="invite_id_description">Dacă ai prieteni care utilizează deja Habitica, invită-i prin ID-ul de Utilizator de aici.</string>
+  <string name="invite_email_description">Dacă un prieten se alătura Habitica prin intermediul email-ului tău, aceștia vor fi automat invitați în ceata ta!</string>
+  <string name="add_invites">Adaugă Invitații</string>
+  <string name="user_id">ID Utilizator</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Invită în Ceată</string>
+  <string name="share_using">Distribuie utilizând</string>
+  <string name="share_levelup">Am ajuns la nivelul %d în Habitica îmbunătățindu-mi obicieiurile din viața reală!</string>
+  <string name="share_hatched">Tocmai am eclozat un %1$s%2$s ca animal de companie în Habitica, completându-mi sarcinile din viața reala!</string>
+  <string name="share_raised">Tocmai am obținut un %1$s %2$s ca animal de călărit în Habitica, completându-mi sarcinile din viața reală!</string>
+  <string name="open_in_store">Deschide Play Store</string>
+  <string name="change_class_confirmation">Ești sigur că vrei să-ți schimbi clasa? Te va costa 3 nestemate.</string>
+  <string name="change_class_equipment_warning">Atenție: Nu vei mai putea cumpăra echipament din clasa %s.</string>
+  <string name="leaderMessage">Mesaj de la %1$s</string>
+  <string name="leaderName">Lider: %1$s</string>
+  <string name="confirm">Confirmă</string>
+  <string name="market">Târg</string>
+  <string name="timeTravelers">Călătorii în Timp</string>
+  <string name="seasonalShop">Magazinul de Sezon</string>
+  <string name="empty_inbox">Nu ai niciun mesaj. Poți trimite un mesaj nou unui utilizator din mesajele lor publice din chat.</string>
+  <string name="party_invite">Deblochează invitând prieteni</string>
+  <string name="login_incentive">Deblochează logându-te în Habitica regulat</string>
+  <string name="create_account">Deblochează creând un cont nou</string>
+  <string name="no_gold">Aur insuficient</string>
+  <string name="no_potion">Nu este necesar să cumperi o poțiune de viață</string>
+  <string name="successful_purchase">Ai cumpărat %1$s</string>
+  <string name="purchase_confirmation_title">Confirmă achiziția</string>
+  <string name="confirm_purchase_text">Cumpără %1$s pentru %2$s %3$s</string>
+  <string name="gem">nestemată</string>
+  <string name="hourglass">clepsidră</string>
+  <string name="hourglasses">clepsidre</string>
+  <string name="gold_singular">aur</string>
+  <string name="gold_plural">aur</string>
+  <string name="chat_message_copied">Mesaj copiat în Clipboard</string>
+  <string name="copy_chat_message">Copiază în clipboard</string>
+  <string name="edit_tag_title">Editează Eticheta</string>
+  <string name="edit_tag_btn_edit">Editează</string>
+  <string name="edit_tag_btn_done">Gata</string>
+  <string name="edit_tag_btn_delete">Șterge</string>
+  <string name="confirm_delete_tag_title">Ești sigur(ă)?</string>
+  <string name="confirm_delete_tag_message">Ești sigur(ă) că vrei să ștergi?</string>
+  <string name="filter_drawer_edit_tags">Editează Etichetele</string>
+  <string name="filter_drawer_filter_tags">Filtrează în funcție de Etichetă</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Ajută pe cineva să te invite prin acest Cod QR</string>
+  <string name="qr_save_message">Cod QR salvat la</string>
+  <string name="qr_dialogue_title">Codul tău QR</string>
+  <string name="download">Download</string>
+  <string name="send_new_message">Trimite mesaj nou</string>
+  <string name="choose_recipient_title">Alege un Destinatar</string>
+  <string name="action_continue">Continuă</string>
+  <string name="scan_qr_code">Scanează Codul QR</string>
+  <string name="enter_recipient_uuid">Introdu ID-ul de Utilizator al Destinatarului</string>
+  <string name="invited_to_party">Ai fost invitat să te alături unei cete!</string>
+  <string name="stats_widget_label">Status Habitica</string>
+  <string name="add_task">Adaugă Sarcină</string>
+  <string name="add_habit">Adaugă Obicei</string>
+  <string name="add_daily">Adaugă Cotidiene</string>
+  <string name="add_todo">Adaugă De-Făcut</string>
+  <string name="add_reward">Adaugă Recompensă</string>
+  <string name="all_dailies_completed">Ți-ai completat toate cotidienele. Bravo!</string>
+  <string name="widget_habit_button">Habitica Respectă Obiceiul</string>
+  <string name="widget_dailies">Cotidiene Habitica</string>
+  <string name="widget_todo_list">Habitica Listă De-Făcut</string>
+  <string name="widget_add_task">Habitica Adaugă Sarcină</string>
+  <string name="google_services_missing">Serviciile play Google nu au putut fi găsite.</string>
+  <string name="gem.purchase.toolbartitle">Cumpără</string>
+  <string name="gem.purchase.title">Cumpărând nestemate îi ajuți pe developeri și ajuți să păstrezi Habitica funcțională</string>
+  <string name="gem.purchase.subtitle">Nestematele îți permit să cumperi lucruri extra amuzante pentru contul tău, incluzând:</string>
+  <string name="gem.purchase.listitem1">Costume cool pentru avatarul tău</string>
+  <string name="gem.purchase.listitem2">Background-uri super</string>
+  <string name="gem.purchase.listitem3">Expediții care te recompensează cu ouă de animale de companie</string>
+  <string name="gem.purchase.listitem4">Abilitatea de a-ți schimba clasa înainte de nivelul 100</string>
+  <string name="support_habitica">Susține Habitica</string>
+  <string name="skill_transformation_use">utilizează</string>
+  <string name="hatching_market_info">Nu primești lucrurile pe care ți le dorești? Uită-te prin Târg!</string>
+  <string name="feeding_market_info">Ai nevoie de hrană diferită? Cumpără mai multe de la târg!</string>
+  <string name="open_market">Târg Deschis</string>
+  <string name="cds_description">Cotidienele tale se vor reseta prima dată când utilizezi Habitica după %1$s. Asigură-te că ți-ai completat Cotidienele înainte!</string>
+  <string name="AudioTheme_title">Temă Audio</string>
+  <string name="AudioTheme_summary">Schimbă Tema Audio Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Ne vedem mâine!</string>
+  <string name="belongs_to_challenge">Aparține unei Provocări</string>
+  <string name="has_reminder">Are Memento</string>
+  <string name="has_tag">Are Etichetă</string>
+  <string name="subscribe.title">Abonându-te îi susține pe developeri și ajută la păstrarea funcțională a Habitica</string>
+  <string name="subscribe_prompt">Devino abonat și primești aceste beneficii folositoare:</string>
+  <string name="subscribe.listitem1">Cumpără nestemate cu aur</string>
+  <string name="subscribe.listitem2">Obiecte lunare exclusive</string>
+  <string name="subscribe.listitem3">Păstrează un istoric suplimentar</string>
+  <string name="subscribe.listitem4">Limita maximă de obiecte câștigate este dublată</string>
+  <string name="subscriptions">Abonamente</string>
+  <string name="subscription_duration">Se repetă la fiecare %s</string>
+  <string name="subscribe">Abonează-te</string>
+  <string name="subscribe.listitem1.description">Alexander Negustorul îți va vinde de acum nestemate pentru 20 aur fiecare!\n\nLivrările lui lunare sunt inițial limitate la 25 de Nestemate pe lună, dar pot crește în funcție de durat abonării.\n\nLimita crește cu 5 Nestemate pentru fiecare trei luni consecutive de abonare, până la un maxim de 50 de Nestemate pe lună! </string>
+  <string name="subscribe.listitem2.description">În fiecare lună vei primi obiecte unice pentru avatarul tău!\n\nÎn plus, pentru fiecare trei luni consecutive de abonare, Călătorii în Timp misterioși îți vor permite accesul la obiecte istorice (și futuriste!).</string>
+  <string name="subscribe.listitem3.description">Păstrează istoricul lucrurilor De-Făcut și al sarcinilor disponibil pentru mai mult timp.</string>
+  <string name="subscribe.listitem4.description">Dublul obiectelor căzute îți vor permite să primești mai multe obiecte pentru sarcinile completate zilnic, ajutându-te să-ți completezi grajdul mai repede!</string>
+  <string name="subscription_hourglasses">+%d Clepsidre Mistice</string>
+  <string name="payment_method">Metodă de plată</string>
+  <string name="subscription">Abonament</string>
+  <string name="active">Activ</string>
+  <string name="cancel_subscription">Anulează-ți Abonamentul</string>
+  <string name="cancel_subscription_google.description">Nu dorești să mai fii abonat? Poți găsi opțiunea de dezabonare în secțiunea ”My Apps” din Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Nu dorești să mai fii abonat? Datorită metodei tale de plată, te poți dezabona doar prin intermediul site-ului. Apasă pe butonul de mai jos pentru a deschide site-ul în browser!</string>
+  <string name="visit_habitica_website">Vizitează Site-ul Habitica</string>
+  <string name="current_bonuses">Bonusuri curente</string>
+  <string name="months_subscribed">Luni de abonament</string>
+  <string name="current_hourclasses">Clepsidre Mistice curente</string>
+  <string name="monthly_gem_cap">Limită de nestemate lunare</string>
+  <string name="inactive">Inactiv</string>
+  <string name="one_month">1 Lună</string>
+  <string name="months">%d Luni</string>
+  <string name="month">lună</string>
+  <string name="three_months">3 luni</string>
+  <string name="six_months">6 luni</string>
+  <string name="twelve_months">12 luni</string>
+  <string name="subscribe_prompt_thanks">Pentru că te-ai abonat primești următoarele beneficii utile:</string>
+  <string name="subscription_status">Statusul abonamentului</string>
+  <string name="byLeader">cu %s</string>
+  <string name="challenge_details">Detaliile Provocării</string>
+  <string name="challenge_leave_title">Părăsește Provocarea</string>
+  <string name="challenge_leave_text">Ești sigur că vrei să părăsești Provocarea ”%s”?</string>
+  <string name="challenge_remove_tasks_title">Elimină sarcini</string>
+  <string name="challenge_remove_tasks_text">Dorești să elimini sarcinile?</string>
+  <string name="remove_tasks">Elimină</string>
+  <string name="keep_tasks">Păstrează</string>
+  <string name="my_challenges">Provocările mele</string>
+  <string name="public_challenges">Public</string>
+  <string name="challenges">Provocări</string>
+  <string name="daily">Zilnic</string>
+  <string name="habit">Obicei</string>
+  <string name="reward">Recompensă</string>
+  <string name="todo">De-Făcut</string>
+  <string name="official">Oficial</string>
+  <string name="participating">Participând</string>
+  <string name="challenge">Provocare</string>
+  <string name="go_to_challenge">Mergi la Provocare</string>
+  <string name="not_part_of_a_challenge">Nu faci parte din nicio Provocare acum!</string>
+  <string name="join_a_challenge">Alătură-te unei Provocări pentru a adăuga un set special ales de sarcini listei tale, apoi intră în competiție împotriva altor Habiticans pentru a câștiga realizări și chiar nestemate!</string>
+  <string name="check_the_public_challenge_tab">Apasă pe tab-ul ”Public” pentru a găsi Provocările create de utilizatori care sunt cele mai potrivite pentru tine!</string>
+  <string name="add_reminder">Adaugă Memento</string>
+  <string name="warning">Atenție</string>
+  <string name="open_settings">Deschide Setările</string>
+  <string name="dont_keep_activities_warning">Se pare că ai la dispoziție opțiunea de Developer  \“Don\'t keep Activities\” activă. Momentan, această opțiune cauzează probleme cu aplicația Habitica, și sugerăm așadar dezactivarea ei. </string>
+  <string name="inbox">Mesaje</string>
+  <string name="FAQ">Întrebări Frecvente</string>
+  <string name="special">Special</string>
+  <string name="gem_for_gold_description">Datorită faptului că ești abonat la Habitica, poți cumpăra un anumit număr de Nestemate în fiecare lună, folosind Aur. </string>
+  <string name="limited_count">%d rămase</string>
+  <string name="gem_shop">Nestemată</string>
+  <string name="mystery_item">Obiect Misterios</string>
+  <string name="myster_item_notes">În fiecare lună, abonații vor primi un obiect misterios. Acesta apare de regulă cu aproximativ o săptămână înainte de finalul lunii.</string>
+  <string name="open">Deschide</string>
+  <string name="notification_mystery_item">Deschizi cutia și găsești %s!</string>
+  <string name="checkInRewardEarned">Ai obținut un/o %1$s ca recompensă pentru devotamentul tău de a-ți îmbunătăți viața.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Următorul tău premiu se deblochează în %1$d Check-In-uri</string>
+  <string name="pending_approval">așteaptă acceptul</string>
+  <string name="filters">Filtre</string>
+  <string name="done">Gata</string>
+  <string name="group_tasks_edit_description">Sarcinile de grup nu pot fi editate.</string>
+  <string name="group_tasks_edit_title">Nu poți edita această sarcină</string>
+  <string name="groups">Grupuri</string>
+  <string name="all">Toate</string>
+  <string name="none">Niciuna</string>
+  <string name="owned">Deținut</string>
+  <string name="not_owned">Nedeținut</string>
+  <string name="new_game">Joc\nNou</string>
+  <string name="login_btn_fb">Logare cu Facebook</string>
+  <string name="login_btn_google">Logare cu Google</string>
+  <string name="action_back">Înapoi</string>
+  <string name="randomize">Randomizează</string>
+  <string name="avatar_extras">Extra</string>
+  <string name="avatar_skin_color">Culoarea Pielii</string>
+  <string name="avatar_hair_color">Culoarea Părului</string>
+  <string name="avatar_hair_bangs">Breton</string>
+  <string name="avatar_hair_ponytail">Codiță</string>
+  <string name="avatar_glasses">Ochelari</string>
+  <string name="avatar_wheelchair">Scaun cu Rotile</string>
+  <string name="weak">Slab</string>
+  <string name="strong">Puternic</string>
+  <string name="gray">Gri</string>
+  <string name="dated">Programat</string>
+  <string name="completed">Completat</string>
+  <string name="setuP_group_other">Alta</string>
+  <string name="clear">Îndepărtează</string>
+  <string name="empty_title_habits">Nu ai niciun Obicei</string>
+  <string name="empty_description_habits">Obiceiurile sunt sarcini care nu au un program rigid. Poți să le bifezi de mai multe ori pe zi, sau niciodată. </string>
+  <string name="empty_title_dailies">Nu ai Cotidiene</string>
+  <string name="empty_description_dailies">Cotidienele sunt sarcini care se repetă regulat. Alege programul care funcționează pentru tine!</string>
+  <string name="empty_title_todos">Nu ai lucruri De-Făcut</string>
+  <string name="empty_description_todos">Lucrurile De-Făcut sunt sarcini care trebuie completate o singură dată. Bifează-ți lucrurile De-Făcut pentru a le crește valoarea. </string>
+  <string name="empty_title_rewards">Nu ai nicio Recompensă</string>
+  <string name="reset_walkthrough">Resetează Tutorialul lui Justin</string>
+  <string name="read_community_guidelines">Te rugăm să citești Ghidurile Comunității înainte să postezi</string>
+  <string name="maintenance">În Lucru</string>
+  <string name="reload_content">Reîmprospătează Conținutul</string>
+  <string name="dailyDueDefaultView">Setează Cotidienele la tabul cu termen limită</string>
+  <string name="dailyDueDefaultViewDescription">Cu această opțiune selectată, Cotidienele tale vor fi setate ca default la ‘termen limită’ în loc de ‘toate’</string>
+  <string name="repeat_summary">Repetă %1$s la fiecare %2$s %3$s %4$s</string>
+  <string name="no_billing_gems">Dispozitivul tău nu deține niciun din metodele de plată disponibile. Te rugăm să utilizezi site-ul habitica pentru a achiziționa nestemate.</string>
+  <string name="no_billing_subscriptions">Dispozitivul tău nu deține niciun din metodele de plată disponibile. Te rugăm să utilizezi site-ul habitica pentru a te abona.</string>
+  <string name="save">Salvează</string>
+  <string name="location">Locație</string>
+  <string name="tasks">Sarcini</string>
+  <string name="challenge_create_error_enough_gems">Nu ai suficiente nestemate pentru a crea o provocare.</string>
+  <string name="challenge_create_error_no_tasks">Ai nevoie de cel puțin o sarcină pentru a crea această Provocare.</string>
+  <string name="challenge_create_error_title">Ai nevoie de un titlu pentru a crea această Provocare.</string>
+  <string name="description_optional">Descriere (opțional)</string>
+  <string name="new_challenge_title">Titlul noii Provocări</string>
+  <string name="ownership">Proprietate</string>
+  <string name="inn">Han</string>
+  <string name="system">Sistem</string>
+  <string name="start_quest">Începe o nouă Expediție</string>
+  <string name="leave_party">Părăsește Ceata</string>
+  <string name="party_description">Descrierea Cetei</string>
+  <string name="abort_confirmation">Ești sigur că vrei să abandonezi această misiune? O va abandona pentru toată lumea din ceata ta, iar progresul de până acum va fi pierdut. Răvașul Expediției va reveni deținătorului.</string>
+  <string name="leave_quest_confirmation">Ești sigur(ă) că vrei să părăsești această expediție în desfășurare? Tot progresul expediției va fi pierdut.</string>
+  <string name="number_participants">%1$d Participanți</string>
+  <string name="welcome_back">Bine ai Revenit</string>
+  <string name="yesterdaililes_prompt">Ai făcut vreuna din Cotidienele acestea ieri?</string>
+  <string name="start_day">Începe Ziua</string>
+  <string name="leave_party_confirmation">Ești sigur că vrei să părăsești această Ceată?</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Următorul Premiu în %d Check-In-uri</string>
+  <string name="pending">În așteptare</string>
+  <string name="accepted">Acceptat</string>
+  <string name="declined">Refuzat</string>
+  <string name="participants">Participanți</string>
+  <string name="invitations">Invitații</string>
+  <string name="quest_leader_header" formatted="false">Început de %s</string>
+  <string name="quest_abort_message">Ești sigur că vrei să abandonezi această misiune? O va abandona pentru toată lumea din ceata ta, iar progresul de până acum va fi pierdut. Răvașul Expediției va reveni deținătorului.</string>
+  <string name="reloading_content">Conținutul se reîncarcă</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">mld</string>
+  <string name="your_balance">Soldul tău:</string>
+  <string name="available_until" formatted="false">Valabil până la %s</string>
+  <string name="gems_left_max" formatted="false">Nestemate Lunare: %1$d/%2$d Rămase</string>
+  <string name="gems_left_nomax" formatted="false">Nestemate Lunare: %d Rămase</string>
+  <string name="health">Sănătate</string>
+  <string name="collect">Colectează</string>
+  <string name="rage_meter">Indicator de Furie</string>
+  <string name="boss_quest">Expediția Căpcăunului</string>
+  <string name="collection_quest">Expediție de Colecție</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d puncte de Experiență</string>
+  <string name="gold_reward" formatted="false">%d Aur</string>
+  <string name="quest_owner_rewards">Recompensele Deținătorului Expediției</string>
+  <string name="str_abbrv">Str</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
+  <string name="reset_account">Resetează Contul</string>
+  <string name="reset_account_description">ATENȚIE! Urmează să resetezi multiple părți din contul tău. Descurajăm viguros acest lucru, însă unele persoane îl consideră folositor la început, după utilizarea pentru scurt timp a site-ului. \n\nÎți vei pierde nivelul, aurul și punctele de experiență. Toate sarcinile tale (cu excepția celor din provocări) vor fi șterse permanent și vei pierde tot istoricul. Îți vei pierde tot echipamentul, dar vei putea să îl cumperi din nou, incluzând echipamentul în ediție limitată și obiectele Misterioase pentru abonați pe care le deții deja (va fi nevoie să fii în clasa corectă pentru a putea re-cumpăra echipamentul specific clasei). Îți vei păstra clasa actuală, împreună cu animalele de companie și animalele de încălecat. E posibil să preferi utilizarea Globului Renașterii, opțiune mult mai sigură, care îți va păstra sarcinile și echipamentul. </string>
+  <string name="delete_account">Șterge Contul</string>
+  <string name="delete_account_description">Ești sigur(ă)? Această acțiune îți va șterge contul pentru totdeauna, cu imposibilitatea recuperării acestuia. Pentru a utiliza Habitica din nou, va fi necesar să te înregistrezi cu un cont nou. Nestematele deținute sau cheltuite nu vor fi restituite. Dacă ești absolut sigur(ă), introdu-ți parola în căsuța de mai jos. </string>
+  <string name="reset_account_confirmation">resetează-mi contul</string>
+  <string name="delete_account_confirmation">șterge-mi contul</string>
+  <string name="danger_zone">Zona de Pericol</string>
+  <string name="nevermind">Nu mai contează</string>
+  <string name="resetting_account">Contul se resetează</string>
+  <string name="deleting_account">Contul se șterge</string>
+  <string name="insufficientGold">Trebuie să mai completezi sarcini înainte să-ți permiți acest obiect!</string>
+  <string name="insufficientGems">Ai nevoie de mai multe Nestemate pentru a cumpăra acest obiect!</string>
+  <string name="purchase_gems">Cumpără nestemate</string>
+  <string name="insufficientHourglasses">Ai nevoie de mai multe Clepsidre Mistice pentru a cumpăra acest obiect!</string>
+  <string name="get_hourglasses">Fă rost de clepsidre</string>
+  <string name="subscribe_for_hourglasses">Abonează-te pentru Clepsidre</string>
+  <string name="timetravelers_closed_description">Câștigă o Clepsidră Mistică pentru fiecare trei luni consecutive de abonare, apoi utilizează-le pentru a debloca obiecte în ediție limitată, animale de companie sau de călărit din trecut... și viitor!</string>
+  <string name="want_to_subscribe">Vreau să mă abonez</string>
+  <string name="seasonal_closed_description">Galele Grand au loc în apropierea solstițiilor și echinocțiilor, așa că întoarce-te atunci pentru a găsi un asortiment de obiecte sezonale speciale!</string>
+  <string name="come_back_soon">Revino în curând!</string>
+  <string name="level">Nivel</string>
+  <string name="streak_label">Șiruri de 21 de Zile</string>
+  <string name="stats">Statistici</string>
+  <string name="fix_character_description">Dacă ai întâlnit o eroare sau ai făcut o greșeală care ți-a modificat pe nedrept personajul, poți corecta manual acest lucru aici. </string>
+  <string name="fix_character_values">Corectează Valorile Personajului</string>
+  <string name="saving">Se salvează</string>
+  <string name="forgot_password_title">Trimite-mi Link-ul de Resetare a Parolei prin Email</string>
+  <string name="forgot_password_description">Introdu adresa de email utilizată la înregistrarea contului tău Habitica.</string>
+  <string name="forgot_password_confirmation">Dacă ai pus la dispoziție o adresă de email, instrucțiuni cu setările noii tale parole au fost trimise.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Editează-ți profilul public.</string>
+  <string name="display_name">Nume Afișat</string>
+  <string name="photo_url">URL-ul Pozei</string>
+  <string name="login_name">Numele de Logare</string>
+  <string name="about">Despre</string>
+  <string name="app_settings">Setările Aplicației</string>
+  <string name="authentication">Autentificare</string>
+  <string name="authentication_summary">Modifică-ți opțiunile de autentificare.</string>
+  <string name="change_password">Schimbă Parola</string>
+  <string name="change_email">Schimbă Adresa de Email</string>
+  <string name="change_login_name">Schimbă Numele de Logare</string>
+  <string name="change">Schimbă</string>
+  <string name="character_level">Nivelul Personajului</string>
+  <string name="auto_allocate_points">Alocă Automat Puncte</string>
+  <string name="stat_guide">Ghidul Statisticilor</string>
+  <string name="character_build">Constituția Personajului</string>
+  <string name="character_build_description">Fiecare nivel îți asigură un punct care poate fi atribuit conform alegerii tale. Poți s-o faci automat, sau să lași jocul să decidă pentru tine folosind una dintre opțiunile de Alocare Automată.</string>
+  <string name="strength">Forță</string>
+  <string name="strength_description">Îți crește bonusul loviturilor critice și le face mai probabile când îndeplinești o sarcină. De asemenea, crește deteriorarea împărțită căpcăunilor. </string>
+  <string name="intelligence">Inteligență</string>
+  <string name="intelligence_description">Sporește EXP obținută pentru completarea sarcinilor. De asemenea, sporește limita de mana și cât de rapid se regenerează mana în timp. </string>
+  <string name="constitution">Constituție</string>
+  <string name="constitution_description">Diminuează cantitatea de deteriorare suferită de către sarcinile tale. Nu diminează deteriorarea suferită în urma atacurilor căpcăunilor. </string>
+  <string name="perception">Percepție</string>
+  <string name="perception_description">Sporește probabilitatea găsirii obiectelor găsite atunci când îndeplinești Sarcini, obiectele găsite zilnic, bonusurile pentru șirul de activitate, cantitatea de aur acordată pentru Sarcini. </string>
+  <string name="buffs">Sporuri</string>
+  <string name="allocated">Alocate</string>
+  <string name="distribute_evenly">Distribuie Egal</string>
+  <string name="distribute_class">Distribuie în funcție de clasă</string>
+  <string name="distribute_task">Distribuie în funcție de activitatea sarcinii</string>
+  <string name="no_points_to_allocate">Niciun Punct de Alocat</string>
+  <string name="points_to_allocate" formatted="false">%d Punctre de Alocat</string>
+  <string name="distribute_evenly_help">Alocă același număr de puncte fiecărui atribut.</string>
+  <string name="distribute_class_help">Alocă mai multe puncte atributelor importante pentru Clasa ta. </string>
+  <string name="distribute_task_help">Alocă puncte în funcție de categoriile Forță, Inteligență, Constituție, și Percepție asociate cu sarcinile completate.</string>
+  <string name="allocating_points">Alocarea Punctelor</string>
+  <string name="class_equipment">Echipament</string>
+  <string name="equipment_empty">Ai deja tot echipamentul! Mai mult va fi pus la dispoziție în timpul Galelor Grand, din apropierea solstițiilor și a echinocțiilor.</string>
+  <string name="classless">Fără Clasă</string>
+  <string name="class_equipment_shop_dialog">Acest obiect este disponibil doar unei anumite clase.\nÎți poți modifica clasa din Setări.</string>
+  <string name="class_gear_disclaimer">Poți achiziționa doar echipament pentru clasa ta actuală</string>
+  <string name="available_stats" formatted="false">%d puncte</string>
+  <string name="toogle_emojis">Toogle Emojis</string>
+  <string name="tavern_description">Bine ai venit la Han! Ia un scaun pentru a purta o discuție, sau ia o pauză de la sarcinile tale. </string>
+  <string name="check_into_inn">Cazează-te în Han</string>
+  <string name="community_guidelines">Ghidurile Comunității</string>
+  <string name="view_community_guidelines">Vezi Ghidurile Comunității</string>
+  <string name="guidelines_description">Habitica încearcă să creeze un mediu primitor tuturor utilizatorilor, indiferent de vârsă și proveniență, în special în spații publice precum Taverna. Dacă ai întrebări, te rugăm să consulți ghidurile.</string>
+  <string name="helpful_links">Link-uri utile</string>
+  <string name="view_faq">Vezi FAQ</string>
+  <string name="report_bug">Raportează o Eroare</string>
+  <string name="player_tiers">Nivelurile Jucătorului</string>
+  <string name="staff_moderators">Staff și Moderatori</string>
+  <string name="tiers_descriptions">Numele de Utilizator colorat pe care îl vezi în chat reprezintă nivelul de contribuitor al persoanei respective. Cu cât este mai mare nivelul, cu atât mai mult a contribuit persoana pentru Habitica prin artă, cod, comunitate, sau altele!</string>
+  <string name="navigation_drawer_open">Deschize sertarul de navigație</string>
+  <string name="navigation_drawer_close">Închide sertarul de navigație</string>
+  <string name="world_boss">Căpcăunul Global</string>
+  <string name="world_boss_art">Arta Căpcăunului</string>
+  <string name="boss_art">Arta Căpcăunului</string>
+  <string name="world_boss_description">Descrierea Căpcăunului Global</string>
+  <string name="rage_strike_count" formatted="false">Lovituri Furioase: %d/%d</string>
+  <string name="pending_strike_description">Lovitura nu a avut încă loc!\nCăpcăunul Șef se va enerva și îl va ataca pe unul dintre negustorii noștri prietenoși atunci când bara sa de furie se umple. Ține pasul cu Activitățile tale Zilnice pentru a încerca să previi asta!</string>
+  <string name="pending_strike_title">Lovitură iminentă</string>
+  <string name="strike_description_title">Ce este o Lovitură Furioasă?</string>
+  <string name="strike_description_subtitle">Există 3 potențiale Lovituri Furioase</string>
+  <string name="strike_description_description">Măsurătoarea se umple atunci când Habiticanii nu-și îndeplinesc Activitățile Zilnice. Dacă se umple complet, DysHearener-ul va dezlănțui atacul său cutremurător asupra unuia dintre negustori, așa că ar trebui să te asiguri că-ți îndeplinești sarcinile!</string>
+  <string name="pending_strike_subtitle">Lovitura nu a avut încă loc!</string>
+  <string name="strike_active_title" formatted="false">%s a fost Atacat!</string>
+  <string name="strike_active_subtitle" formatted="false">%s este Distrus!</string>
+  <string name="strike_active_description" formatted="false">Dragul nostru %s a fost devastat atunci când %s a distrus %s. Îndeplinește-ți sarcinile rapid pentru a înfrânge monstrul și a ajuta la reconstrucție! </string>
+  <string name="questShop">Magazinul de Expediții</string>
+  <string name="market_owner_long">Alex Negustorul</string>
+  <string name="tavern_owner_long">Daniel Păzitorul Hanului</string>
+  <string name="stable_owner_long">Matt îngrijitorul animalelor</string>
+  <string name="hide_boss_art">Ascunde Arta Căpcăunului</string>
+  <string name="active_world_boss">Căpcăun Global activ</string>
+  <string name="no_party_description">Pleacă în expediții împreună cu prieteni sau singur. Luptă împotriva monștrilor, crează Provocări, și ajută-te să rămâi responsabil cu ajutorul Cetelor. </string>
+  <string name="no_party_title">Joacă Habitica într-o Ceată</string>
+  <string name="join_party_title">Vrei să te alături unei cete?</string>
+  <string name="create_party_website">Deschide site-ul pentru a crea o ceată</string>
+  <string name="id_copied">ID copiat în clipboard</string>
+  <string name="insufficientSubscriberGems">Ai cumpărat toate Nestematele pe care le poți cumpăra luna aceasta. Mai multe vor fi puse la dispuziție în primele trei zile ale fiecărei luni. Mulțumim pentru abonare!</string>
+  <string name="insufficientSubscriberGemsTitle">Limită lunară de Nestemate Atinsă</string>
+  <string name="chat_message">Mesaje în Chat</string>
+  <string name="world_boss_description_title">Ce este un Căpcăun Global?</string>
+  <string name="world_boss_description_description">Un Căpcăun Șef este un eveniment special la care toată comunitatea conlucrează pentru a înfrânge un monstru puternic cu sarcinile lor!\nCompletează sarcini pentru a deteriora Căpcăunul\nCăpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori!\nPoți continua să lupți împotriva Căpcăunilor din Expediții, iar deteriorarea va fi aplicată ambilor\nMergi la Tavernă pentru a vedea progresul Căpcăunului și atacurile lui Furioase</string>
+  <string name="world_boss_description_intro">Un Căpcăun Șef este un eveniment special în cadrul căruia toată comunitatea lucrează împreună pentru a răpune un monstru cu ajutorul sarcinilor lor!</string>
+  <string name="world_boss_description_1">Completează sarcini pentru a deteriora Căpcăunul</string>
+  <string name="world_boss_description_2">Căpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori!</string>
+  <string name="world_boss_description_3">Poți continua cu Expediții normale împotriva Căpcăunilor, deteriorarea se va aplica ambelor</string>
+  <string name="world_boss_description_4">Mergi în Tavernă să vezi progresul Căpcăunului și atacurile Furioase</string>
+  <string name="world_boss_action_prompt" formatted="false">Răpune Căpcăunul pentru a primi recompense speciale și pentru a salva Habitica de Teroarea lui %s!</string>
+  <string name="world_boss_description_subtitle">%s atacuri!</string>
+  <string name="questShop_owner_long">Ian Ghidul Expedițiilor</string>
+  <string name="seasonalShop_owner_long">Vrăjitoarea Sezonului</string>
+  <string name="rage_attack">Atac furios:</string>
+</resources>
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index 269e56583..ee2286655 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Уровень:</string>
     <string name="profile_class_bonus">Класс-Бонус:</string>
     <string name="profile_allocated">Выделено:</string>
-    <string name="profile_boosts">Ускорения:</string>
     <string name="profile_private_message">Личное сообщение</string>
     <string name="profile_achievements">Достижения</string>
-    <string name="profile_achievement_ok">Хорошо</string>
-    <string name="profile_qrcode_close">Закрыть</string>
 
 </resources>
diff --git a/Habitica/res/values-ru/strings.sidebar.xml b/Habitica/res/values-ru/strings.sidebar.xml
index b24e56c4d..0aa94ba5e 100644
--- a/Habitica/res/values-ru/strings.sidebar.xml
+++ b/Habitica/res/values-ru/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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_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_about">О приложении</string>
   <string name="sidebar_shops">Магазины</string>
   <string name="sidebar_stats">Статистика</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index 10e180b3d..781b3f329 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото, которое вы получаете!</string>
   <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
   <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
-  <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
-  <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
-  <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
-  <string name="tutorial_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</string>
+    <string name="tutorial_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</string>
   <string name="tutorial_party">Это место где вы и ваши друзья можете помочь друг другу оставаться ответственными на пути к цели и сражаться с монстрами с помощью своих заданий!</string>
   <string name="tutorial_tavern">Добро пожаловать в Таверну, где собрались участники всех рас, полов и возрастов! Здесь вы можете болтать или задавать вопросы. Повеселитесь!</string>
-  <string name="tutorial_classes">Выберите, кем вы будете: Воином, Магом, Целителем или Разбойником! У каждого класса есть уникальное снаряжение и навыки. Нажмите (?), чтобы узнать больше!</string>
-  <string name="tutorial_stats">Нажмите серую кнопку, чтобы распределить все ваши характеристики сразу, или нажмите на стрелки, чтобы добавить им по одному очку за раз.</string>
+    <string name="tutorial_stats">Нажмите серую кнопку, чтобы распределить все ваши характеристики сразу, или нажмите на стрелки, чтобы добавить им по одному очку за раз.</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 77cb3f612..c1dfba025 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Опыт</string>
   <string name="HP_default">Здоровье</string>
   <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройки не могут быть загружены из штрих-кода</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Ваш клиентский сервер</string>
-  <string name="SP_userID_title">ID пользователя</string>
+    <string name="SP_userID_title">ID пользователя</string>
   <string name="SP_userID_summary">Ваш ID</string>
   <string name="SP_APIToken_title">API Знак</string>
   <string name="SP_APIToken_summary">Ваш API 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="PS_contact_title">Свяжитесь со мной</string>
+    <string name="pref_account_header">Аккаунт</string>
   <string name="pref_first_day_of_the_week_title">Первый день недели</string>
   <string name="pref_first_day_of_the_week_summary">Первый день недели во всех календарях</string>
   <string name="pref_reminder_header">Ежедневное напоминание</string>
   <string name="pref_reminder_checkbox">Активируйте напоминание</string>
   <string name="pref_reminder_picker">Установите время напоминания</string>
   <string name="pref_cds_header">Персональное начало суток</string>
-  <string name="pref_cds_picker">Установить персональное начало суток</string>
-  <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
+    <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
   <string name="push_notifications">Push-уведомления</string>
   <string name="push_notifications_sum">Настройте push-уведомления</string>
   <string name="preference_push_you_won_challenge">Вы прошли испытание!</string>
@@ -37,14 +32,8 @@
   <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="action_edit">Редактировать</string>
+    <string name="action_cancel">Закрыть</string>
   <string name="login_btn">Вход</string>
   <string name="register_btn">Регистрация</string>
   <string name="username">Имя пользователя</string>
@@ -54,32 +43,23 @@
   <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">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
-  <string name="about.rate_our_app">Оцените наше приложение</string>
-  <string name="about.give_us_feedback">Оставьте отзыв!</string>
-  <string name="about.bugreport">Сообщить об ошибке</string>
-  <string name="about.source_code">Исходный код</string>
-  <string name="repeatEvery">Повторять раз в</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="LoginActivityName">Добро пожаловать</string>
+    <string name="about_title">О приложении</string>
+  <string name="about_libraries">Библиотеки</string>
+    <string name="about_habitica_open_source">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
+  <string name="about_rate_our_app">Оцените наше приложение</string>
+  <string name="about_give_us_feedback">Оставьте отзыв!</string>
+  <string name="about_bugreport">Сообщить об ошибке</string>
+  <string name="about_source_code">Исходный код</string>
+    <!--Network Errors-->
+    <string name="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_title">Ошибка проверки</string>
   <string name="login_validation_error_fieldsmissing">Вы должны заполнить все поля.</string>
   <string name="save_changes">Сохранить</string>
   <string name="copy">Копировать</string>
   <string name="notes">Заметки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Сложность</string>
+    <string name="difficulty">Сложность</string>
   <string name="tags">Метки</string>
   <string name="trivial">Пустяк</string>
   <string name="easy">Легко</string>
@@ -90,19 +70,8 @@
   <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="repeatables_summary_title">Сводка</string>
-  <string name="repeatables_title">Повторы</string>
-  <string name="repeatables_on_title">Повторять по</string>
-  <string name="repeatables_frequency_daily">Ежедневно</string>
+    <string name="attributes">Характеристики</string>
+    <string name="repeatables_frequency_daily">Ежедневно</string>
   <string name="repeatables_frequency_weekly">Еженедельно</string>
   <string name="repeatables_frequency_monthly">Ежемесячно</string>
   <string name="repeatables_frequency_yearly">Ежегодно</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">У вас закончилось здоровье!</string>
   <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
   <string name="filter">Фильтр</string>
-  <string name="profile_image">Аватар</string>
-  <string name="mana_price_button">%d МP</string>
-  <string name="used_skill">Вы использовали %1$s за %2$d маны.</string>
-  <string name="used_skill_without_mana">Вы использовали %1$s.</string>
+    <string name="used_skill_without_mana">Вы использовали %1$s.</string>
   <string name="new_checklist_item">новый пункт списка</string>
-  <string name="add_checklist_item">Добавить</string>
-  <string name="reminder_title">Не забудьте отмечать свои задачи</string>
-  <string name="skill_progress_title">Использовать навык</string>
-  <string name="coming_soon">Скоро</string>
-  <string name="chat_flag_confirmation">Вы уверены, что хотите пожаловаться на это сообщение?</string>
-  <string name="flag_confirm">Пожаловаться на сообщение</string>
-  <string name="unlock_lvl_11">Открывается на 11 уровне</string>
-  <string name="no_party_message">Вы не состоите в команде. Для того, чтобы присоединиться к команде, пожалуйста, перейдите на сайт.</string>
-  <string name="forgot_pw_btn">Забыли пароль</string>
-  <string name="tavern.inn.checkOut">Cнова активировать ваши ежедневные задания</string>
-  <string name="tavern.inn.rest">Временно приостановить ваши ежедневные задания</string>
-  <string name="reward.dialog.buy">Купить</string>
-  <string name="reward.dialog.dismiss">Отклонить</string>
+    <string name="reminder_title">Не забудьте отмечать свои задачи</string>
+    <string name="unlock_lvl_11">Открывается на 11 уровне</string>
+    <string name="forgot_pw_btn">Забыли пароль</string>
+  <string name="tavern_inn_checkOut">Cнова активировать ваши ежедневные задания</string>
+  <string name="tavern_inn_rest">Временно приостановить ваши ежедневные задания</string>
+  <string name="reward_dialog_buy">Купить</string>
+  <string name="reward_dialog_dismiss">Отклонить</string>
   <string name="party">Команда</string>
   <string name="chat">Чат</string>
   <string name="members">Участники</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Ежедневные задания</string>
   <string name="todos">Задачи</string>
   <string name="rewards">Награды</string>
-  <string name="taskform.delete.title">Вы уверены?</string>
-  <string name="taskform.delete.message">Вы уверены, что хотите удалить?</string>
-  <string name="yes">Да</string>
+    <string name="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_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">Телосложение</string>
   <string name="avatar_size_slim">Стройное</string>
   <string name="avatar_size_broad">Плотное</string>
   <string name="avatar_background">Фон</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Купить</string>
   <string name="purchase_set_title">Купить комплект %s</string>
   <string name="due_date">Дата выполнения</string>
-  <string name="quest.accept">Принять</string>
-  <string name="quest.reject">Отклонить</string>
-  <string name="quest.begin">Начать квест</string>
-  <string name="quest.cancel">Отменить приглашение</string>
-  <string name="quest.abort">Остановить квест</string>
-  <string name="quest.leave">Покинуть квест</string>
-  <string name="quest.pending">Ожидает</string>
-  <string name="quest.accepted">Принято</string>
-  <string name="quest.rejected">Отклонено</string>
-  <string name="quest.participants">Участники</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="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="version_info">Версия %1$s (%2$d)</string>
   <string name="sidebar_help">Помощь и ЧаВо</string>
   <string name="complete_tutorial">Есть!</string>
   <string name="dismiss_tutorial">Напомнить позже</string>
   <string name="intro_1_subtitle">Добро пожаловать в</string>
-  <string name="intro_1_title">Хабитика</string>
-  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
+    <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
   <string name="intro_2_subtitle">Прогресс в игре</string>
   <string name="intro_2_title">Прогресс в жизни</string>
   <string name="intro_2_description">Разблокируйте возможности в игре, отмечая выполненные задания в реальной жизни. Получите броню, питоцев и многое другое в качестве наград за достижение целей.</string>
@@ -198,12 +148,9 @@
   <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="next_button">Далее</string>
   <string name="skip_button">Пропустить</string>
-  <string name="setup_welcome_description">Добро пожаловать в Habitica, где продвижение в игре помогает вам в рельной жизни! Выполняя реальные задачи, вы разблокируете снаряжение, питомцев, квесты и многое другое.</string>
-  <string name="setup_welcome_title">Добро пожаловать</string>
-  <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
+    <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
   <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Тренировки</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Улучшить навык владения ремеслом</string>
   <string name="setup_task_creativity_2">Поработать над творческим проектом</string>
   <string name="setup_task_creativity_3">Закончить творческий проект</string>
-  <string name="gem.purchase.support">Хотите помочь нам развивать Habitica и дальше? Вы можете поддержать разработчиков, купив самоцветы!\n\nСамоцветы позволяют вам купить забавные дополнения такие, как:  \n\n - классные костюмы для вашего аватара;\n - потрясающие фоны;\n - веселые квесты, в награду за которые вы получите яйца с питомцами;\n - возможность сменить класс до 100 уровня.\n\nБольшое спасибо за то, что вы помогаете Habitica делать лучшей на сколь это возможно. Ваша поддержка очень важна для нас!</string>
-  <string name="my_guilds">Мои гильдии</string>
+    <string name="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="gems">Самоцветы</string>
+    <string name="delete">Удалить</string>
   <string name="name">Имя</string>
   <string name="description">Описание</string>
   <string name="add_tag">Добавить новый Тег</string>
   <string name="privacy">Приватность</string>
   <string name="write_message">Написать сообщение</string>
-  <string name="post">Отправить</string>
-  <string name="guild_search_hint">Поиск для гильдий</string>
-  <string name="todo_due">Выполнить к: %s</string>
-  <string name="daily_streak">выполнено подряд: %d</string>
-  <string name="todo_has_duedate">У задания есть срок выполнения</string>
-  <string name="battle_gear">Боевая экипировка</string>
+    <string name="guild_search_hint">Поиск для гильдий</string>
+    <string name="battle_gear">Боевая экипировка</string>
   <string name="costume">Костюм</string>
   <string name="outfit_head">Голова</string>
   <string name="outfit_headAccessory">Аксессуары</string>
@@ -268,10 +206,8 @@
   <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">Вы уверены? Только %1$d из %2$d членов команды присоединились к этому квесту! Квест начнется автоматически, когда все игроки присоедятся или отклонят приглашение.</string>
-  <string name="quest.invitation.text">Вас пригласили в квест!</string>
-  <string name="ago_1day">1 день назад</string>
+    <string name="quest_begin_message">Вы уверены? Только %1$d из %2$d членов команды присоединились к этому квесту! Квест начнется автоматически, когда все игроки присоедятся или отклонят приглашение.</string>
+    <string name="ago_1day">1 день назад</string>
   <string name="ago_days">%d дней назад</string>
   <string name="ago_hours">%d часов назад</string>
   <string name="ago_1hour">1 час назад</string>
@@ -286,13 +222,9 @@
   <string name="armoireEquipment">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
   <string name="armoireFood">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
   <string name="armoireExp">Вы сражаетесь с сундуком и набираете опыт. Получай!</string>
-  <string name="armoireNotesFull">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
-  <string name="armoireLastItem">Вы получили последний редкий предмет из зачарованного сундука.</string>
-  <string name="armoireNotesEmpty">Новое снаряжение будет появляться в сундуке раз в месяц. До тех пор – продолжайте кликать ради опыта и еды!</string>
-  <string name="sell">Продать (%d золота)</string>
+    <string name="sell">Продать (%d золота)</string>
   <string name="hatch_with_potion">Полить эликсиром</string>
-  <string name="feed_to_pet">Покормить питомца</string>
-  <string name="hatch_egg">Вывести питомца из яйца</string>
+    <string name="hatch_egg">Вывести питомца из яйца</string>
   <string name="invite_party">Пригласить команду</string>
   <string name="dialog_feeding">Покормить %s:</string>
   <string name="use_animal">Использовать</string>
@@ -303,17 +235,8 @@
   <string name="close">Закрыть</string>
   <string name="share">Поделиться</string>
   <string name="notification_pet_fed">Вы покормили вашего %s!</string>
-  <string name="notification_purchase">Вы купили %s</string>
-  <string name="notification_purchase_reward">Вы купили награду</string>
-  <string name="sectiondrop">Обычные</string>
-  <string name="sectionpremium">Из Волшебного эликсира</string>
-  <string name="sectionquest">Квестовые</string>
-  <string name="sectionspecial">Особые</string>
-  <string name="sectionmounts">Основные скакуны</string>
-  <string name="sectionpremiumMounts">Магический эликсир</string>
-  <string name="sectionquestMounts">Квест</string>
-  <string name="sectionspecialMounts">Редкие питомцы</string>
-  <string name="world_quest">Мировой квест</string>
+    <string name="notification_purchase_reward">Вы купили награду</string>
+    <string name="world_quest">Мировой квест</string>
   <string name="inn_description">Нужен отдых? Запишитесь в гостиницу Даниэля, чтобы остановить несколько сложных игровых механик страны Habitica:\n\n
 • Пропущенные ежедневные дела не нанесут урона\n
 • Задачи не будут терять серий или понижения в цвете\n
@@ -332,8 +255,7 @@
   <string name="healer_description">Целители неуязвимы перед уроном и распространяют защиту на других. Пропущенные ежедневные задания и вредные привычки несильно их беспокоят, а после неудачи они могут восстановить здоровье. Играйте за целителя, если вам нравится помогать другим членам команды или если вас вдохновляет мысль о возможности усердным трудом обмануть смерть!</string>
   <string name="select_class">Выберите класс</string>
   <string name="opt_out_class">Отказаться</string>
-  <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
-  <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
+    <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
   <string name="class_changed">Теперь вы %s!</string>
   <string name="class_changed_description">У вас есть новая боевая экипировка по умолчанию, которую вы можете сменить в разделе Снаряжение!</string>
   <string name="choose_class">Выбрать класс</string>
@@ -347,23 +269,18 @@
   <string name="invite_existing_users">Пригласить существующих пользователей</string>
   <string name="send">Отправить</string>
   <string name="invite">Пригласить друзей</string>
-  <string name="invite_id_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их с помощью ID пользователя.</string>
-  <string name="invite_username_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их используя имя пользователя.</string>
+    <string name="invite_username_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их используя имя пользователя.</string>
   <string name="invite_email_description">Если друг присоединится к Habitica, перейдя по ссылке в вашем письме, он автоматически будет приглашён в вашу команду!</string>
   <string name="add_invites">Добавить приглашенных</string>
-  <string name="user_id">ID пользователя</string>
-  <string name="email">Электронная почта</string>
-  <string name="invite_users">Пригласить в команду</string>
-  <string name="share_using">Поделиться с помощью</string>
+    <string name="email">Электронная почта</string>
+    <string name="share_using">Поделиться с помощью</string>
   <string name="share_levelup">Я достиг %d уровня в Habitica, улучшая привычки в реальной жизни!</string>
   <string name="share_hatched">У меня только что вылупился питомец %1$s %2$s в Habitica, потому что я выполнял задачи в реальной жизни!</string>
   <string name="share_raised">Я только что получил скакуна %1$s в Habitica, выполняя задачи в реальной жизни!</string>
   <string name="open_in_store">Откройте в Play маркет</string>
   <string name="change_class_confirmation">Вы уверены что хотите поменять класс? Это стоит 3 самоцвета.</string>
   <string name="change_class_equipment_warning">Внимание: вы больше не можете покупать снаряжение класса %s.</string>
-  <string name="leaderMessage">Сообщение от %1$s</string>
-  <string name="leaderName">Предводитель: %1$s</string>
-  <string name="confirm">Подтвердить</string>
+    <string name="confirm">Подтвердить</string>
   <string name="market">Магазин</string>
   <string name="timeTravelers">Путешественники во времени</string>
   <string name="seasonalShop">Сезонная лавка</string>
@@ -371,37 +288,16 @@
   <string name="party_invite">Разблокировать, пригласив друзей</string>
   <string name="login_incentive">Разблокируй, регулярно заходя в Habitica</string>
   <string name="create_account">Разблокируй, создав аккаунт</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="successful_purchase">Купленный %1$s</string>
+    <string name="gold_plural">золото</string>
   <string name="chat_message_copied">Сообщение скопировано в буфер обмена</string>
-  <string name="copy_chat_message">Скопировать в буфер обмена</string>
-  <string name="edit_tag_title">Редактировать метку</string>
-  <string name="edit_tag_btn_edit">Редактировать</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Удалить</string>
-  <string name="confirm_delete_tag_title">Вы уверены?</string>
+    <string name="edit_tag_btn_edit">Редактировать</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Выберите получателя</string>
   <string name="action_continue">Продолжить</string>
-  <string name="scan_qr_code">Сканировать QR код</string>
-  <string name="enter_recipient_uuid">Ввести пользовательский ID участника</string>
-  <string name="invited_to_party">Вас пригласили в команду!</string>
+    <string name="invited_to_party">Вас пригласили в команду!</string>
   <string name="stats_widget_label">Характеристики Habitica</string>
   <string name="add_task">Добавить задачу</string>
   <string name="add_habit">Добавить привычку</string>
@@ -412,15 +308,14 @@
   <string name="widget_habit_button">Привычки Habitica</string>
   <string name="widget_dailies">Ежедневные задания Habitica</string>
   <string name="widget_todo_list">Список задач Habitica</string>
-  <string name="widget_add_task">Добавить задачу Habitica</string>
-  <string name="google_services_missing">Сервис Google play не найден.</string>
-  <string name="gem.purchase.toolbartitle">Купить</string>
-  <string name="gem.purchase.title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
-  <string name="gem.purchase.subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
-  <string name="gem.purchase.listitem1">Крутые костюмы для аватара</string>
-  <string name="gem.purchase.listitem2">Отличные фоны</string>
-  <string name="gem.purchase.listitem3">Задания с яйцами питомцев в качестве награды</string>
-  <string name="gem.purchase.listitem4">Способность изменить свой класс, если уровень менее 100</string>
+    <string name="google_services_missing">Сервис Google play не найден.</string>
+  <string name="gem_purchase_toolbartitle">Купить</string>
+  <string name="gem_purchase_title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
+  <string name="gem_purchase_subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
+  <string name="gem_purchase_listitem1">Крутые костюмы для аватара</string>
+  <string name="gem_purchase_listitem2">Отличные фоны</string>
+  <string name="gem_purchase_listitem3">Задания с яйцами питомцев в качестве награды</string>
+  <string name="gem_purchase_listitem4">Способность изменить свой класс, если уровень менее 100</string>
   <string name="support_habitica">Поддержать Habitica</string>
   <string name="skill_transformation_use">использовать</string>
   <string name="hatching_market_info">Не выпадает то, что нужно? Посмотри на рынке!</string>
@@ -434,26 +329,26 @@
   <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_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="subscribe_listitem1">Покупка самоцветов за золото</string>
+  <string name="subscribe_listitem2">Эксклюзивные ежемесячные предметы</string>
+  <string name="subscribe_listitem3">Сохраните дополнительные элементы истории</string>
+  <string name="subscribe_listitem4">Ежедневные трофеи выпадают в два раза чаще</string>
   <string name="subscriptions">Абонемент</string>
   <string name="subscription_duration">Повторять каждые %s</string>
   <string name="subscribe">Подписаться</string>
-  <string name="subscribe.listitem1.description">Торговец Александр теперь будет продавать вам Драгоценные Камни за 20 золотых монет каждый!\n\nЕго месячная поставка сперва ограничится 25 Камнями в месяц, но может быть увеличена в зависимости от времени вашей подписки.\n\nРазмер поставки увеличивается на 5 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
-  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
-  <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
-  <string name="subscribe.listitem4.description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</string>
+  <string name="subscribe_listitem1_description">Торговец Александр теперь будет продавать вам Драгоценные Камни за 20 золотых монет каждый!\n\nЕго месячная поставка сперва ограничится 25 Камнями в месяц, но может быть увеличена в зависимости от времени вашей подписки.\n\nРазмер поставки увеличивается на 5 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
+  <string name="subscribe_listitem2_description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
+  <string name="subscribe_listitem3_description">Завершенный список дел и история доступны дольше.</string>
+  <string name="subscribe_listitem4_description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</string>
   <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
   <string name="payment_method">Способ оплаты</string>
   <string name="subscription">Подписка</string>
   <string name="active">Активный</string>
   <string name="cancel_subscription">Отменить подписку</string>
-  <string name="cancel_subscription_google.description">Больше не хотите использовать подписку? При желании можете отписаться в разделе \"Мои приложения\" в Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Вы хотите отменить свою подписку\? Из-за способа оплаты вы можете отменить подписку только через сайт. Нажмите кнопку ниже, чтобы открыть страницу в браузере!</string>
+  <string name="cancel_subscription_google_description">Больше не хотите использовать подписку? При желании можете отписаться в разделе \"Мои приложения\" в Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Вы хотите отменить свою подписку\? Из-за способа оплаты вы можете отменить подписку только через сайт. Нажмите кнопку ниже, чтобы открыть страницу в браузере!</string>
   <string name="visit_habitica_website">Посетите сайт Habitica</string>
   <string name="current_bonuses">Текущие бонусы</string>
   <string name="months_subscribed">Месяцев подписки</string>
@@ -468,56 +363,40 @@
   <string name="twelve_months">12 месяцев</string>
   <string name="subscribe_prompt_thanks">Как подписчик вы получаете эти полезные преимущества:</string>
   <string name="subscription_status">Статус подписки</string>
-  <string name="byLeader">сделано %s</string>
-  <string name="challenge_details">Детали испытания</string>
-  <string name="challenge_leave_title">Покинуть испытание</string>
+    <string name="challenge_leave_title">Покинуть испытание</string>
   <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
   <string name="challenge_remove_tasks_title">Удалить задачи</string>
   <string name="challenge_remove_tasks_text">Вы уверены, что хотите удалить задачи?</string>
   <string name="remove_tasks">Удалить</string>
   <string name="keep_tasks">Оставить</string>
   <string name="my_challenges">Мои испытания</string>
-  <string name="public_challenges">Общее</string>
-  <string name="challenges">Испытания</string>
-  <string name="daily">Ежедневное задание</string>
+    <string name="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="challenge">Испытание</string>
+    <string name="not_part_of_a_challenge">Сейчас вы не участвуете в испытаниях!</string>
   <string name="join_a_challenge">Присоединитесь к испытанию, чтобы добавить готовый набор задач в ваш список, и соревнуйтесь с другими хабитанцами, чтобы заработать достижения и даже самоцветы!</string>
   <string name="check_the_public_challenge_tab">Откройте вкладку \"Общее\", чтобы найти испытания, созданные пользователями, которые больше всего подходят вам!</string>
-  <string name="add_reminder">Добавить напоминание</string>
-  <string name="warning">Предупреждение</string>
-  <string name="open_settings">Открыть настройки</string>
-  <string name="dont_keep_activities_warning">Похоже, что у вас активен параметр разработчика \\"Не сохранять операции\\". Обычно из-за него возникают проблемы с приложением Habitica, поэтому мы советуем его отключить.</string>
-  <string name="inbox">Сообщения</string>
-  <string name="FAQ">Часто задаваемые вопросы</string>
-  <string name="special">Специальное</string>
+    <string name="inbox">Сообщения</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="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="checkInRewardEarned">Вы заработали %1$s в качестве награды за преданность к улучшению жизни.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ваш следующий приз будет доступен после  %1$d входа в игру</string>
   <string name="pending_approval">ожидает утверждения</string>
   <string name="filters">Фильтры</string>
   <string name="done">Выполнено</string>
-  <string name="group_tasks_edit_description">Групповые задания не могут быть редактированы.</string>
-  <string name="group_tasks_edit_title">Нельзя редактировать это задание</string>
-  <string name="groups">Группы</string>
+    <string name="groups">Группы</string>
   <string name="all">Все</string>
   <string name="none">Никто</string>
   <string name="owned">Принадлежит</string>
   <string name="not_owned">Не принадлежит</string>
-  <string name="new_game">Новая\nИгра</string>
-  <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
+    <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
   <string name="login_btn_google">Зарегистрироваться с Google</string>
   <string name="action_back">Назад</string>
   <string name="welcome_text">О,  должно быть, вы тут впервые. Я Джастин, и буду твоим наставником в Habitica. \n\nДля начала, как тебя зовут, герой? Не беспокойся, имя, которое я выбрал, потом можно будет изменить. Ну что, а теперь давай создадим твой аватар!</string>
@@ -549,7 +428,6 @@
   <string name="reload_content">Обновить содержимое</string>
   <string name="dailyDueDefaultView">Установить ежедневные задания по умолчанию на вкладку \'действующих\'</string>
   <string name="dailyDueDefaultViewDescription">С включённом параметром, по умолчанию будут отображаться только \'действующие\' ежедневные задания вместо \'всех\'</string>
-  <string name="repeat_summary">Повторять %1$s каждые %2$s %3$s %4$s</string>
   <string name="no_billing_gems">На вашем устройстве нет поддерживаемых способов оплаты. Пожалуйста, используйте сайт habitica, если вы хотите приобрести драгоценные камни.</string>
   <string name="no_billing_subscriptions">На вашем устройстве не поддерживается ни один из способов оплаты. Пожалуйста используйте наш веб-сайт habitica если вы хотите оформить подписку.</string>
   <string name="save">Сохранить</string>
@@ -557,8 +435,7 @@
   <string name="gem_reward">Награда самоцветами</string>
   <string name="tasks">Задачи</string>
   <string name="create_challenge">Создать испытание</string>
-  <string name="edit_challenge">Редактировать</string>
-  <string name="challenge_create_error_tavern_one_gem">Вам нужен хотябы 1 алмаз, чтобы создать общее испытание.</string>
+    <string name="challenge_create_error_tavern_one_gem">Вам нужен хотябы 1 алмаз, чтобы создать общее испытание.</string>
   <string name="challenge_create_error_enough_gems">У вас недостаточно самоцветов для того, чтобы создать испытание.</string>
   <string name="identify_your_challenge_with_a_tag">Укажите короткое имя, чтобы назвать испытание</string>
   <string name="challenge_create_error_tag">Вам нужно придумать короткое именование, чтобы создать это Испытание.</string>
@@ -568,42 +445,36 @@
   <string name="new_challenge_title">Новый заголовок для испытания</string>
   <string name="ownership">Владение</string>
   <string name="inn">Гостиница</string>
-  <string name="system">Система</string>
-  <string name="start_quest">Начать новый Квест</string>
+    <string name="start_quest">Начать новый Квест</string>
   <string name="leave_party">Покинуть команду</string>
   <string name="party_description">Описание команды</string>
-  <string name="abort_confirmation">Вы уверены, что хотите отменить эту миссию? Это прервет её прохождение для каждого в вашей команде и весь прогресс будет потерян. Квестовый свиток останется у владельца.</string>
-  <string name="leave_quest_confirmation">Вы уверены, что хотите покинуть активный квест\? Весь ваш прогресс будет потерян.</string>
-  <string name="number_participants">%1$dУчастники</string>
+    <string name="number_participants">%1$dУчастники</string>
   <string name="welcome_back">C возвращением</string>
   <string name="yesterdaililes_prompt">Вы вчера делали какие-нибудь из этих ежедневных заданий?</string>
   <string name="start_day">Начать Мой День</string>
   <string name="leave_party_confirmation">Вы уверены что хотите покинуть команду?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Следующий приз после  %d входа в игру</string>
-  <string name="pending">Ожидает</string>
+    <string name="pending">Ожидает</string>
   <string name="accepted">Принято</string>
   <string name="declined">Отклонено</string>
   <string name="participants">Участники</string>
   <string name="invitations">Приглашения</string>
-  <string name="quest_leader_header" formatted="false">Начато %s</string>
+  <string name="quest_leader_header">Начато %s</string>
   <string name="quest_abort_message">Вы уверены, что хотите отменить эту миссию? Это прервет её прохождение для каждого в вашей команде и весь прогресс будет потерян. Квестовый свиток останется у владельца.</string>
-  <string name="loading">Загрузка…</string>
-  <string name="reloading_content">Обновление содержимого</string>
+    <string name="reloading_content">Обновление содержимого</string>
   <string name="thousand_abbrev">тыс</string>
   <string name="million_abbrev">млн</string>
   <string name="billion_abbrev">млрд</string>
-  <string name="your_balance">Ваш баланс:</string>
-  <string name="available_until" formatted="false">Доступно до %s</string>
-  <string name="gems_left_max" formatted="false">Ежемесячные самоцветы: осталось %1$d/%2$d</string>
-  <string name="gems_left_nomax" formatted="false">Ежемесячные самоцветы: осталось %d</string>
+    <string name="available_until">Доступно до %s</string>
+  <string name="gems_left_max">Ежемесячные самоцветы: осталось %1$d/%2$d</string>
+  <string name="gems_left_nomax">Ежемесячные самоцветы: осталось %d</string>
   <string name="health">Здоровье</string>
   <string name="collect">Собирать</string>
   <string name="rage_meter">Шкала ярости</string>
   <string name="boss_quest">Квест с боссом</string>
   <string name="collection_quest">Квест со сбором предметов</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d опыта</string>
-  <string name="gold_reward" formatted="false">%d золота</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d опыта</string>
+  <string name="gold_reward">%d золота</string>
   <string name="quest_owner_rewards">Награды для владельца квеста</string>
   <string name="str_abbrv">СИЛ</string>
   <string name="per_abbrv">ВОС</string>
@@ -616,8 +487,7 @@
   <string name="reset_account_confirmation">сбросить мой аккаунт</string>
   <string name="delete_account_confirmation">удалить мой аккаунт</string>
   <string name="danger_zone">Опасная зона</string>
-  <string name="nevermind">Неважно</string>
-  <string name="resetting_account">Сброс аккаунта</string>
+    <string name="resetting_account">Сброс аккаунта</string>
   <string name="deleting_account">Удаление аккаунта</string>
   <string name="insufficientGold">Вам нужно выполнить больше задач, прежде чем вы сможете позволить себе этот предмет!</string>
   <string name="insufficientGems">Для покупки этого предмета вам нужно больше самоцветов!</string>
@@ -650,8 +520,7 @@
   <string name="authentication_summary">Измените ваши параметры аутентификации.</string>
   <string name="change_password">Сменить пароль</string>
   <string name="change_email">Изменить электронную почту</string>
-  <string name="change_login_name">Изменить логин</string>
-  <string name="change_username">Измените имя пользователя</string>
+    <string name="change_username">Измените имя пользователя</string>
   <string name="change">Изменить</string>
   <string name="character_level">Уровень персонажа</string>
   <string name="auto_allocate_points">Автоматически распределять очки</string>
@@ -672,7 +541,7 @@
   <string name="distribute_class">Распределять на основе класса</string>
   <string name="distribute_task">Распределять на основе типов задач</string>
   <string name="no_points_to_allocate">Нет очков для распределения</string>
-  <string name="points_to_allocate" formatted="false">%dочк. для распределения</string>
+  <string name="points_to_allocate">%dочк. для распределения</string>
   <string name="distribute_evenly_help">Назначает одинаковое количество очков для каждой характеристики.</string>
   <string name="distribute_class_help">Назначает больше очков на важные вашему классу характеристики.</string>
   <string name="distribute_task_help">Назначаемые очки основываются на параметрах силы, интеллекта, телосложения и восприятии, связанных с выполняемыми вами задачами.</string>
@@ -682,9 +551,7 @@
   <string name="classless">Бесклассовый</string>
   <string name="class_equipment_shop_dialog">Этот предмет доступен только определенному классу\n Вы можете изменить свой класс в Настройках.</string>
   <string name="class_gear_disclaimer">Вы можете покупать экипировку только для текущего класса</string>
-  <string name="available_stats" formatted="false">%d опыта</string>
-  <string name="toogle_emojis">Включить Emoji</string>
-  <string name="tavern_description">Добро пожаловать в Гостиницу! Пододвигайе кресло к чату или возьмите перерыв и отдохните от ваших заданий.</string>
+    <string name="tavern_description">Добро пожаловать в Гостиницу! Пододвигайе кресло к чату или возьмите перерыв и отдохните от ваших заданий.</string>
   <string name="check_into_inn">Разместиться в гостинице</string>
   <string name="community_guidelines">Правила сообщества</string>
   <string name="view_community_guidelines">Посмотреть правила сообщества</string>
@@ -698,19 +565,13 @@
   <string name="navigation_drawer_open">Открыть навигационный ящик</string>
   <string name="navigation_drawer_close">Закрыть навигационный ящик</string>
   <string name="world_boss">Мировой босс</string>
-  <string name="world_boss_art">Изображение Босса</string>
-  <string name="boss_art">Изображение босса</string>
+    <string name="boss_art">Изображение босса</string>
   <string name="world_boss_description">Описание мирового босса</string>
-  <string name="rage_strike_count" formatted="false">Ярость: %d/%d</string>
-  <string name="pending_strike_description">Этот удар еще не случился!\nМировой босс придёт в бешенство и атакует одного из наших дружелюбных лавочников, как только его шкала Ярости заполнится. Попробуй предотвратить это, своевременно выполняя свои ежедневные задания!</string>
-  <string name="pending_strike_title">Ожидаемый урон</string>
+  <string name="rage_strike_count">Ярость: %d/%d</string>
+    <string name="pending_strike_title">Ожидаемый урон</string>
   <string name="strike_description_title">Что такое Удар Ярости?</string>
-  <string name="strike_description_subtitle">Может быть 3 Удара Ярости</string>
-  <string name="strike_description_description">Эта полоска заполняется, когда Хабитикане пропускают свои ежедневные задания. Если она заполнится до конца, Гразочаровыватель направит свою атаку Сокрушительная Печаль на одного из лавочников Хабитики, так что постарайся выполнить свои задачи!</string>
-  <string name="pending_strike_subtitle">Этот Удар ещё не случился!</string>
-  <string name="strike_active_title" formatted="false">Атаковали %s!</string>
-  <string name="strike_active_subtitle" formatted="false">%s повержен горем!</string>
-  <string name="strike_active_description" formatted="false">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
+    <string name="strike_active_title">Атаковали %s!</string>
+    <string name="strike_active_description">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
   <string name="questShop">Лавка квестов</string>
   <string name="market_owner_long">Торговец Александр</string>
   <string name="tavern_owner_long">Даниэль, хозяин гостиницы</string>
@@ -720,33 +581,21 @@
   <string name="no_party_description">Участвуйте в квестах с друзьями или в одиночку. Сражайтесь с монстрами, создавайте испытания и помогайте себе становиться ответственным вместе с командой.</string>
   <string name="no_party_title">Играй в стране Habitica в команде</string>
   <string name="join_party_description">Выбрать имя пользователя в команде, можно найти ниже, и отправить вам приглашение</string>
-  <string name="join_party_description_id">Дайте им свой ID пользователя или дайте свой QR-код для скана по приглашению</string>
-  <string name="join_party_title">Хотите присоединиться к команде?</string>
-  <string name="create_party_website">Открыть сайт для создания команды</string>
-  <string name="id_copied">ID скопирован в буфер обмена</string>
-  <string name="insufficientSubscriberGems">Вы купили все самоцветы, доступные в этом месяце. Новая партия будет доступна в течение первых трех дней следующего месяца. Спасибо за подписку!</string>
-  <string name="insufficientSubscriberGemsTitle">Достигнут ежемесячный лимит самоцветов</string>
-  <string name="chat_message">Чат-сообщение</string>
-  <string name="world_boss_description_title">Кто такой Мировой босс?</string>
-  <string name="world_boss_description_description">Мировой босс — особое событие, во время которого сообщество Habitica объединяет усилия, чтобы своими заданиями победить сильнейшего монстра!
-\nЗавершенные задачи наносят урон боссу
-\nБосс не тронет вас за пропущенные задания, но его счетчик ярости будет расти. Если бар заполнится, босс атакует одного из владельцев лавки!
-\nМожно одновременно сражаться с обычным квестовым боссом, вы нанесёте урон обоим
-\nТаверне можно увидеть уровни здоровья и ярости мирового босса</string>
-  <string name="world_boss_description_intro">Мировой босс — особое событие, во время которого сообщество Habitica объединяет усилия, чтобы своими заданиями победить сильнейшего монстра!</string>
+    <string name="join_party_title">Хотите присоединиться к команде?</string>
+    <string name="insufficientSubscriberGems">Вы купили все самоцветы, доступные в этом месяце. Новая партия будет доступна в течение первых трех дней следующего месяца. Спасибо за подписку!</string>
+    <string name="world_boss_description_title">Кто такой Мировой босс?</string>
+    <string name="world_boss_description_intro">Мировой босс — особое событие, во время которого сообщество Habitica объединяет усилия, чтобы своими заданиями победить сильнейшего монстра!</string>
   <string name="world_boss_description_1">Завершите ваши задачи чтобы нанести урон Боссу</string>
   <string name="world_boss_description_2">Мировой босс не тронет вас за пропущенные задания, но уровень его ярости будет расти. Когда шкала ярости заполнится, босс атакует одного из владельцев лавки!</string>
   <string name="world_boss_description_3">Вы можете продолжать сражаться с обычным боссом в квесте, вы нанесёте урон обоим</string>
   <string name="world_boss_description_4">Проверяйте Таверну, чтобы увидеть уровни здоровья и ярости мирового босса</string>
-  <string name="world_boss_action_prompt" formatted="false">Победите босса, чтобы заслужить особые награды и спасти страну страна Habitica от %s\'ских угроз!</string>
-  <string name="world_boss_description_subtitle">%s атаки!</string>
-  <string name="questShop_owner_long">Квест-мастер Ян</string>
+  <string name="world_boss_action_prompt">Победите босса, чтобы заслужить особые награды и спасти страну страна Habitica от %s\'ских угроз!</string>
+    <string name="questShop_owner_long">Квест-мастер Ян</string>
   <string name="seasonalShop_owner_long">Сезонная Чародейка</string>
   <string name="rage_attack">Атака при ярости:</string>
   <string name="tavern_description_world_boss">О, дорогуша, не обращай внимания на монстра внизу - это по-прежнему райский уголок, чтобы поболтать на перерывах.</string>
   <string name="report">Пожаловаться</string>
-  <string name="like">Нравится</string>
-  <string name="reply">Ответить</string>
+    <string name="reply">Ответить</string>
   <string name="challenge_prize">Награда за испытание</string>
   <string name="challenge_categories">Категории Испытаний</string>
   <string name="created_challenge">Создать испытание</string>
@@ -780,17 +629,15 @@
   <string name="two_handed">Двуручное</string>
   <string name="usernamePromptTitle">Время выбрать себе Имя пользователя!</string>
   <string name="usernamePromptBody">Имена для логина теперь являются уникальными Никами, которые будут отображаться рядом с вашим отображаемым именем и использоваться для приглашений, чата @упоминаний и обмена сообщениями.</string>
-  <string name="usernamePromptWiki">Если хотите узнать более подробнее про изменения, то <a href="https://habitica.wikia.com/wiki/Player_Names">посетите вики.</a></string>
-  <string name="confirmUsername">Подтвердить Имя пользователя</string>
-  <string name="usernamePromptDisclaimer">Имя пользователя должно соответствовать нашим <a href="https://habitica.com/static/terms">Условиям обслуживания</a> и <a href="https://habitica.com/static/community-guidelines">Принципам сообщества</a>. Если вы ранее не выбирали имя для логина, то ваше Имя был автоматически сгенерировано.</string>
+  <string name="usernamePromptWiki">Если хотите узнать более подробнее про изменения, то <a href="https://habitica.wikia_com/wiki/Player_Names">посетите вики.</a></string>
+    <string name="usernamePromptDisclaimer">Имя пользователя должно соответствовать нашим <a href="https://habitica.com/static/terms">Условиям обслуживания</a> и <a href="https://habitica_com/static/community-guidelines">Принципам сообщества</a>. Если вы ранее не выбирали имя для логина, то ваше Имя был автоматически сгенерировано.</string>
   <string name="confirm_username_title">Вы уверены, что хотите выбрать такое Имя пользователя?</string>
   <string name="confirm_username_description">Подтверждая свое Имя пользователя, дает возможность принимать приглашения, @упоминания и сообщения. Вы можете сменить свое Имя пользователя в любое время в настройках.</string>
   <string name="cancel">Отменить</string>
   <string name="confirm_username">Подтвердить Имя пользователя</string>
   <string name="username_not_confirmed">Имя пользователя не сохранено</string>
   <string name="username_confirmed">Ник подтвержден</string>
-  <string name="username_level">\@%s・Уровень %d</string>
-  <string name="username_copied">Ник скопирован в буфер обмена</string>
+    <string name="username_copied">Ник скопирован в буфер обмена</string>
   <string name="verification_pet">Один из питомцев-ветеранов будет ожидать вас, после подтверждения своего выбора!</string>
   <string name="welcomeNameTitle">Как к вам обращаться?</string>
   <string name="display_name_length_error">Отображаемое имя должно быть от 1 до 30 символов</string>
@@ -803,13 +650,13 @@
   <string name="equipment_int">ИНТ:</string>
   <string name="equipment_per">ВОС:</string>
   <string name="ago_1Minute">1 минуту назад</string>
-  <string name="ago_minutes">%минуты назад</string>
+  <string name="ago_minutes">%dминуты назад</string>
   <string name="opting_out_progress">Не принимать участие</string>
   <string name="subscription_duration_norenew">Для %s</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="subscribe1month_gemcap">Максимум 25 драгоценные камни</string>
+  <string name="subscribe3month_gemcap">Максимум 30 драгоценные камни</string>
+  <string name="subscribe6month_gemcap">Максимум 35 драгоценные камни</string>
+  <string name="subscribe12month_gemcap">Максимум 45 драгоценные камни</string>
   <string name="delete_oauth_account_description">Уверены ли вы\? Это удалит вашу учетную запись навсегда и она никогда не будет восстановлена! Вам нужно будет зарегистрировать новую учетную запись, чтобы снова использовать Habitica. Банк или потраченные драгоценные камни не будут возвращены. Если вы абсолютно уверены, введите DELETE в текстовом поле ниже.</string>
   <string name="enter_recipient_username">Введите @ имя получателя</string>
   <string name="visit_website">посетите сайт</string>
@@ -845,53 +692,4 @@
   <string name="invited_to_private_guild"><![CDATA[Вас пригласили присоединиться к частной гильдии <b>%1$s</b>]]></string>
   <string name="invited_to_public_guild"><![CDATA[Вас пригласили в гильдию <b>%1$s</b>]]></string>
   <string name="invited_to_quest"><![CDATA[Вас пригласили на квест <b>%1$s</b>]]></string>
-<string name="sectionwacky">Дурацкие</string>
-    <string name="x_months">%d мес.</string>
-    <string name="insufficientGoldTitle">Недостаточно золота</string>
-    <string name="task_title">Название задачи</string>
-
-    <string name="old_password">Старый пароль</string>
-    <string name="new_password">Новый пароль</string>
-    <string name="new_password_repeat">Повторите новый пароль</string>
-    <string name="adjust_streak">Настройка серии</string>
-    <string name="password_changed">Пароль успешно изменен</string>
-    <string name="monthly">Ежемесячно</string>
-    <string name="weekly">Еженедельно</string>
-    <string name="repeats">Повторять</string>
-    <string name="every">Каждый</string>
-    <string name="checklist_text">Текст списка</string>
-    <string name="new_reminder">Новое напоминание</string>
-    <string name="streak">Серия</string>
-    <string name="update_available">Новое обновление: %1$s (%2$d)</string>
-    <string name="need_more_help">Нужна помощь\?</string>
-    <string name="report_message_title">Сообщить %s о нарушении:</string>
-    <string name="reason_for_report">Причина (необязательно)</string>
-    <string name="mystery_sets">Таинственные наборы</string>
-    <string name="guild_description">Описание гильдии</string>
-    <string name="invite_to_guild">Пригласить в гильдию</string>
-    <string name="join_guild">Присоединится к гильдии</string>
-    <string name="i_agree_to_follow_the_guidelines">Я согласен с Правилами сообщества</string>
-    <string name="report_violation">Сообщить о нарушении</string>
-    <string name="leave_guild">Покинуть гильдию</string>
-    <string name="left_guild">Вы покинули гильдию</string>
-    <string name="joined_guild">Вы вступили в гильдию</string>
-    <string name="cost">Цена</string>
-    <string name="setup_task_habit_1">Добавить задачу в Habitica</string>
-    <string name="guild_members">Участники гильдии</string>
-    <string name="guild_bank">Банк гильдии</string>
-    <string name="invite_to_party">Пригласить в команду</string>
-    <string name="are_you_sure">Вы уверены\?</string>
-    <string name="delete_task">Удалить задачу</string>
-    <string name="not_now">Не сейчас</string>
-    <string name="levelup_title_10">Система классов открыта!</string>
-    <string name="pin">Прикрепить</string>
-    <string name="unpin">Открепить</string>
-    <string name="sidebar_achievements">Достижения</string>
-    <string name="basic_achievements">Базовые достижения</string>
-    <string name="seasonal_achievements">Сезонные достижения</string>
-    <string name="special_achievements">Особые достижения</string>
-    <string name="confirm_deletion">Подтвердить удаление</string>
-    <string name="new_task">Новая задача</string>
-    <string name="create_task">Создать %s</string>
-    <string name="share_challenge_with">Поделиться испытанием с</string>
 </resources>
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
new file mode 100755
index 000000000..40741537c
--- /dev/null
+++ b/Habitica/res/values-sv/strings.xml
@@ -0,0 +1,656 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Ladda om</string>
+  <string name="XP_default">Erfarenhet</string>
+  <string name="HP_default">Hälsa</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Preferenser kunde inte laddas ner från streckkoden</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Inställningar</string>
+  <string name="SP_address_hint">Din beställningsserver</string>
+  <string name="SP_userID_title">Användar-ID</string>
+  <string name="SP_userID_summary">Ditt användar-ID</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Din API Token</string>
+  <string name="Language_title">Språk</string>
+  <string name="Language_summary">Ändra Habiticas språk</string>
+  <string name="SP_user_qr_code">Din QR-kod</string>
+  <string name="PS_contact_title">Kontakta mig</string>
+  <string name="unknown_error">Ett fel har inträffat...</string>
+  <string name="pref_account_header">Konto</string>
+  <string name="pref_first_day_of_the_week_title">Veckans första dag</string>
+  <string name="pref_first_day_of_the_week_summary">Veckans första dag i alla kalendrar</string>
+  <string name="pref_reminder_header">Daglig påminnelse</string>
+  <string name="pref_reminder_checkbox">Aktivera påminnelse</string>
+  <string name="pref_reminder_picker">Ställ in tid för påminnelse</string>
+  <string name="pref_cds_header">Anpassad startdag</string>
+  <string name="pref_cds_picker">Välj anpassad starttid för dag</string>
+  <string name="pref_push_notifications_checkbox">Användarens pop-up-notifikationer</string>
+  <string name="push_notifications">Pop-up-notifikationer</string>
+  <string name="push_notifications_sum">Ändra dina push-notifikationsinställningar</string>
+  <string name="preference_push_you_won_challenge">Du vann en Utmaning!</string>
+  <string name="preference_push_received_a_private_message">Mottog ett privat meddelande</string>
+  <string name="preference_push_gifted_gems">Givna juveler</string>
+  <string name="preference_push_gifted_subscription">Givna abonnemang</string>
+  <string name="preference_push_invited_to_party">Inbjudan till Sällskap</string>
+  <string name="preference_push_invited_to_guild">Inbjuden till Gille</string>
+  <string name="preference_push_your_quest_has_begun">Ditt uppdrag har påbörjats</string>
+  <string name="preference_push_invited_to_quest">Inbjudan till uppdrag</string>
+  <!--Adding tasks-->
+  <string name="task_value">Värde</string>
+  <string name="new_todo">Ny att-göra</string>
+  <string name="new_reward">Ny Belöning</string>
+  <string name="new_daily">Ny daglig uppgift</string>
+  <string name="new_habit">Ny vana</string>
+  <string name="action_edit">Redigera</string>
+  <string name="action_delete">Radera</string>
+  <string name="action_cancel">Avbryt</string>
+  <string name="login_btn">Logga in</string>
+  <string name="register_btn">Registrera dig</string>
+  <string name="username">Användarnamn</string>
+  <string name="email_username">E-postadress eller användarnamn</string>
+  <string name="password">Lösenord</string>
+  <string name="emailAddress">E-postadress</string>
+  <string name="confirmpassword">Godkänn lösenord</string>
+  <string name="logout">Logga ut</string>
+  <string name="logout_description">Logga ut från ditt konto</string>
+  <string name="account_details">Kontoinformation</string>
+  <string name="LoginActivityName">Välkommen</string>
+  <string name="string_revive">Återuppliva</string>
+  <string name="please_connect">Var god anslut genom applikationen innan du använder en widget</string>
+  <string name="about.title">Om</string>
+  <string name="about.libraries">Bibliotek</string>
+  <string name="about.versionhistory">Versionhistorik</string>
+  <string name="about.habitica_open_source">Habitica finns tillgängligt som open source program på Github</string>
+  <string name="about.rate_our_app">Betygsätt vår app</string>
+  <string name="about.give_us_feedback">Skicka oss feedback</string>
+  <string name="about.bugreport">Rapportera en bugg</string>
+  <string name="about.source_code">Källkod</string>
+  <string name="repeatEvery">Upprepa varje </string>
+  <!--Network Errors-->
+  <string name="network_error_title">Anslutningsfel</string>
+  <string name="network_error_no_network_body">Du är inte ansluten till internet.</string>
+  <string name="internal_error_api">Det verkar vara ett problem med servern. Försök igen senare.</string>
+  <string name="authentication_error_title">Autentiseringsfel</string>
+  <string name="authentication_error_body">Ditt användarnamn och/eller lösenord var fel.</string>
+  <string name="login_validation_error_title">Validationsfel</string>
+  <string name="login_validation_error_fieldsmissing">Du måste fylla i alla fält.</string>
+  <string name="save_changes">Spara</string>
+  <string name="copy">Kopiera</string>
+  <string name="notes">Anteckningar</string>
+  <string name="text">Text</string>
+  <string name="difficulty">Svårighetsgrad</string>
+  <string name="tags">Taggar</string>
+  <string name="trivial">Trivial</string>
+  <string name="easy">Lätt</string>
+  <string name="medium">Medium</string>
+  <string name="hard">Svår</string>
+  <string name="start_date">Startdatum</string>
+  <string name="positive_habit_form">Positiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Checklista</string>
+  <string name="reminders">Påminnelser</string>
+  <string name="actions">Handlingar</string>
+  <string name="attributes">Egenskaper</string>
+  <string name="physical">Styrka</string>
+  <string name="mental">Intelligens</string>
+  <string name="social">Tålighet</string>
+  <string name="other">Uppmärksamhet</string>
+  <string name="frequency">Frekvens</string>
+  <string name="frequency_weekly">På särskilda dagar i veckan</string>
+  <string name="frequency_daily">Varje X dagar</string>
+  <string name="repeatables_summary_title">Sammanfattning</string>
+  <string name="repeatables_title">Repeterar </string>
+  <string name="repeatables_on_title">Repeterar på </string>
+  <string name="repeatables_frequency_daily">Dagligen</string>
+  <string name="repeatables_frequency_weekly">Veckovis</string>
+  <string name="repeatables_frequency_monthly">Månadsvis</string>
+  <string name="repeatables_frequency_yearly">Årsvis</string>
+  <string name="repeatables_frequency_day_of_month">Dag i månaden</string>
+  <string name="repeatables_frequency_day_of_week">Veckodag</string>
+  <string name="monday">Måndag</string>
+  <string name="tuesday">Tisdag</string>
+  <string name="wednesday">Onsdag</string>
+  <string name="thursday">Torsdag</string>
+  <string name="friday">Fredag</string>
+  <string name="saturday">Lördag</string>
+  <string name="sunday">Söndag</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Förtvivla inte!</string>
+  <string name="faint_header">Din hälsa tog slut!</string>
+  <string name="faint_button">Ladda upp hälsan &amp;amp ; Försök igen</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Profilbild</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Du använde %1$s för %2$d mana.</string>
+  <string name="used_skill_without_mana">Du använde %1$s</string>
+  <string name="new_checklist_item">nytt checklisteobjekt</string>
+  <string name="add_checklist_item">Lägg till</string>
+  <string name="skill_progress_title">Använder en färdighet</string>
+  <string name="coming_soon">Kommer snart</string>
+  <string name="chat_flag_confirmation">Är du säker på att du vill rapportera det här meddelandet som olämpligt?</string>
+  <string name="flag_confirm">Flagga meddelande</string>
+  <string name="unlock_lvl_11">Låses upp vid level 11</string>
+  <string name="no_party_message">Du är inte med i något sällskap. För att gå med i ett, besök hemsidan.</string>
+  <string name="forgot_pw_btn">Glömt lösenord</string>
+  <string name="tavern.inn.checkOut">Återaktivera dina dagliga uppgifter</string>
+  <string name="tavern.inn.rest">Pausa dina dagliga uppgifter</string>
+  <string name="reward.dialog.buy">Köp</string>
+  <string name="reward.dialog.dismiss">Avfärda</string>
+  <string name="party">Sällskap</string>
+  <string name="chat">Chatt</string>
+  <string name="members">Medlemmar</string>
+  <string name="habits">Vanor</string>
+  <string name="dailies">Dagliga uppgifter</string>
+  <string name="todos">Att-göra</string>
+  <string name="rewards">Belöningar</string>
+  <string name="taskform.delete.title">Är du säker?</string>
+  <string name="taskform.delete.message">Vill du verkligen radera?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="quest">Uppdrag</string>
+  <string name="avatar_body">Kropp</string>
+  <string name="avatar_hair">Hår</string>
+  <string name="avatar_shirt">Tröja</string>
+  <string name="avatar_skin">Hud</string>
+  <string name="avatar_ears">Djuröron</string>
+  <string name="avatar_base">Bas</string>
+  <string name="avatar_color">Färg</string>
+  <string name="avatar_beard">Skägg</string>
+  <string name="avatar_mustache">Mustach</string>
+  <string name="avatar_flower">Blomma</string>
+  <string name="avatar_bangs">Lugg</string>
+  <string name="avatar_nothing">Inget valt</string>
+  <string name="avatar_size">Storlek</string>
+  <string name="avatar_size_slim">Smal</string>
+  <string name="avatar_size_broad">Bred</string>
+  <string name="avatar_background">Bakgrund</string>
+  <string name="purchase_customization">Köp anpassning</string>
+  <string name="purchase_set_button">Lås upp set för %d juveler</string>
+  <string name="purchase_button">Köp</string>
+  <string name="purchase_set_title">Köp set %s</string>
+  <string name="due_date">Förfallodatum</string>
+  <string name="quest.accept">Acceptera</string>
+  <string name="quest.reject">Avböj</string>
+  <string name="quest.begin">Starta uppdrag</string>
+  <string name="quest.cancel">Avbryt inbjudning</string>
+  <string name="quest.abort">Avbryt uppdrag</string>
+  <string name="quest.leave">Lämna uppdrag</string>
+  <string name="quest.pending">Väntar</string>
+  <string name="quest.accepted">Accepterade</string>
+  <string name="quest.rejected">Avböjde</string>
+  <string name="quest.participants">Deltagare</string>
+  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="sidebar_help">Hjälp &amp; FAQ</string>
+  <string name="complete_tutorial">Jag fattar!</string>
+  <string name="dismiss_tutorial">Påminn mig igen</string>
+  <string name="intro_1_subtitle">Välkommen till</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Det är dags att ha kul medans du gör saker. Anslut dig till över %s andra som förbättrar sitt liv en uppgift i taget.</string>
+  <string name="intro_2_subtitle">Framgång i spelet</string>
+  <string name="intro_2_title">Framgång i livet</string>
+  <string name="intro_2_description">Lås upp funktioner i spelet genom att checka av dina verkliga livsmål. Bli belönad rustningar, husdjur, och mer för att du klarat dina mål.</string>
+  <string name="intro_3_subtitle">Slåss mot monster</string>
+  <string name="intro_3_title">Bli social</string>
+  <string name="intro_3_description">Håll koll på dina mål med hjälp av dina vänner. Stötta varandra i livet och i strider och förbättras tillsammans!</string>
+  <string name="intro_finish_button">Sätt igång!</string>
+  <string name="previous_button">Tillbaka</string>
+  <string name="next_button">Nästa</string>
+  <string name="skip_button">Hoppa över</string>
+  <string name="setup_welcome_description">Välkommen till Habitica, här får framsteg i spelet dig förbättra ditt verkliga liv! Allteftersom du uppnår dina mål kommer du låsa upp utsustning, husdjur, uppdrag och mer.</string>
+  <string name="setup_welcome_title">Välkommen</string>
+  <string name="avatar_setup_description">Så, hur vill du se ut? Ingen fara, du kan alltid ändra detta senare.</string>
+  <string name="task_setup_description">Underbart! Nu så, vad är du intresserad av att jobba på genom den här resan?</string>
+  <string name="setup_group_work">Arbete</string>
+  <string name="setup_group_exercise">Träning</string>
+  <string name="setup_group_health">Hälsa</string>
+  <string name="setup_group_school">Skola</string>
+  <string name="setup_group_teams">Lag</string>
+  <string name="setup_group_chores">Sysslor</string>
+  <string name="setup_group_creativity">Kreativitet</string>
+  <string name="setup_task_work_1">Bearbeta e-post</string>
+  <string name="setup_task_work_2">Viktigaste uppgift</string>
+  <string name="setup_task_work_3">Arbetsprojekt</string>
+  <string name="setup_task_exercise_1">10 minuters konditionsträning</string>
+  <string name="setup_task_exercise_2">Stretcha</string>
+  <string name="setup_task_exercise_3">Ställ upp ett arbetsschema</string>
+  <string name="setup_task_healthWellness_1">Äta hälsosamt / skräpmat</string>
+  <string name="setup_task_healthWellness_2">Använd tandtråd</string>
+  <string name="setup_task_healthWellness_3">Boka in läkarbesök</string>
+  <string name="setup_task_school_1">Plugga / slöa</string>
+  <string name="setup_task_school_2">Gör läxor</string>
+  <string name="setup_task_school_3">Slutför skoluppgift</string>
+  <string name="setup_task_teams_1">Checka in med laget</string>
+  <string name="setup_task_teams_2">Uppdatera laget om läget</string>
+  <string name="setup_task_teams_3">Slutföra en laguppgift</string>
+  <string name="setup_task_chores_1">10 minuters städning</string>
+  <string name="setup_task_chores_2">Diska</string>
+  <string name="setup_task_chores_3">Städa garderoben</string>
+  <string name="setup_task_creativity_1">Studera en mästare inom hantverket</string>
+  <string name="setup_task_creativity_2">Arbeta på ett kreativt projekt</string>
+  <string name="setup_task_creativity_3">Slutför ett kreativt projekt</string>
+  <string name="gem.purchase.support">Vill du hjälpa oss att hålla i gång Habitica? Du kan stötta utvecklarna genom att köpa juveler!\n\nFör juveler kan du köpa roliga saker till ditt konto, bland annat: \n\n - coola kostymer för din avatar\n - Snygga bakgrunder\n - Kul uppdrag som belönar dig med husdjursägg\n - Förmågan att ändra din klass innan du når level 100\n\nTack så mycket för att du hjälper oss att göra Habitica bättre. Ditt stöd betyder mycket för oss!</string>
+  <string name="my_guilds">Mina gillen</string>
+  <string name="public_guilds">Allmänna gillen</string>
+  <string name="guild">Gille</string>
+  <string name="leave">Lämna</string>
+  <string name="join">Gå med</string>
+  <string name="leader">Ledare</string>
+  <string name="gems">Juveler</string>
+  <string name="copy_as_todo">Kopiera som en att-göra</string>
+  <string name="send_pm">Skicka PM</string>
+  <string name="flag">Flagga</string>
+  <string name="delete">Radera</string>
+  <string name="name">Namn</string>
+  <string name="description">Beskrivning</string>
+  <string name="add_tag">Lägg till tagg</string>
+  <string name="privacy">Privat</string>
+  <string name="write_message">Skriv meddelande</string>
+  <string name="post">Skicka</string>
+  <string name="guild_search_hint">Sök efter gillen</string>
+  <string name="todo_due">Infaller om: %s</string>
+  <string name="daily_streak">Nuvarande följd: %d</string>
+  <string name="todo_has_duedate">Uppgiften har ett förfallodatum</string>
+  <string name="battle_gear">Stridsutrustning</string>
+  <string name="costume">Kostym</string>
+  <string name="outfit_head">Huvud</string>
+  <string name="outfit_headAccessory">Huvudtillbehör</string>
+  <string name="outfit_eyewear">Ögonskydd</string>
+  <string name="outfit_armor">Rustning</string>
+  <string name="outfit_back">Rygg</string>
+  <string name="outfit_body">Kropp</string>
+  <string name="outfit_shield">Sköld</string>
+  <string name="outfit_weapon">Vapen</string>
+  <string name="wear_costume">Använd klädsel</string>
+  <string name="equipped">Utrustad</string>
+  <string name="quest_cancel_message">Är du säker på att du vill avbryta det här uppdraget? Alla accepterade inbjudningar kommer försvinna. Ägaren av  uppdraget kommer återfå uppdragsskriftrullen.</string>
+  <string name="quest.invitation">Uppdragsinbjudning</string>
+  <string name="quest_begin_message">Är du säker? Bara %1$d av dina %2$d sällskapsmedlemmar har gått med i detta uppdrag! Uppdrag startar automatiskt när alla spelare har accepterat eller avvisat inbjudan.</string>
+  <string name="quest.invitation.text">Du har bjudits in att delta i ett uppdrag!</string>
+  <string name="today">Idag</string>
+  <string name="sidebar_items">Objekt</string>
+  <string name="eggs">Ägg</string>
+  <string name="hatching_potions">Kläckningsdrycker</string>
+  <string name="food">Mat</string>
+  <string name="quests">Uppdrag</string>
+  <string name="pets">Husdjur</string>
+  <string name="mounts">Riddjur</string>
+  <string name="armoireEquipment">Du hittade ovanlig utrustning i vapenskåpet: %s! Fantastiskt!</string>
+  <string name="armoireFood">Du krafsar runt i vapenskåpet och hittar %1$s %2$s. Vad gör den här?</string>
+  <string name="armoireExp">Du brottas med vapenskåpet och får erfarenhet. Touché!</string>
+  <string name="armoireNotesFull">Öppna vapenskåpet för att slumpmässigt få specialutrsutning, erfarenhet eller mat! Utrustning kvar att hitta: %d</string>
+  <string name="armoireLastItem">Du har hittat den sista ovanliga utrustningen i det förtrollade vapenskåpet.</string>
+  <string name="armoireNotesEmpty">Vapenskåpet kommer ha ny utrustning under den första veckan av varje månad. Tills dess, fortsätt klicka för erfarenhet och mat!</string>
+  <string name="sell">Sälj (%d Guld)</string>
+  <string name="hatch_with_potion">Kläck med kläckningsdryck</string>
+  <string name="feed_to_pet">Mata husdjur med</string>
+  <string name="hatch_egg">Kläck med ägg</string>
+  <string name="invite_party">Bjud in sällskap</string>
+  <string name="dialog_feeding">Mata %1$s %2$s med:</string>
+  <string name="use_animal">Använd</string>
+  <string name="feed">Mata</string>
+  <string name="hatch_with">Kläck husdjur med %s</string>
+  <string name="hatched_pet_title">Du kläckte en %1$s %2$s!</string>
+  <string name="close">Stäng</string>
+  <string name="share">Dela</string>
+  <string name="notification_pet_fed">Du matade din %1$s %2$s!</string>
+  <string name="notification_purchase">Du köpte %s</string>
+  <string name="notification_purchase_reward">Du köpte en belöning</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Magisk Dryck</string>
+  <string name="sectionquestPets">Uppdrag</string>
+  <string name="sectionspecialPets">Sällsynt</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Magisk Dryck</string>
+  <string name="sectionquestMounts">Uppdrag</string>
+  <string name="sectionspecialMounts">Sällsynt</string>
+  <string name="world_quest">Världsuppdrag</string>
+  <string name="empty_items">Du har inga %s</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
+  <string name="warrior">Krigare</string>
+  <string name="rogue">Smygare</string>
+  <string name="mage">Magiker</string>
+  <string name="healer">Helare</string>
+  <string name="mage_description">Magiker lär sig fort, de levlar upp och får erfarenhet snabbare än andra klasser. De har också mycket mana som de kan använda till specieller egenskaper. Spela som magiker om du gillar den taktiska sidan av Habitica, eller som du motiveras av att levla upp och låsa upp avancerade funktioner!</string>
+  <string name="rogue_description">Smygare älskar att tjäna pengar, de hittar mer guld än någon annan och är skickliga på att hitta slumpmässiga föremål. Deras unika smygarförmåga låter dem ducka för konsekvenserna av missade dagliga uppgifter. Spela som smygare om du motiveras av belöningar och bedrifter och strävar efter byte och medaljer!</string>
+  <string name="healer_description">Helare är ogenomträngliga för skada och delar med sig av skyddet till andra. Missade dagliga uppgifter och dåliga vanor påverkar dem inte så mycket, och de har sätt att återställa hälsan efter misslyckanden. Spela som helare om du gillar att hjälpa andra i ditt sällskap eller om tanken på att lura döden genom hårt arbete inspirerar dig!</string>
+  <string name="select_class">Välja klass</string>
+  <string name="opt_out_class">Välj bort</string>
+  <string name="opt_out_description">Vill du inte bekymra dig om klasser? Vill du välja senare? Välj bort - du kommer att vara en krigare utan speciella egenskaper. Du kan läsa mer om klasssystemet senare på wikin och sätta igång klasser när som helst.</string>
+  <string name="class_confirmation">Är du säker på att du vill vara en %s?</string>
+  <string name="class_changed">Du är nu en %s!</string>
+  <string name="class_changed_description">Du har ny standard Stridsutrustning som du kan ändra under Utrustning!</string>
+  <string name="choose_class">Välj klass</string>
+  <string name="dialog_go_back">Gå tillbaka</string>
+  <string name="opt_out_confirmation">Är du säker på att du vill välja bort?</string>
+  <string name="change_class">Ändra din klass</string>
+  <string name="change_class_description">Byt din klass och få tillbaka dina egenskapspoäng för 3 diamanter.</string>
+  <string name="enable_class">Sätt igång klasssystemet</string>
+  <string name="changing_class_progress">Ändra klass</string>
+  <string name="by_email">Via email</string>
+  <string name="invite_existing_users">Bjud in existerande användare</string>
+  <string name="send">Skicka</string>
+  <string name="invite">Bjud in vänner</string>
+  <string name="invite_id_description">Om du har vänner som redan använder  Habitica, bjud in dem med användar ID här.</string>
+  <string name="invite_email_description">Om vänner går med i Habitica via ditt mail kommer de automatiskt att bjudas in till ditt sällskap.</string>
+  <string name="add_invites">Lägg till inbjudningar</string>
+  <string name="user_id">Användar ID</string>
+  <string name="email">Mail</string>
+  <string name="invite_users">Bjud in till sällskap</string>
+  <string name="share_using">Dela användning</string>
+  <string name="share_levelup">Jag kom till level %d i Habitica genom att förbättra mina vanor i verkliga livet!</string>
+  <string name="share_hatched">Jag kläckte just ett %1$s %2$s husdjur i Habitica genom att slutföra mina uppgifter!</string>
+  <string name="share_raised">Jag fick just ett  %1$s %2$s riddjur i Habitica genom att slutföra mina uppgifter!</string>
+  <string name="open_in_store">Öppna i Play Store</string>
+  <string name="change_class_confirmation">Är du säker på att du vill ändra din klass? Det kommer kosta 3 juveler.</string>
+  <string name="change_class_equipment_warning">Varning: Du kommer inte längre kunna köpa utrustning från %s klassen.</string>
+  <string name="leaderMessage">Meddelande från %1$s</string>
+  <string name="leaderName">Ledare: %1$s</string>
+  <string name="confirm">Godkänn</string>
+  <string name="market">Affären</string>
+  <string name="timeTravelers">Tidsresande</string>
+  <string name="seasonalShop">Säsongsaffären</string>
+  <string name="empty_inbox">Du har inga meddelanden. Du kan skicka ett nytt meddelande till en användare från deras allmäna chatt-meddelanden!</string>
+  <string name="party_invite">Lås upp genom att bjuda in vänner</string>
+  <string name="login_incentive">Lås upp genom att logga in på Habitica regelbundet</string>
+  <string name="create_account">Lås upp genom att skapa ett konto</string>
+  <string name="no_gold">Du har inte tillräckligt med guld</string>
+  <string name="no_potion">Du behöver inte köpa någon hälsodryck</string>
+  <string name="successful_purchase">Köpt %1$s</string>
+  <string name="purchase_confirmation_title">Slutför köp</string>
+  <string name="confirm_purchase_text">Köp %1$s för %2$s %3$s</string>
+  <string name="gem">Juvel</string>
+  <string name="hourglass">Timglas</string>
+  <string name="hourglasses">Timglas</string>
+  <string name="gold_singular">Guld</string>
+  <string name="gold_plural">guld</string>
+  <string name="chat_message_copied">Meddelandet kopierades till anslagstavlan</string>
+  <string name="copy_chat_message">Kopiera till anslagstavlan</string>
+  <string name="edit_tag_title">Ändra tagg</string>
+  <string name="edit_tag_btn_edit">Ändra</string>
+  <string name="edit_tag_btn_done">Klar</string>
+  <string name="edit_tag_btn_delete">Radera</string>
+  <string name="confirm_delete_tag_title">Är du säker?</string>
+  <string name="confirm_delete_tag_message">Vill du verkligen radera?</string>
+  <string name="filter_drawer_edit_tags">Ändra taggar</string>
+  <string name="filter_drawer_filter_tags">Filtrera efter taggar</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Någon kan bjuda in dig med den här QR-koden</string>
+  <string name="qr_save_message">QR-kod sparad i</string>
+  <string name="qr_dialogue_title">Din QR-kod</string>
+  <string name="download">Ladda ned</string>
+  <string name="send_new_message">Skicka nytt meddelande</string>
+  <string name="choose_recipient_title">Välj mottagare</string>
+  <string name="action_continue">Fortsätt</string>
+  <string name="scan_qr_code">Skanna QR kod</string>
+  <string name="enter_recipient_uuid">Skriv in mottagares användar ID</string>
+  <string name="invited_to_party">Du har bjudits in till ett sällskap!</string>
+  <string name="stats_widget_label">Habitica statisktik</string>
+  <string name="add_task">Lägg till uppgift</string>
+  <string name="add_habit">Lägg till vana</string>
+  <string name="add_daily">Lägg till daglig utmaning</string>
+  <string name="add_todo">Lägg till att-göra</string>
+  <string name="add_reward">Lägg till belöning</string>
+  <string name="all_dailies_completed">Du slutförde alla dina dagliga utmaningar. Bra jobbat!</string>
+  <string name="widget_habit_button">Habitica gör vana</string>
+  <string name="widget_dailies">Habitica daglig utmaning</string>
+  <string name="widget_todo_list">Habitica Att Göra-lista</string>
+  <string name="widget_add_task">Habitica lägg till uppgift</string>
+  <string name="google_services_missing">Google play services kunde inte hittas.</string>
+  <string name="gem.purchase.toolbartitle">Köp</string>
+  <string name="gem.purchase.title">Att köpa ädelstenar stöttar utvecklarna och hjälper till att hålla Habitica igång</string>
+  <string name="gem.purchase.subtitle">Ädelstenar låter dig köpa roligt extramaterial till ditt konto, bland annat:</string>
+  <string name="gem.purchase.listitem1">Coola dräkter till din avatar</string>
+  <string name="gem.purchase.listitem2">Häftiga bakgrunder</string>
+  <string name="gem.purchase.listitem3">Uppdrag som belönar dig med husdjursägg</string>
+  <string name="gem.purchase.listitem4">Möjligheten att ändra klass före level 100</string>
+  <string name="support_habitica">Stöd Habitica</string>
+  <string name="skill_transformation_use">använd</string>
+  <string name="hatching_market_info">Får du inte rätt fynd? Kolla in Marknaden!</string>
+  <string name="feeding_market_info">Behöver du annan mat? Köp mer från marknaden!</string>
+  <string name="open_market">Öppen Marknad</string>
+  <string name="cds_description">Dina Dagliga Utmaningar kommer att återställas första gången du använder Habitica efter %1$s. Se till att du har gjort klart dina Dagliga Utmaningar innan dess!</string>
+  <string name="AudioTheme_title">Ljudtema</string>
+  <string name="AudioTheme_summary">Ändra Habitica\'s Ljudtema</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Ses imorgon!</string>
+  <string name="belongs_to_challenge">Tillhör utmaningen</string>
+  <string name="has_reminder">Har påminnelse</string>
+  <string name="has_tag">Har tag</string>
+  <string name="subscribe.title">Att abonnera stöttar utvecklarna och hjälper till att hålla Habitica igång</string>
+  <string name="subscribe_prompt">Bli en prenumerant och du får de här användbara fördelarna:</string>
+  <string name="subscribe.listitem1">Köp ädelstenar med guld</string>
+  <string name="subscribe.listitem2">Månadens exklusiva föremål</string>
+  <string name="subscribe.listitem3">Hämta ytterligare historik</string>
+  <string name="subscribe.listitem4">Dagliga fynd-chanser dubblerade</string>
+  <string name="subscriptions">Abonnemang</string>
+  <string name="subscription_duration">Återkommer varje %s</string>
+  <string name="subscribe">Prenumerera</string>
+  <string name="subscribe.listitem1.description">Köpmannen Alex kommer nu sälja juveler till dig för 20 guld vardera!\n\nHans månatliga leveranser är till en början begränsade till 25 Juveler per månad, men kan öka baserat på tiden du har prenumrerat.\n\nBegränsningen ökar med 5 Juveler för varje tre månaders period av kontinuerligt abonnemang, till ett maximum utav 50 Juveler per månad!</string>
+  <string name="subscription_hourglasses">+%d Mystiskt timglas</string>
+  <string name="payment_method">Betalningsmetod</string>
+  <string name="subscription">Prenumeration</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Avbryt prenumeration</string>
+  <string name="cancel_subscription_google.description">Vill du inte längre prenumerera? Du hittar alternativet i \"Mina Appar\" sektionen i Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Vill du inte längre prenumerera? P.g.a din betalningsmetod kan du bara avsluta din prenumeration genom hemsidan. Klicka på knappen under för att öppna sidan i din webbläsare!</string>
+  <string name="visit_habitica_website">Besök Habiticas hemsida</string>
+  <string name="current_bonuses">Aktuella bonusar</string>
+  <string name="months_subscribed">Köpta månader</string>
+  <string name="current_hourclasses">Nuvarande Mystiska timglas</string>
+  <string name="monthly_gem_cap">Månadens diamantgräns</string>
+  <string name="inactive">Inaktiv</string>
+  <string name="one_month">1 månad</string>
+  <string name="months">%d månader</string>
+  <string name="month">månad</string>
+  <string name="three_months">3  månader</string>
+  <string name="six_months">6 månader</string>
+  <string name="twelve_months">12 månader</string>
+  <string name="subscribe_prompt_thanks">För att du Prenumererar så får du dessa användbara fördelar:</string>
+  <string name="subscription_status">Prenumerationsstatus</string>
+  <string name="byLeader">av %s</string>
+  <string name="challenge_details">Utmaningsdetaljer</string>
+  <string name="challenge_leave_title">Lämna utmaning</string>
+  <string name="challenge_leave_text">Är du säker på att du vill lämna Utmaning \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Ta bort uppgifter</string>
+  <string name="challenge_remove_tasks_text">Vill du ta bort uppgifterna?</string>
+  <string name="remove_tasks">Ta bort</string>
+  <string name="keep_tasks">Behåll</string>
+  <string name="my_challenges">Mina utmaningar</string>
+  <string name="public_challenges">Publik</string>
+  <string name="challenges">Utmaningar</string>
+  <string name="daily">Daglig</string>
+  <string name="habit">Vana</string>
+  <string name="reward">Belöning</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Officiell</string>
+  <string name="participating">Deltar</string>
+  <string name="challenge">Utmaning</string>
+  <string name="go_to_challenge">Gå till utmaning</string>
+  <string name="not_part_of_a_challenge">Du är inte med i några utmaningar!</string>
+  <string name="add_reminder">Lägg till påminnelse</string>
+  <string name="warning">Varning</string>
+  <string name="open_settings">Öppna inställningar</string>
+  <string name="inbox">Meddelanden</string>
+  <string name="FAQ">Vanliga frågor</string>
+  <string name="special">Speciell</string>
+  <string name="gem_for_gold_description">För att du prenumererar på Habitica så kan du köpa ett antal Diamanter varje månad för Guld.</string>
+  <string name="limited_count">%d kvar</string>
+  <string name="gem_shop">Juvel</string>
+  <string name="mystery_item">Mysteriskt Objekt</string>
+  <string name="myster_item_notes">Varje månad får prenumeranter ett mysteriskt objekt. Den är oftast utgiven ungefär en vecka innan slutet av månaden.</string>
+  <string name="open">Öppna</string>
+  <string name="notification_mystery_item">Du öppnade lådan och hittade %s!</string>
+  <string name="checkInRewardEarned">Du fick en %1$s som belöning för din hängivenhet till att förbättra ditt liv.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ditt nästa pris låses upp vid %1$d incheckningar</string>
+  <string name="pending_approval">Väntar på godkännande</string>
+  <string name="filters">Filter</string>
+  <string name="done">Klart</string>
+  <string name="group_tasks_edit_description">Gruppuppgifter kan inte redigeras.</string>
+  <string name="group_tasks_edit_title">Kan inte redigera den här uppgiften</string>
+  <string name="groups">Grupper</string>
+  <string name="all">Alla</string>
+  <string name="none">Inga</string>
+  <string name="owned">Äger</string>
+  <string name="not_owned">Äger inte</string>
+  <string name="new_game">Nytt\nSpel</string>
+  <string name="login_btn_fb">Logga in med Facebook</string>
+  <string name="login_btn_google">Logga in med Google</string>
+  <string name="action_back">Bakåt</string>
+  <string name="randomize">Slumpa</string>
+  <string name="avatar_extras">Extra</string>
+  <string name="avatar_skin_color">Hudfärg</string>
+  <string name="avatar_hair_color">Hårfärg</string>
+  <string name="avatar_hair_bangs">Lugg</string>
+  <string name="avatar_hair_ponytail">Hästsvans</string>
+  <string name="avatar_glasses">Glasögon</string>
+  <string name="avatar_wheelchair">Rullstol</string>
+  <string name="weak">Svag</string>
+  <string name="strong">Stark</string>
+  <string name="gray">Grå</string>
+  <string name="dated">Schemalagd</string>
+  <string name="completed">Fulländad</string>
+  <string name="setuP_group_other">Annan</string>
+  <string name="clear">Clear</string>
+  <string name="empty_title_habits">Du har inga vanor</string>
+  <string name="empty_description_habits">Vanor är uppgifter som inte har något fast schema. Du kan klara dom flera gånger per dag, eller inga alls.</string>
+  <string name="empty_title_dailies">Du har inga \"Dailies\"</string>
+  <string name="empty_description_dailies">\"Dailies\" är uppgifter som upprepas på återkommande vis. Välj ett schema som passar dig!</string>
+  <string name="empty_title_todos">Du har inga To-Do\'s</string>
+  <string name="empty_description_todos">To-Do\'s är uppgifter som bara behöver göras en gång. Lägg till checklistor i dina To-Do\'s för att öka på värdet.</string>
+  <string name="empty_title_rewards">Du har inga Belöningar</string>
+  <string name="reset_walkthrough">Återställ Justins genomgång</string>
+  <string name="read_community_guidelines">Snälla läs Gemenskapens Riktlinjer innan du du gör ett inlägg</string>
+  <string name="maintenance">Underhåll</string>
+  <string name="reload_content">Ladda om innehåll</string>
+  <string name="repeat_summary">Repeterar %1$s varje %2$s %3$s %4$s</string>
+  <string name="no_billing_gems">Din enhet har inte någon av de betalningsmetoder som stödjs. Var vänlig använda Habiticas webbsida om du vill köpa juveler.</string>
+  <string name="no_billing_subscriptions">Din enhet har inte någon av de betalningsmetoder som stödjs. Var vänlig använda Habiticas webbsida om du vill köpa ett abonnemang.</string>
+  <string name="save">Spara</string>
+  <string name="location">Plats</string>
+  <string name="tasks">Uppgifter</string>
+  <string name="challenge_create_error_enough_gems">Du har inte tillräckligt med juveler för att skapa den här utmaningen</string>
+  <string name="challenge_create_error_no_tasks">Du behöver minst en uppgift för att skapa den här utmaningen.</string>
+  <string name="challenge_create_error_title">Du behöver en titel för att skapa den här utmaningen.</string>
+  <string name="description_optional">Beskrivning (valfri)</string>
+  <string name="new_challenge_title">Ny titel för utmaning</string>
+  <string name="ownership">Ägarskap</string>
+  <string name="inn">Stuga</string>
+  <string name="system">System</string>
+  <string name="start_quest">Starta ett nytt quest</string>
+  <string name="leave_party">Lämna party</string>
+  <string name="party_description">Party-beskrivning</string>
+  <string name="abort_confirmation">Är du säker på att du vill avbryta detta uppdrag? Det kommer avbrytas för alla i ditt sällskap och alla framsteg kommer att gå förlorade. Uppdragsskriftrullen kommer att bli returneras till ägaren.</string>
+  <string name="leave_quest_confirmation">Är du säker på att du vill lämna det aktiva uppdraget? Alla dina uppdragsframsteg kommer att förloras.</string>
+  <string name="number_participants">%1$d deltagare</string>
+  <string name="welcome_back">Välkommen tillbaka</string>
+  <string name="yesterdaililes_prompt">Gjorde du dina dailies igår?</string>
+  <string name="start_day">Starta min dag</string>
+  <string name="leave_party_confirmation">Är du säker på att du vill lämna partyt?</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Nästa pris vid %d incheckningar</string>
+  <string name="pending">Väntar</string>
+  <string name="accepted">Accepterade</string>
+  <string name="declined">Nekade</string>
+  <string name="participants">Deltagare</string>
+  <string name="invitations">Inbjudningar</string>
+  <string name="quest_leader_header" formatted="false">Påbörjade av %s</string>
+  <string name="quest_abort_message">Är du säker på att du vill avbryta uppdraget? Uppdraget kommer avbrytas för alla i ditt sällskap och alla framsteg kommer att gå förlorade. Uppdragsskriftrullen kommer att återges till uppdragsägaren.</string>
+  <string name="reloading_content">Laddar om innehåll</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+  <string name="your_balance">Ditt saldo:</string>
+  <string name="available_until" formatted="false">Tillgänglig till %s</string>
+  <string name="gems_left_max" formatted="false">Månadsvisa Diamanter: %1$d/%2$d Kvarstående</string>
+  <string name="gems_left_nomax" formatted="false">Månadsvisa Diamanter: %d Kvarstående</string>
+  <string name="health">Hälsa</string>
+  <string name="collect">Samla</string>
+  <string name="rage_meter">Ilske-mätare</string>
+  <string name="boss_quest">Boss Uppdrag</string>
+  <string name="collection_quest">Samlaruppdrag</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d Erfarenhetspoäng</string>
+  <string name="gold_reward" formatted="false">%d Guld</string>
+  <string name="quest_owner_rewards">Uppdragsägarens Belöningar</string>
+  <string name="str_abbrv">Sty</string>
+  <string name="per_abbrv">Upp</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Tål</string>
+  <string name="reset_account">Återställ Konto</string>
+  <string name="delete_account">Radera Konto</string>
+  <string name="delete_account_description">Är du säker? Detta kommer radera ditt konto för alltid och det kan aldrig bli återställt! Du kommer  at behöva registrera ett nytt konto för att använda Habitica igen. Diamanter du har kvar eller spenderat kommer inte att återbetalas. Om du verkligen är säker, skriv in ditt lösenord i textrutan nedan.</string>
+  <string name="reset_account_confirmation">återställ mitt konto</string>
+  <string name="delete_account_confirmation">radera mitt konto</string>
+  <string name="danger_zone">Farozon</string>
+  <string name="nevermind">Glöm det</string>
+  <string name="resetting_account">Återställer Konto</string>
+  <string name="deleting_account">Raderar Konto</string>
+  <string name="insufficientGold">Du måste slutföra fler uppgifter innan du har råd med detta objekt!</string>
+  <string name="insufficientGems">Du behöver mer Diamanter för att köpa detta objekt!</string>
+  <string name="purchase_gems">Köp diamanter</string>
+  <string name="insufficientHourglasses">Du behöver mer Mystiska Timglas för att köpa detta objekt!</string>
+  <string name="get_hourglasses">Skaffa timglas</string>
+  <string name="subscribe_for_hourglasses">Prenumerera för Timglas</string>
+  <string name="timetravelers_closed_description">Tjäna ett Mystiskt timglas för varje tredje månad du prenumererat i följd. Använd dom sen för att låsa upp begränsade utgåvor, husdjur och riddjur från det förflutna... och framtiden!</string>
+  <string name="want_to_subscribe">Jag vill Prenumerera</string>
+  <string name="come_back_soon">Kom tillbaka snart!</string>
+  <string name="level">Nivå</string>
+  <string name="stats">Statistik</string>
+  <string name="fix_character_values">Fixa Karaktärvärden</string>
+  <string name="saving">Sparar</string>
+  <string name="forgot_password_title">Maila en Lösenordsåterställnings-länk</string>
+  <string name="forgot_password_description">Skriv in email-adressen du använde för att registrera ditt Habitica konto.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Redigera din offentliga profil.</string>
+  <string name="display_name">Visningsnamn</string>
+  <string name="photo_url">Foto URL</string>
+  <string name="login_name">Användarnamn</string>
+  <string name="about">Om</string>
+  <string name="app_settings">Appinställningar</string>
+  <string name="authentication">Autentisering</string>
+  <string name="authentication_summary">Ändra dina autentisering alternativ.</string>
+  <string name="change_password">Ändra Lösenord</string>
+  <string name="change_email">Ändra Email-address</string>
+  <string name="change_login_name">Ändra inloggningsnamn</string>
+  <string name="change">Ändra</string>
+  <string name="character_level">Karaktärs-nivå</string>
+  <string name="auto_allocate_points">Fördela Poäng Automatiskt</string>
+  <string name="stat_guide">Statistik Guide</string>
+  <string name="character_build">Karaktärsbyggnad</string>
+  <string name="character_build_description">För varje nivå tjänar du ett poäng att tilldela till en egenskap av ditt val. Du kan göra det manuellt eller låt spelet välja åt dig med hjälp av en av de Automatiska Fördelnings-alternativen.</string>
+  <string name="strength">Styrka</string>
+  <string name="intelligence">Intelligens</string>
+  <string name="intelligence_description">Ökar EXP intjänade från slutförning av uppgifter. Ökar också din mana-gräns och hur snabbt din mana regenererar över tiden.</string>
+  <string name="constitution">Tålighet</string>
+  <string name="constitution_description">Minskar skadan som du tar från dina uppgifter. Minskar inte skadan från bossar.</string>
+  <string name="perception">Uppmärksamhet</string>
+  <string name="buffs">Buffar</string>
+  <string name="allocated">Fördelade</string>
+  <string name="distribute_evenly">Distribuera Jämnt</string>
+  <string name="distribute_class">Distribuera baserat på klass</string>
+  <string name="distribute_task">Distribuera baserat på uppgifts-aktivitet</string>
+  <string name="no_points_to_allocate">Inga Poäng Att Fördela</string>
+  <string name="points_to_allocate" formatted="false">%d Poäng Att Fördela</string>
+  <string name="distribute_evenly_help">Fördelar samma antal poäng till varje egenskap.</string>
+  <string name="distribute_class_help">Fördelar mer poäng till egenskaper som är viktiga i din Klass.</string>
+  <string name="distribute_task_help">Tilldelar poäng baserat på Styrka, Intelligens, Tålighet och Uppmärksamhet kategorierna associerade med uppgifterna du slutför.</string>
+  <string name="allocating_points">Fördelar Poäng</string>
+  <string name="class_equipment">Utrustning</string>
+  <string name="equipment_empty">Du har redan all utrustning! Mer kommer att bli utgivna under dom Stora Galorna, nära solstånden och dagjämningarna.</string>
+  <string name="classless">Klasslös</string>
+  <string name="class_equipment_shop_dialog">Detta objekt är bara tillgängligt för en specifik klass. Du kan ändra din klass på Inställningar.</string>
+  <string name="class_gear_disclaimer">Du kan bara köpa utrustning för din nuvarande klass</string>
+  <string name="available_stats" formatted="false">%d poäng</string>
+  <string name="toogle_emojis">Växla Emojis På &amp; Av</string>
+  <string name="view_faq">Visa FAQ</string>
+  <string name="report_bug">Rapportera en bugg</string>
+  <string name="staff_moderators">Personal och Moderatorer</string>
+  <string name="world_boss">Världsboss</string>
+  <string name="strike_active_subtitle" formatted="false">%s är förtvivlad!</string>
+  <string name="market_owner_long">Köpmannen Alex</string>
+  <string name="tavern_owner_long">Värden Daniel</string>
+  <string name="stable_owner_long">Djurmästare Matt</string>
+  <string name="active_world_boss">Aktiv Världsboss</string>
+</resources>
diff --git a/Habitica/res/values-sw320dp/dimens.xml b/Habitica/res/values-sw320dp/dimens.xml
index d40b16fa2..a6b3daec9 100644
--- a/Habitica/res/values-sw320dp/dimens.xml
+++ b/Habitica/res/values-sw320dp/dimens.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="login_field_width">300dp</dimen>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-th/strings.xml b/Habitica/res/values-th/strings.xml
new file mode 100755
index 000000000..dd8b0ec3c
--- /dev/null
+++ b/Habitica/res/values-th/strings.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="XP_default">ค่าประสบการณ์</string>
+  <string name="HP_default">พลังชีวิต</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">ตั้งค่า</string>
+  <string name="pref_account_header">บัญชีผู้ใช้งาน</string>
+  <string name="pref_reminder_checkbox">เปิดการแจ้งเตือน</string>
+  <string name="pref_reminder_picker">ตั้งเวลาแจ้งเตือน</string>
+  <!--Adding tasks-->
+  <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="about.title">เกี่ยวกับแอปพลิเคชั่น</string>
+  <!--Network Errors-->
+  <string name="save_changes">บันทึก</string>
+  <string name="difficulty">ระดับความยาก</string>
+  <string name="trivial">ง่ายมาก</string>
+  <string name="easy">ง่าย</string>
+  <string name="medium">ปานกลาง</string>
+  <string name="hard">ยาก</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="coming_soon">เร็วๆนี้</string>
+  <string name="forgot_pw_btn">ลืมรหัสผ่าน</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="complete_tutorial">เข้าใจแล้ว!</string>
+  <string name="setup_task_healthWellness_1">ทานอาหารมีประโยชน์/อาหารขยะ</string>
+  <string name="setup_task_healthWellness_2">แปรงฟัน</string>
+  <string name="setup_task_school_2">ทำการบ้าน</string>
+  <string name="setup_task_chores_2">ล้างจาน</string>
+  <!--QR Strings-->
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index e2be2b049..c9b401367 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Seviye:</string>
     <string name="profile_class_bonus">Sınıf-Bonusu:</string>
     <string name="profile_allocated">Dağıtılmış:</string>
-    <string name="profile_boosts">Artışlar:</string>
     <string name="profile_private_message">Özel Mesaj</string>
     <string name="profile_achievements">Başarılar</string>
-    <string name="profile_achievement_ok">TAMAM</string>
-    <string name="profile_qrcode_close">Kapat</string>
 
 </resources>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index 62ed67db3..eb70d4be0 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">İşler</string>
-  <string name="sidebar.skills">Yetenekler</string>
-  <string name="sidebar.section.social">Sosyal</string>
-  <string name="sidebar.inbox">Mesajlar</string>
-  <string name="sidebar.tavern">Taverna</string>
-  <string name="sidebar.party">Takım</string>
-  <string name="sidebar.purchaseGems">Elmas Satın Al</string>
-  <string name="sidebar.guilds">Loncalar</string>
-  <string name="sidebar.challenges">Mücadeleler</string>
-  <string name="sidebar.section.inventory">Envanter</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Ekipman</string>
-  <string name="sidebar.stable">Ahır</string>
-  <string name="sidebar.news">Haberler</string>
-  <string name="sidebar.settings">Ayarlar</string>
-  <string name="sidebar.about">Hakkında</string>
+  <string name="sidebar_tasks">İşler</string>
+  <string name="sidebar_skills">Yetenekler</string>
+  <string name="sidebar_section_social">Sosyal</string>
+  <string name="sidebar_inbox">Mesajlar</string>
+  <string name="sidebar_tavern">Taverna</string>
+  <string name="sidebar_party">Takım</string>
+  <string name="sidebar_purchaseGems">Elmas Satın Al</string>
+  <string name="sidebar_guilds">Loncalar</string>
+  <string name="sidebar_challenges">Mücadeleler</string>
+  <string name="sidebar_section_inventory">Envanter</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Ekipman</string>
+  <string name="sidebar_stable">Ahır</string>
+  <string name="sidebar_news">Haberler</string>
+    <string name="sidebar_about">Hakkında</string>
   <string name="sidebar_shops">Dükkanlar</string>
   <string name="sidebar_stats">İstatistikler</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index 9fce3ed28..852ba69a5 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Kazandığın altınla avatarına eşya al!</string>
   <string name="tutorial_rewards_2">Seni motive eden şeyleri kullanarak Gerçek hayat ödülleride oluşturabilirsin.</string>
   <string name="tutorial_tasks_complete">Şimdilik bu kadar. Bir hatırlatıcıya ihtiyacın varsa SSS bölümüne bak.</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_skills">Yetenekler güçlü etkileri olan özel becerilerdir! Kullanmak için bir yetenğe bas. Bu Mana ile (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazanarak ödenir. Daha fazla bilgi için menüdeki SSS\'ı kontrol et!</string>
   <string name="tutorial_party">Burası senin ve arkadaşlarının birbirinizi hedeflerinize sorumlu tutabileceğiniz ve görevlerinizle canavarlarla savaştığınız yer!</string>
   <string name="tutorial_tavern">Taverna, yani herkese açık ve her yaşın sohbet odasına hoşgeldin! Burda üretkenlik hakkında sohbet edebilir ve sorular sorabilirsin. Iyi eğlenceler!</string>
-  <string name="tutorial_classes">Savaşçı, Büyücü, Şifacı veya Düzenbaz olmak için birini seç! Her bir sınıfın kendine özgü donanımı ve yeteneği vardır. Daha fazlasını öğrenmek için (?)\'ne bas!</string>
-  <string name="tutorial_stats">Niteliklerinin çoğunu tek seferde paylaştırmak için gri butona dokun veya birer birer eklemek için okları kullan.</string>
+    <string name="tutorial_stats">Niteliklerinin çoğunu tek seferde paylaştırmak için gri butona dokun veya birer eklemek için okları kullan.</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 8fa9dbc8c..d6a44e044 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Tecrübe</string>
   <string name="HP_default">Sağlık</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Ayarlar barkoddan yüklenemedi</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Ayarlar</string>
-  <string name="SP_address_hint">Sizin özel sunucunuz</string>
-  <string name="SP_userID_title">Kullanıcı ID\'si</string>
+    <string name="SP_userID_title">Kullanıcı ID\'si</string>
   <string name="SP_userID_summary">Sizin Kullanıcı Kimliğiniz</string>
   <string name="SP_APIToken_title">API Anahtarı</string>
   <string name="SP_APIToken_summary">Sizin API Anahtarınız</string>
   <string name="Language_title">Dil</string>
   <string name="Language_summary">Habitica\'nın dilini değiştirin</string>
-  <string name="SP_user_qr_code">Sizin QR Kodunuz</string>
-  <string name="PS_contact_title">Benimle iletişime geçin</string>
-  <string name="unknown_error">Bir hata oluştu…</string>
-  <string name="pref_account_header">Hesap</string>
+    <string name="PS_contact_title">Benimle iletişime geçin</string>
+    <string name="pref_account_header">Hesap</string>
   <string name="pref_first_day_of_the_week_title">Haftanın İlk Günü</string>
   <string name="pref_first_day_of_the_week_summary">Tüm takvimlerde haftanın ilk günü</string>
   <string name="pref_reminder_header">Günlük Hatırlatıcı</string>
   <string name="pref_reminder_checkbox">Hatırlatıcıyı Etkinleştirin</string>
   <string name="pref_reminder_picker">Hatırlatıcı Zamanını Ayarla</string>
   <string name="pref_cds_header">Özel Gün Başlangıcı</string>
-  <string name="pref_cds_picker">Özel Gün Başlangıç Zamanını Ayarla</string>
-  <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
+    <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
   <string name="push_notifications">Bildirimler</string>
   <string name="push_notifications_sum">Bildirim ayarlarınızı yapın</string>
   <string name="preference_push_you_won_challenge">Bir Mücadele kazandın!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Görevin Başladı</string>
   <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
   <!--Adding tasks-->
-  <string name="task_value">Değer</string>
-  <string name="new_todo">Yeni Yapılacak İş</string>
-  <string name="new_reward">Yeni Ödül</string>
-  <string name="new_daily">Yeni Günlük İş</string>
-  <string name="new_habit">Yeni Alışkanlık</string>
-  <string name="action_edit">Düzenle</string>
-  <string name="action_delete">Sil</string>
-  <string name="action_cancel">İptal et</string>
+    <string name="action_edit">Düzenle</string>
+    <string name="action_cancel">İptal et</string>
   <string name="login_btn">Giriş yap</string>
   <string name="register_btn">Kayıt ol</string>
   <string name="username">Kullanıcı adı</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Şifreni onayla</string>
   <string name="logout">Çıkış yap</string>
   <string name="logout_description">Hesabından çıkış yap</string>
-  <string name="account_details">Hesap Detayları</string>
-  <string name="LoginActivityName">Hoş Geldin</string>
-  <string name="string_revive">Dirilt</string>
-  <string name="please_connect">Lütfen bir ekran aracı kullanmadan önce uygulamaya bağlan</string>
-  <string name="about.title">Hakkında</string>
-  <string name="about.libraries">Kütüphaneler</string>
-  <string name="about.versionhistory">Sürüm geçmişi</string>
-  <string name="about.habitica_open_source">Habitica Github üzerinde açık kaynak olarak mevcuttur</string>
-  <string name="about.rate_our_app">Uygulamamızı Değerlendir</string>
-  <string name="about.give_us_feedback">Bize Geribildirim gönder!</string>
-  <string name="about.bugreport">Hata Bildir</string>
-  <string name="about.source_code">Kaynak Kodu</string>
-  <string name="repeatEvery">Tekrar aralığı</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Bağlantı Hatası</string>
-  <string name="network_error_no_network_body">İnternete bağlı değilsin.</string>
-  <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
+    <string name="LoginActivityName">Hoş Geldin</string>
+    <string name="about_title">Hakkında</string>
+  <string name="about_libraries">Kütüphaneler</string>
+    <string name="about_habitica_open_source">Habitica Github üzerinde açık kaynak olarak mevcuttur</string>
+  <string name="about_rate_our_app">Uygulamamızı Değerlendir</string>
+  <string name="about_give_us_feedback">Bize Geribildirim gönder!</string>
+  <string name="about_bugreport">Hata Bildir</string>
+  <string name="about_source_code">Kaynak Kodu</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
   <string name="authentication_error_title">Kimlik doğrulama hatası</string>
-  <string name="authentication_error_body">Kullanıcı adı ve/veya Şifre hatalı.</string>
-  <string name="login_validation_error_title">Doğrulama Hatası</string>
+    <string name="login_validation_error_title">Doğrulama Hatası</string>
   <string name="login_validation_error_fieldsmissing">Tüm alanları doldurmanız gerekiyor.</string>
   <string name="save_changes">Kaydet</string>
   <string name="copy">Kopyala</string>
   <string name="notes">Notlar</string>
-  <string name="text">Metin</string>
-  <string name="difficulty">Zorluk</string>
+    <string name="difficulty">Zorluk</string>
   <string name="tags">Etiketler</string>
   <string name="trivial">Önemsiz</string>
   <string name="easy">Kolay</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Olumsuz ( - )</string>
   <string name="checklist">Maddeler</string>
   <string name="reminders">Hatırlatıcılar</string>
-  <string name="actions">Hareketler</string>
-  <string name="attributes">Özellikler</string>
-  <string name="physical">Güç</string>
-  <string name="mental">Zeka</string>
-  <string name="social">Bünye</string>
-  <string name="other">Sezgi</string>
-  <string name="frequency">Sıklık</string>
-  <string name="frequency_weekly">Haftanın Belirli Günlerinde</string>
-  <string name="frequency_daily">X günde bir</string>
-  <string name="repeatables_summary_title">Özet</string>
-  <string name="repeatables_title">Tekrarlar</string>
-  <string name="repeatables_on_title">Tekrarlanır</string>
-  <string name="repeatables_frequency_daily">Günlük</string>
+    <string name="attributes">Özellikler</string>
+    <string name="repeatables_frequency_daily">Günlük</string>
   <string name="repeatables_frequency_weekly">Haftalık</string>
   <string name="repeatables_frequency_monthly">Aylık</string>
   <string name="repeatables_frequency_yearly">Yıllık</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Sağlığın tükendi!</string>
   <string name="faint_button">Sağlığını Doldur &amp; Tekrar Dene</string>
   <string name="filter">Filtre</string>
-  <string name="profile_image">Profil Resmi</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">%2$d mana karşılığında %1$s kullandın.</string>
-  <string name="used_skill_without_mana">%1$s kullandın.</string>
+    <string name="used_skill_without_mana">%1$s kullandın.</string>
   <string name="new_checklist_item">yeni madde</string>
-  <string name="add_checklist_item">Ekle</string>
-  <string name="reminder_title">İşlerini işaretlemeyi unutma</string>
-  <string name="skill_progress_title">Yetenek Kullanma</string>
-  <string name="coming_soon">Yakında</string>
-  <string name="chat_flag_confirmation">Bu mesajı kural ihlali olarak bildirmek istediğine emin misin?</string>
-  <string name="flag_confirm">Mesajı İşaretle</string>
-  <string name="unlock_lvl_11">Seviye 11\'de açılır</string>
-  <string name="no_party_message">Bir takıma üye değilsin. Bir takıma katılmak için lütfen internet sitesini ziyaret et. </string>
-  <string name="forgot_pw_btn">Şifremi Unuttum</string>
-  <string name="tavern.inn.checkOut">Günlük İşlerini tekrar etkinleştir</string>
-  <string name="tavern.inn.rest">Günlük İşleri durdur</string>
-  <string name="reward.dialog.buy">Satın al</string>
-  <string name="reward.dialog.dismiss">Yoksay</string>
+    <string name="reminder_title">İşlerini işaretlemeyi unutma</string>
+    <string name="unlock_lvl_11">Seviye 11\'de açılır</string>
+    <string name="forgot_pw_btn">Şifremi Unuttum</string>
+  <string name="tavern_inn_checkOut">Günlük İşlerini tekrar etkinleştir</string>
+  <string name="tavern_inn_rest">Günlük İşleri durdur</string>
+  <string name="reward_dialog_buy">Satın al</string>
+  <string name="reward_dialog_dismiss">Yoksay</string>
   <string name="party">Takım</string>
   <string name="chat">Sohbet</string>
   <string name="members">Üyeler</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Günlük İşler</string>
   <string name="todos">Yapılacak İşler</string>
   <string name="rewards">Ödüller</string>
-  <string name="taskform.delete.title">Emin misin?</string>
-  <string name="taskform.delete.message">Gerçekten silmek istiyor musun?</string>
-  <string name="yes">Evet</string>
+    <string name="yes">Evet</string>
   <string name="no">Hayır</string>
   <string name="quest">Görev</string>
   <string name="avatar_body">Vücut</string>
   <string name="avatar_hair">Saç</string>
   <string name="avatar_shirt">Gömlek</string>
   <string name="avatar_skin">Ten</string>
-  <string name="avatar_ears">Hayvan Kulakları</string>
-  <string name="avatar_base">Temel</string>
+    <string name="avatar_base">Temel</string>
   <string name="avatar_color">Renk</string>
   <string name="avatar_beard">Sakal</string>
   <string name="avatar_mustache">Bıyık</string>
   <string name="avatar_flower">Çiçek</string>
   <string name="avatar_bangs">Kahkül</string>
-  <string name="avatar_nothing">Hiçbir şey ayarlanmadı</string>
-  <string name="avatar_size">Boyut</string>
+    <string name="avatar_size">Boyut</string>
   <string name="avatar_size_slim">İnce</string>
   <string name="avatar_size_broad">Geniş</string>
   <string name="avatar_background">Arka plan </string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Satın al</string>
   <string name="purchase_set_title">%s seti satın al</string>
   <string name="due_date">Son Tarih</string>
-  <string name="quest.accept">Kabul et</string>
-  <string name="quest.reject">Reddet</string>
-  <string name="quest.begin">Göreve Başla</string>
-  <string name="quest.cancel">Daveti İptal Et</string>
-  <string name="quest.abort">Görevi iptal et</string>
-  <string name="quest.leave">Görevden Ayrıl</string>
-  <string name="quest.pending">Beklemede</string>
-  <string name="quest.accepted">Kabul edildi</string>
-  <string name="quest.rejected">Reddedildi</string>
-  <string name="quest.participants">Katılımcılar</string>
-  <string name="version_info">Versiyon %1$s (%2$d)</string>
+  <string name="quest_accept">Kabul et</string>
+  <string name="quest_reject">Reddet</string>
+  <string name="quest_begin">Göreve Başla</string>
+  <string name="quest_cancel">Daveti İptal Et</string>
+  <string name="quest_abort">Görevi iptal et</string>
+    <string name="version_info">Versiyon %1$s (%2$d)</string>
   <string name="sidebar_help">Yardım &amp; SSS</string>
   <string name="complete_tutorial">Anladım!</string>
   <string name="dismiss_tutorial">Daha sonra hatırlat</string>
   <string name="intro_1_subtitle">Hoş Geldin</string>
-  <string name="intro_1_title">Habitica\'ya</string>
-  <string name="intro_1_description">Artık işlerini hallederken eğlenme zamanı. Hayatlarını adım adım iş yaparak geliştiren %s kişiye katıl.</string>
+    <string name="intro_1_description">Artık işlerini hallederken eğlenme zamanı. Hayatlarını adım adım iş yaparak geliştiren %s kişiye katıl.</string>
   <string name="intro_2_subtitle">Oyundaki gelişim</string>
   <string name="intro_2_title">Hayattaki gelişim</string>
   <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Sosyalleş</string>
   <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi geliştirerek birbirinize destek olun!</string>
   <string name="intro_finish_button">Hadi başlayalım!</string>
-  <string name="previous_button">Önceki</string>
-  <string name="next_button">Sonraki</string>
+    <string name="next_button">Sonraki</string>
   <string name="skip_button">Atla</string>
-  <string name="setup_welcome_description">Habitica\'ya hoşgeldin, oyunda ilerledikçe gerçek hayatını da geliştireceksin! Gerçek hayat hedeflerine ulaştıkça ekipman, evcil hayvan, görevler ve dahasının kilidini açacaksın.</string>
-  <string name="setup_welcome_title">Hoş Geldin</string>
-  <string name="avatar_setup_description">Nasıl görünmek istersin\? Dert etme, bunu daha sonra değiştirebilirsin.</string>
+    <string name="avatar_setup_description">Nasıl görünmek istersin\? Dert etme, bunu daha sonra değiştirebilirsin.</string>
   <string name="task_setup_description">Müthiş! Şimdi, bu yolculukta ne üstünde çalışmak istiyorsun\?</string>
   <string name="setup_group_work">İş</string>
   <string name="setup_group_exercise">Egzersiz</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Bir zanaat uzmanlığına çalış</string>
   <string name="setup_task_creativity_2">Yaratıcı bir proje üzerinde çalış</string>
   <string name="setup_task_creativity_3">Yaratıcı projeyi bitir</string>
-  <string name="gem.purchase.support">Habitica\'yı canlı tutmamız için yardımcı olmak ister misiniz? Yapımcıları elmas alarak destekleyebilirsiniz!\n\nElmaslarla hesabınız için eğlenceli ekstralar alabilirsiniz, örneğin: \n\n - Avatar\'ınız için havalı kostümler\n - Muhteşem arkaplanlar\n - Evcil hayvan yumurtaları kazanacağınız eğlenceli görevler\n - 100. seviyeden evvel sınıfınızı değiştirebileceğiniz beceriler\n\nHabitica\'yı en iyisi yapmamız için yardımcı olduğunuz için teşekkürler. Desteğiniz bize çok şey ifade ediyor!</string>
-  <string name="my_guilds">Loncalarım</string>
+    <string name="my_guilds">Loncalarım</string>
   <string name="public_guilds">Açık Loncalar</string>
   <string name="guild">Lonca</string>
   <string name="leave">Ayrıl</string>
   <string name="join">Katıl</string>
-  <string name="leader">Lider</string>
-  <string name="gems">Elmaslar</string>
-  <string name="copy_as_todo">Yapılacak İşlere kopyala</string>
-  <string name="send_pm">ÖM Gönder</string>
-  <string name="flag">Bildir</string>
-  <string name="delete">Sil</string>
+    <string name="gems">Elmaslar</string>
+    <string name="delete">Sil</string>
   <string name="name">Ad</string>
   <string name="description">Tanım</string>
   <string name="add_tag">Yeni Etiket ekle</string>
   <string name="privacy">Gizlilik</string>
   <string name="write_message">Mesaj Yaz</string>
-  <string name="post">Gönder</string>
-  <string name="guild_search_hint">Lonca ara</string>
-  <string name="todo_due">Şu zamana: %s</string>
-  <string name="daily_streak">mevcut kesintisiz seri: %d</string>
-  <string name="todo_has_duedate">İşin Bitirme Tarihi var</string>
-  <string name="battle_gear">Savaş Ekipmanı</string>
+    <string name="guild_search_hint">Lonca ara</string>
+    <string name="battle_gear">Savaş Ekipmanı</string>
   <string name="costume">Kostüm</string>
   <string name="outfit_head">Kafa</string>
   <string name="outfit_headAccessory">Kafa Aksesuarı</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Kostümü Giy</string>
   <string name="equipped">Kuşanılmış</string>
   <string name="quest_cancel_message">Bu görevi iptal etmek istediğinizden emin misiniz\? Tüm davet kabulleri kaybolacak. Görev sahibi görev parşömeni sahipliğini sürdürecektir.</string>
-  <string name="quest.invitation">Görev Daveti</string>
-  <string name="quest_begin_message">Emin misin\? %2$d takım üyesinden sadece %1$d tanesi göreve katıldı! Görevler bütün Takım üyeleri kabul ettiğinde ya da reddettiğinde otomatik olarak başlar.</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="quest_begin_message">Emin misin\? %2$d takım üyesinden sadece %1$d tanesi göreve katıldı! Görevler bütün Takım üyeleri kabul ettiğinde ya da reddettiğinde otomatik olarak başlar.</string>
+    <string name="ago_1day">1 gün önce</string>
   <string name="ago_days">%d gün önce</string>
   <string name="ago_1Minute">1 dakika önce </string>
   <string name="ago_minutes">%d dakika önce </string>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Gardırop içerisinde nadir bir Ekipman parçası buldun: : %s! Harika!</string>
   <string name="armoireFood">Gardırobun altını üstünü getirdin ve %1$s %2$s buldun. Onun burada ne işi var?</string>
   <string name="armoireExp">Gardırop ile güreştin ve Tecrübe kazandın. Al sana!</string>
-  <string name="armoireNotesFull">Gardırobu rastgele özel Ekipman, Tecrübe ve yiyecek elde etmek için açın! Kalan ekipman parçaları: %d</string>
-  <string name="armoireLastItem">Büyülü Gardırop içerisinde nadir Ekipman\'ın son parçasını da buldunuz.</string>
-  <string name="armoireNotesEmpty">Gardırop içerisinde her ayın ilk haftasında yeni bir Ekipman yer alacaktır. O zamana kadar Tecrübe ve Yiyecek için tıklamaya devam et!</string>
-  <string name="sell">Sat (%d Altın)</string>
+    <string name="sell">Sat (%d Altın)</string>
   <string name="hatch_with_potion">İksir ile üret</string>
-  <string name="feed_to_pet">Evcil hayvana besle</string>
-  <string name="hatch_egg">Yumurta ile üret</string>
+    <string name="hatch_egg">Yumurta ile üret</string>
   <string name="invite_party">Takımı davet et</string>
   <string name="dialog_feeding">%s besle:</string>
   <string name="use_animal">Kullan</string>
@@ -305,17 +237,8 @@
   <string name="close">Kapat</string>
   <string name="share">Paylaş</string>
   <string name="notification_pet_fed">%s besledin!</string>
-  <string name="notification_purchase">%s satın aldın</string>
-  <string name="notification_purchase_reward">Bir ödül satın aldın</string>
-  <string name="sectiondrop">Standart</string>
-  <string name="sectionpremium">Büyülü İksir </string>
-  <string name="sectionquest">Görev</string>
-  <string name="sectionspecial">Nadir</string>
-  <string name="sectionmounts">Standart</string>
-  <string name="sectionpremiumMounts">Büyülü İksir </string>
-  <string name="sectionquestMounts">Görev</string>
-  <string name="sectionspecialMounts">Nadir</string>
-  <string name="world_quest">Dünya Görevi</string>
+    <string name="notification_purchase_reward">Bir ödül satın aldın</string>
+    <string name="world_quest">Dünya Görevi</string>
   <string name="inn_description">Bir molaya mı ihtiyacın var\? Daniel\'in hanında dinlenerek Habitica\'nın bazı oyun mekaniklerini durdur:/n/n • Tamamlanmamış günlük işler sana zarar vermez/n • Görevlerin kesintisiz tamamlanma serilerini yitirmez ve renklerinde sönme olmaz/n • Canavarlar tamamlanmamış günlük işler için saldırmaz/n • Canavarlara vereceğin zarar ya da topladığın görev eşyaları Handan ayrılana kadar beklemede kalır</string>
   <string name="empty_items">Hiç %s sahibi değilsin</string>
   <string name="user_level">Svy %d</string>
@@ -330,8 +253,7 @@
   <string name="healer_description">Şifacılar hasarlara karşı su geçirmez bir şekilde karşı dururlar ve diğerlerine de bu korumayı sürdürürler. Unutulan Günlük Görevler ve Kötü Alışkanlıklar onları çok fazla ürkütmez ve başarısızlıklardan dolayı kaybedilen sağlıkları iyileştirirler. Takımdaki diğerlerine refakat etmekten hoşlanıyorsan veya çok çalışarak Ölümü atlatma fikri seni heyecanlandırıyorsa bir şifacı olarak oynayabilirsin!</string>
   <string name="select_class">Sınıf Seç</string>
   <string name="opt_out_class">Çekil</string>
-  <string name="opt_out_description">Sınıflarla rahatsız edilmek istemiyor musun\? Daha sonra mı seçmek istersin\? Çekilirsen - özel becerileri olmayan bir savaşçı olacaksın. Daha sonra Wiki\'de sınıf sistemi hakkında bilgi edinebilir ve istediğin zaman sınıfları etkinleştirebilirsin.</string>
-  <string name="class_confirmation">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: %s!</string>
   <string name="class_changed_description">Ekipmanlar menüsü altında değiştirebileceğin yeni varsayılan Savaş Ekipmanın var!</string>
   <string name="choose_class">Sınıf Seç</string>
@@ -345,23 +267,18 @@
   <string name="invite_existing_users">Mevcut Kullanıcıları Davet Et</string>
   <string name="send">Gönder</string>
   <string name="invite">Arkadaşlarını Davet Et</string>
-  <string name="invite_id_description">Habitica kullanan arkadaşların var ise, burada Kullanıcı ID\'leri ile davet edebilirsin.</string>
-  <string name="invite_username_description">Habitica kullanan arkadaşların var ise, burada kullanıcı adları ile davet edebilirsin.</string>
+    <string name="invite_username_description">Habitica kullanan arkadaşların var ise, burada kullanıcı adları ile davet edebilirsin.</string>
   <string name="invite_email_description">E-postan ile bir arkadaşın Habitica\'ya katılırsa, otomatik olarak takımına davet edilecektir!</string>
   <string name="add_invites">Davetleri Ekle</string>
-  <string name="user_id">Kullanıcı ID\'si</string>
-  <string name="email">E-posta</string>
-  <string name="invite_users">Takıma davet et</string>
-  <string name="share_using">Kullanımı paylaş</string>
+    <string name="email">E-posta</string>
+    <string name="share_using">Kullanımı paylaş</string>
   <string name="share_levelup">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %d seviye elde ettim!</string>
   <string name="share_hatched">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s evcil hayvan ürettim.</string>
   <string name="share_raised">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s 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ı: Artık %s sınıfından ekipman alamayacaksınız.</string>
-  <string name="leaderMessage">%1$s tarafından mesaj</string>
-  <string name="leaderName">Lider: %1$s</string>
-  <string name="confirm">Onayla</string>
+    <string name="confirm">Onayla</string>
   <string name="market">Pazar</string>
   <string name="timeTravelers">Zaman Yolcuları</string>
   <string name="seasonalShop">Mevsimsel Dükkan</string>
@@ -369,37 +286,16 @@
   <string name="party_invite">Arkadaşlarını davet ederek kilidini aç</string>
   <string name="login_incentive">Habitica\'ya düzenli girerek kilidini aç</string>
   <string name="create_account">Bir hesap oluşturarak kilidini aç</string>
-  <string name="no_gold">Yeterli Altın yok</string>
-  <string name="no_potion">Sağlık iksiri satın almanıza gerek yoktur</string>
-  <string name="successful_purchase">%1$s satın alındı</string>
-  <string name="purchase_confirmation_title">Satın almayı onayla</string>
-  <string name="confirm_purchase_text">%2$s %3$s karşılığında %1$s satın al</string>
-  <string name="gem">elmas</string>
-  <string name="hourglass">kumsaati</string>
-  <string name="hourglasses">kumsaatleri</string>
-  <string name="gold_singular">altın</string>
-  <string name="gold_plural">altın</string>
+    <string name="successful_purchase">%1$s satın alındı</string>
+    <string name="gold_plural">altın</string>
   <string name="chat_message_copied">Mesaj Panoya kopyalandı</string>
-  <string name="copy_chat_message">Panoya kopyala</string>
-  <string name="edit_tag_title">Etiketi Düzenle</string>
-  <string name="edit_tag_btn_edit">Düzenle</string>
-  <string name="edit_tag_btn_done">Tamam</string>
-  <string name="edit_tag_btn_delete">Sil</string>
-  <string name="confirm_delete_tag_title">Emin misin?</string>
+    <string name="edit_tag_btn_edit">Düzenle</string>
+    <string name="confirm_delete_tag_title">Emin misin?</string>
   <string name="confirm_delete_tag_message">Silmek istediğine emin misin?</string>
-  <string name="filter_drawer_edit_tags">Etiketleri Düzenle</string>
-  <string name="filter_drawer_filter_tags">Etikete göre filtrele</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Bir kişi sizi bu QR kod ile davet edebilir</string>
-  <string name="qr_save_message">QR Kodun şurada kaydedildi</string>
-  <string name="qr_dialogue_title">QR Kodun</string>
-  <string name="download">İndir</string>
-  <string name="send_new_message">Yeni mesaj gönder</string>
-  <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
   <string name="action_continue">Devam Et</string>
-  <string name="scan_qr_code">QR Kodunu Tara</string>
-  <string name="enter_recipient_uuid">Alıcının Kullanıcı ID\'sini gir</string>
-  <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
+    <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
   <string name="stats_widget_label">Habitica İstatistikleri</string>
   <string name="add_task">İş Ekle</string>
   <string name="add_habit">Alışkanlık Ekle</string>
@@ -410,15 +306,14 @@
   <string name="widget_habit_button">Habitica Alışkanlığı Yap</string>
   <string name="widget_dailies">Habitica Günlük İşler</string>
   <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
-  <string name="widget_add_task">Habitica İş Ekle</string>
-  <string name="google_services_missing">Google play services bulunamadı.</string>
-  <string name="gem.purchase.toolbartitle">Satın al</string>
-  <string name="gem.purchase.title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
-  <string name="gem.purchase.subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
-  <string name="gem.purchase.listitem1">Avatarın için havalı kostümler</string>
-  <string name="gem.purchase.listitem2">Muhteşem arka planlar</string>
-  <string name="gem.purchase.listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
-  <string name="gem.purchase.listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
+    <string name="google_services_missing">Google play services bulunamadı.</string>
+  <string name="gem_purchase_toolbartitle">Satın al</string>
+  <string name="gem_purchase_title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="gem_purchase_subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
+  <string name="gem_purchase_listitem1">Avatarın için havalı kostümler</string>
+  <string name="gem_purchase_listitem2">Muhteşem arka planlar</string>
+  <string name="gem_purchase_listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
+  <string name="gem_purchase_listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
   <string name="support_habitica">Habitica\'ya Destek Ol</string>
   <string name="skill_transformation_use">kullan</string>
   <string name="hatching_market_info">İş tamamlarken doğru eşyalar düşmedi mi? Pazara bir göz at!</string>
@@ -432,36 +327,36 @@
   <string name="belongs_to_challenge">Bir Mücadeleye ait</string>
   <string name="has_reminder">Hatırlatıcı Mevcut</string>
   <string name="has_tag">Etiket Mevcut</string>
-  <string name="subscribe.title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="subscribe_title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
   <string name="subscribe_prompt">Abone ol ve bu faydalardan yararlan:</string>
-  <string name="subscribe.listitem1">Altınla elmas satın al</string>
-  <string name="subscribe.listitem2">Özel aylık ekipman</string>
-  <string name="subscribe.listitem3">Fazladan geçmiş kaydını sakla</string>
-  <string name="subscribe.listitem4">Günlük ganimet limiti ikiye katlanır</string>
+  <string name="subscribe_listitem1">Altınla elmas satın al</string>
+  <string name="subscribe_listitem2">Özel aylık ekipman</string>
+  <string name="subscribe_listitem3">Fazladan geçmiş kaydını sakla</string>
+  <string name="subscribe_listitem4">Günlük ganimet limiti ikiye katlanır</string>
   <string name="subscriptions">Abonelikler</string>
   <string name="subscription_duration">Her %s tekrar eder</string>
   <string name="subscribe">Abone Ol</string>
-  <string name="subscribe.listitem1.description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
+  <string name="subscribe_listitem1_description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
 \n
 \nAylık sevkiyatı başlangıçta aylık 25 Elmas ile sınırlıdır, ama ardışık abonelik süresine göre artabilir.
 \n
 \nElmas limiti her üç aylık ardışık abonelik için 5 artar, toplam üst limit olan aylık 50 Elmasa kadar artabilir!</string>
-  <string name="subscribe.listitem2.description">Her ay avatarın için özel görsel bir eşya alırsın!
+  <string name="subscribe_listitem2_description">Her ay avatarın için özel görsel bir eşya alırsın!
 \n
 \nAyrıca, her üç aylık ardışık abonelik için, Gizemli Zaman Yolcuları sana tarihi (ve fütüristik!) görsel eşyalara erişim sağlar.</string>
-  <string name="subscribe.listitem3.description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
-  <string name="subscribe.listitem4.description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
-  <string name="subscribe1month.gemcap">25 Elmas limiti</string>
-  <string name="subscribe3month.gemcap">30 Elmas limiti</string>
-  <string name="subscribe6month.gemcap">35 Elmas limiti</string>
-  <string name="subscribe12month.gemcap">45 Elmas limiti</string>
+  <string name="subscribe_listitem3_description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
+  <string name="subscribe_listitem4_description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
+  <string name="subscribe1month_gemcap">25 Elmas limiti</string>
+  <string name="subscribe3month_gemcap">30 Elmas limiti</string>
+  <string name="subscribe6month_gemcap">35 Elmas limiti</string>
+  <string name="subscribe12month_gemcap">45 Elmas limiti</string>
   <string name="subscription_hourglasses">+%d Mistik Kum Saati</string>
   <string name="payment_method">Ödeme şekli</string>
   <string name="subscription">Abonelik</string>
   <string name="active">Etkin</string>
   <string name="cancel_subscription">Aboneliği İptal Et</string>
-  <string name="cancel_subscription_google.description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
-  <string name="cancel_subscription_notgoogle.description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
+  <string name="cancel_subscription_google_description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
+  <string name="cancel_subscription_notgoogle_description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
   <string name="visit_habitica_website">Habitica Websitesini Ziyaret Et</string>
   <string name="current_bonuses">Şu An Sağlanan Faydalar</string>
   <string name="months_subscribed">Abone olunan aylar</string>
@@ -476,56 +371,40 @@
   <string name="twelve_months">12 aylık</string>
   <string name="subscribe_prompt_thanks">Abone Olarak bu faydalardan yararlanıyorsun:</string>
   <string name="subscription_status">Abonelik Durumu</string>
-  <string name="byLeader">%s \'a/e göre</string>
-  <string name="challenge_details">Mücadele Detayları</string>
-  <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
+    <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
   <string name="challenge_leave_text">\"%s\" Mücadelesinden ayrılmak istediğine emin misin\?</string>
   <string name="challenge_remove_tasks_title">İşleri sil</string>
   <string name="challenge_remove_tasks_text">İşleri silmek istiyor musun\?</string>
   <string name="remove_tasks">Sil</string>
   <string name="keep_tasks">Tut</string>
   <string name="my_challenges">Benim Mücadelelerim</string>
-  <string name="public_challenges">Herkese Açık</string>
-  <string name="challenges">Mücadeleler</string>
-  <string name="daily">Günlük İş</string>
+    <string name="daily">Günlük İş</string>
   <string name="habit">Alışkanlık</string>
   <string name="reward">Ödül</string>
   <string name="todo">Yapılacak İş</string>
   <string name="official">Resmi</string>
-  <string name="participating">Katılan</string>
-  <string name="challenge">Mücadele</string>
-  <string name="go_to_challenge">Mücadeleye Git</string>
-  <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
+    <string name="challenge">Mücadele</string>
+    <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
   <string name="join_a_challenge">Listene seçili işler eklemek için bir Mücadeleye katıl, sonra da başarılar ve hatta elmaslar kazanmak için diğer Habiticalılarla yarış!</string>
   <string name="check_the_public_challenge_tab">\"Herkese Açık\" sekmesine dokunarak kullanıcılar tarafından yaratılmış Mücadelelerden sana en uygun olanını bul!</string>
-  <string name="add_reminder">Hatırlatıcı Ekle</string>
-  <string name="warning">Uyarı</string>
-  <string name="open_settings">Ayarları Aç</string>
-  <string name="dont_keep_activities_warning">Görünüşe göre Geliştirici seçeneği olan Etkinlikleri Saklamayın etkin. Şu anda bu seçenek, habitica uygulamasıyla ilgili sorunlara neden oluyor, bu nedenle devre dışı bırakılmasını öneriyoruz.</string>
-  <string name="inbox">Mesajların</string>
-  <string name="FAQ">Sıkça Sorulan Sorular</string>
-  <string name="special">Özel</string>
+    <string name="inbox">Mesajların</string>
+    <string name="special">Özel</string>
   <string name="gem_for_gold_description">Habitica\'ya abone olduğun için, her ay Altın karşılığı bir miktar Elmas satın alabilirsin.</string>
-  <string name="limited_count">%d kaldı</string>
-  <string name="gem_shop">Elmas</string>
+    <string name="gem_shop">Elmas</string>
   <string name="mystery_item">Gizemli Eşya</string>
   <string name="myster_item_notes">Her ay, aboneler gizemli bir eşya alırlar. Bu genelde ayın son haftasından önce açıklanır.</string>
   <string name="open">Aç</string>
-  <string name="notification_mystery_item">Kutuyu açtın ve %s buldun!</string>
-  <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
+    <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Bir sonraki ödülün %1$d Girişten sonra açılacak</string>
   <string name="pending_approval">onay bekleniyor</string>
   <string name="filters">Filtreler</string>
   <string name="done">Tamam</string>
-  <string name="group_tasks_edit_description">Grup işleri düzenlenemez.</string>
-  <string name="group_tasks_edit_title">Bu iş düzenlenemez</string>
-  <string name="groups">Gruplar</string>
+    <string name="groups">Gruplar</string>
   <string name="all">Hepsi</string>
   <string name="none">Hiçbiri</string>
   <string name="owned">Sahip olunan</string>
   <string name="not_owned">Sahip olunmayan</string>
-  <string name="new_game">Yeni\nOyun</string>
-  <string name="login_btn_fb">Facebook ile giriş yap</string>
+    <string name="login_btn_fb">Facebook ile giriş yap</string>
   <string name="login_btn_google">Google ile giriş yap</string>
   <string name="action_back">Geri</string>
   <string name="welcome_text">Ah, burada yeni olmalısın. Ben Justin, Habitica\'daki rehberin olacağım.
@@ -559,7 +438,6 @@
   <string name="reload_content">İçeriği Yenile</string>
   <string name="dailyDueDefaultView">"Günlük İşleri varsayılan olarak  ‘Aktif’ sekmesine ata"</string>
   <string name="dailyDueDefaultViewDescription">Bu seçenek seçili ise, Günlük İşlerin varsayılan sekmesi \'tümü\' yerine \'aktif\' olacaktır</string>
-  <string name="repeat_summary">%1$s her %2$s%3$s%4$s tekrarlanır</string>
   <string name="no_billing_gems">Cihazında hiçbir desteklenen ödeme yöntemi yok. Elmas satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="no_billing_subscriptions">Cihazında hiçbir desteklenen ödeme yöntemi yok. Abonelik satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="save">Kaydet</string>
@@ -567,8 +445,7 @@
   <string name="gem_reward">Elmas Ödülü</string>
   <string name="tasks">İşler</string>
   <string name="create_challenge">Mücadele Oluştur</string>
-  <string name="edit_challenge">Düzenle</string>
-  <string name="challenge_create_error_tavern_one_gem">Herkese açık bir mücadele yaratmak için en az 1 elmasa ihtiyacın var.</string>
+    <string name="challenge_create_error_tavern_one_gem">Herkese açık bir mücadele yaratmak için en az 1 elmasa ihtiyacın var.</string>
   <string name="challenge_create_error_enough_gems">Bir mücadele oluşturacak kadar elmasın yok.</string>
   <string name="identify_your_challenge_with_a_tag">Mücadeleni kısa bir ad ile tarif et</string>
   <string name="challenge_create_error_tag">Bu Mücadeleyi oluşturmak için bir kısa isme ihtiyacın var.</string>
@@ -578,42 +455,36 @@
   <string name="new_challenge_title">Yeni mücadele başlığı</string>
   <string name="ownership">Sahiplik</string>
   <string name="inn">Han</string>
-  <string name="system">Sistem</string>
-  <string name="start_quest">Yeni bir Göreve başla</string>
+    <string name="start_quest">Yeni bir Göreve başla</string>
   <string name="leave_party">Takımdan Ayrıl</string>
   <string name="party_description">Takım Tanımı</string>
-  <string name="abort_confirmation">Bu görevi iptal etmek istediğine emin misin?  Tüm davet kabulleri ve ilerleme kaybolacak. Görev sahibi görev parşömenini geri alacaktır.</string>
-  <string name="leave_quest_confirmation">Etkin görevden ayrılmak istediğinden emin misin? Tüm görev ilerlemen kaybolacak.</string>
-  <string name="number_participants">%1$d Katılımcı</string>
+    <string name="number_participants">%1$d Katılımcı</string>
   <string name="welcome_back">Tekrar Hoş Geldin</string>
   <string name="yesterdaililes_prompt">Dün hiç bu Günlük İşlerden yaptın mı\?</string>
   <string name="start_day">Günüme Başla</string>
   <string name="leave_party_confirmation">Takımdan ayrılmak istediğinden emin misin?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Bir sonraki ödülün %d Girişten sonra</string>
-  <string name="pending">Beklemede</string>
+    <string name="pending">Beklemede</string>
   <string name="accepted">Kabul edildi</string>
   <string name="declined">Reddedildi</string>
   <string name="participants">Katılımcılar</string>
   <string name="invitations">Davetiyeler</string>
-  <string name="quest_leader_header" formatted="false">%s tarafından başlatıldı</string>
+  <string name="quest_leader_header">%s tarafından başlatıldı</string>
   <string name="quest_abort_message">Bu görevi iptal etmek istediğine emin misin?  Tüm davet kabulleri ve ilerleme kaybolacak. Görev parşömenini görev sahibine geri verilecektir.</string>
-  <string name="loading">Yükleniyor…</string>
-  <string name="reloading_content">İçerik Yeniden Yükleniyor</string>
+    <string name="reloading_content">İçerik Yeniden Yükleniyor</string>
   <string name="thousand_abbrev">bin</string>
   <string name="million_abbrev">milyon</string>
   <string name="billion_abbrev">milyar</string>
-  <string name="your_balance">Bakiye:</string>
-  <string name="available_until" formatted="false">%s tarihine kadar mevcut</string>
-  <string name="gems_left_max" formatted="false">Aylık Elmaslar: %1$d/%2$d Kalmış</string>
-  <string name="gems_left_nomax" formatted="false">Aylık Elmaslar: %d Kalmış</string>
+    <string name="available_until">%s tarihine kadar mevcut</string>
+  <string name="gems_left_max">Aylık Elmaslar: %1$d/%2$d Kalmış</string>
+  <string name="gems_left_nomax">Aylık Elmaslar: %d Kalmış</string>
   <string name="health">Sağlık</string>
   <string name="collect">Topla</string>
   <string name="rage_meter">Öfke Sayacı</string>
   <string name="boss_quest">Canavar Görevi</string>
   <string name="collection_quest">Toplama Görevi</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Tecrübe Puanı</string>
-  <string name="gold_reward" formatted="false">%d Altın</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Tecrübe Puanı</string>
+  <string name="gold_reward">%d Altın</string>
   <string name="quest_owner_rewards">Görev Sahibinin Ödülleri</string>
   <string name="str_abbrv">Güç</string>
   <string name="per_abbrv">Sezgi</string>
@@ -626,8 +497,7 @@
   <string name="reset_account_confirmation">hesabımı sıfırla</string>
   <string name="delete_account_confirmation">hesabımı sil</string>
   <string name="danger_zone">Tehlike Bölgesi</string>
-  <string name="nevermind">Boşver</string>
-  <string name="resetting_account">Hesap Sıfırlanıyor</string>
+    <string name="resetting_account">Hesap Sıfırlanıyor</string>
   <string name="deleting_account">Hesap Siliniyor</string>
   <string name="insufficientGold">Bu eşyanın fiyatını karşılayabilmek için daha fazla iş yapmalısın!</string>
   <string name="insufficientGems">Bu eşyayı almak için daha çok elmasa ihtiyacın var!</string>
@@ -635,7 +505,7 @@
   <string name="insufficientHourglasses">Bu eşyayı almak için daha çok Mistik Kum Saatine ihtiyacın var!</string>
   <string name="get_hourglasses">Kum Saatleri al</string>
   <string name="subscribe_for_hourglasses">Kum Saatleri için abone ol</string>
-  <string name="timetravelers_closed_description">"Her 3 aylık devamlı üyelik başına bir Mistik Kum Saati kazan, daha sonra onu kullanarak sınırlı sayıdaki ekipmanların, hayvanların ve bineklerin kilidini  aç, geçmişten .... ve gelecekten!"</string>
+  <string name="timetravelers_closed_description">"Her 3 aylık devamlı üyelik başına bir Mistik Kum Saati kazan, daha sonra onu kullanarak sınırlı sayıdaki ekipmanların, hayvanların ve bineklerin kilidini  aç, geçmişten ..._ ve gelecekten!"</string>
   <string name="want_to_subscribe">Abone olmak istiyorum</string>
   <string name="seasonal_closed_description">Büyük Galalar gündönümü ve ekinoks zamanlarına yakın gerçekleşirler, çeşit çeşit özel mevsimsel eşyalar bulmak için bu zamanlarda ziyaret et!</string>
   <string name="come_back_soon">Yakında yine gel!</string>
@@ -660,8 +530,7 @@
   <string name="authentication_summary">Doğrulama ayarlarını değiştir.</string>
   <string name="change_password">Şifreni Değiştir</string>
   <string name="change_email">E-Posta Adresini Değiştir</string>
-  <string name="change_login_name">Kullanıcı Adını Değiştir</string>
-  <string name="change_username">Kullanıcı Adını Değiştir</string>
+    <string name="change_username">Kullanıcı Adını Değiştir</string>
   <string name="change">Değiştir</string>
   <string name="character_level">Karakter Seviyesi</string>
   <string name="auto_allocate_points">Puanları Otomatik Dağıt</string>
@@ -682,7 +551,7 @@
   <string name="distribute_class">Sınıfına göre dağıt</string>
   <string name="distribute_task">İş aktivitesine göre dağıt</string>
   <string name="no_points_to_allocate">Dağıtılacak puan yok</string>
-  <string name="points_to_allocate" formatted="false">Dağıtılacak %d Puan Var</string>
+  <string name="points_to_allocate">Dağıtılacak %d Puan Var</string>
   <string name="distribute_evenly_help">Her özelliğe eşit miktarda puan dağıtır.</string>
   <string name="distribute_class_help">Sınıfına uygun özelliklere daha fazla puan dağıtır.</string>
   <string name="distribute_task_help">Tamamladığın işlere atanmış Güç, Zeka, Bünye ve Sezgi kategorilerine göre puanları dağıtır.</string>
@@ -692,9 +561,7 @@
   <string name="classless">Sınıfsız</string>
   <string name="class_equipment_shop_dialog">Bu eşya yalnızca belirli bir sınıf için geçerlidir.\nAyarlardan sınıfını değiştirebilirsin.</string>
   <string name="class_gear_disclaimer">Yalnızca şu anki sınıfın için olan ekipmanları satın alabilirsin</string>
-  <string name="available_stats" formatted="false">%d puan</string>
-  <string name="toogle_emojis">Emojileri Göster</string>
-  <string name="tavern_description">Hana hoş geldin! Sohbet etmek veya işlerine biraz ara vermek için bir sandalye çek.</string>
+    <string name="tavern_description">Hana hoş geldin! Sohbet etmek veya işlerine biraz ara vermek için bir sandalye çek.</string>
   <string name="check_into_inn">Han\'a Gir</string>
   <string name="community_guidelines">Topluluk Kuralları</string>
   <string name="view_community_guidelines">Topluluk Kuralları\'nı Gör</string>
@@ -708,19 +575,13 @@
   <string name="navigation_drawer_open">Navigasyon çekmecesini aç</string>
   <string name="navigation_drawer_close">Navigasyon çekmecesini kapat</string>
   <string name="world_boss">Dünya Canavarı</string>
-  <string name="world_boss_art">Canavar Görseli</string>
-  <string name="boss_art">Canavar Görseli</string>
+    <string name="boss_art">Canavar Görseli</string>
   <string name="world_boss_description">Dünya Canavarı Tanımı</string>
-  <string name="rage_strike_count" formatted="false">Öfke Saldırıları: %d/%d</string>
-  <string name="pending_strike_description">Bu Saldırı henüz gerçekleşmedi!\nDünya Canavarı öfke barı dolduğunda ayaklanıp cana yakın dükkan sahiplerimizden birine saldırır. Bunun gerçekleşmesini önlemek için Günlük İşlerini tamamlamaya devam et!</string>
-  <string name="pending_strike_title">Bekleyen Saldırı</string>
+  <string name="rage_strike_count">Öfke Saldırıları: %d/%d</string>
+    <string name="pending_strike_title">Bekleyen Saldırı</string>
   <string name="strike_description_title">Öfke Saldırısı nedir?</string>
-  <string name="strike_description_subtitle">3 tane potansiyel Öfke Saldırısı bulunuyor</string>
-  <string name="strike_description_description">Bu bar Habiticalılar Günlük İşlerini aksattıkça dolar. Eğer tamamen dolarsa, KalpKıran Kahredici Kalp Kırıklığı saldırısını Habitica\'nın dükkan sahiplerinden birine yöneltir, bu yüzden işlerini tamamladığından emin ol!</string>
-  <string name="pending_strike_subtitle">Bu Saldırı henüz gerçekleşmedi!</string>
-  <string name="strike_active_title" formatted="false">%s Saldırıya uğradı!</string>
-  <string name="strike_active_subtitle" formatted="false">%s artık Kalbi Kırık!</string>
-  <string name="strike_active_description" formatted="false">Çok sevdiğimiz %s hüsrana uğradı çünkü %s, %s ve çevresini paramparça etti. Çabuk, canavarı yenmek ve yeniden inşaya yardım etmek için işlerine sarıl!</string>
+    <string name="strike_active_title">%s Saldırıya uğradı!</string>
+    <string name="strike_active_description">Çok sevdiğimiz %s hüsrana uğradı çünkü %s, %s ve çevresini paramparça etti. Çabuk, canavarı yenmek ve yeniden inşaya yardım etmek için işlerine sarıl!</string>
   <string name="questShop">Görev Dükkanı</string>
   <string name="market_owner_long">Tüccar Alex</string>
   <string name="tavern_owner_long">Hancı Daniel</string>
@@ -730,29 +591,21 @@
   <string name="no_party_description">Arkadaşlarınla veya tek başına inanılmaz görevlere çık. Canavarlarla savaş, Mücadeleler yarat ve Takımlar sayesinde sorumluluk sahibi kal.</string>
   <string name="no_party_title">Habitica\'yı bir Takımla Oyna</string>
   <string name="join_party_description">Bir Takım üyesine aşağıdaki kullanıcı adını verirsen seni takımına davet edebilir</string>
-  <string name="join_party_description_id">Davet edilmek için Kullanıcı ID\'ni karşındakiyle paylaş veya QR kodunu tarat</string>
-  <string name="join_party_title">Bir takıma katılmak ister misin?</string>
-  <string name="create_party_website">Bir takım oluşturmak için web sitesini aç</string>
-  <string name="id_copied">ID panoya kopyalandı</string>
-  <string name="insufficientSubscriberGems">Bu ay satın alabileceğin bütün Elmasları satın aldın. Her ayın ilk üç gününde daha fazlası erişimine açılacaktır. Aboneliğin için teşekkür ederiz!</string>
-  <string name="insufficientSubscriberGemsTitle">Aylık Elmas Limitine Ulaşıldı</string>
-  <string name="chat_message">Sohbet Mesajı</string>
-  <string name="world_boss_description_title">Dünya Canavarı nedir?</string>
-  <string name="world_boss_description_description">Dünya Canavarı Habitica topluluğunu, işleriyle güçlü bir canavarı haklamak için bir araya getiren özel bir etkinliktir!\nCanavara hasar vermek için işlerini tamamla\nDünya Canavarı, aksattığın işlerin yüzünden sana hasar vermez ama Öfke barı yükselir. Eğer bar dolarsa, Canavar Habitica\'nın mağaza sahiplerinden birine saldırır!\nNormal Görev Canavarları ile devam edebilirsin, vereceğin hasar ikisine de etki eder\nDünya Canavarı ilerlemesini ve Öfke saldırılarını görmek için Tavernayı düzenli olarak kontrol et</string>
-  <string name="world_boss_description_intro">Dünya Canavarı Habitica topluluğunu, işleriyle güçlü bir canavarı haklamak için bir araya getiren özel bir etkinliktir!</string>
+    <string name="join_party_title">Bir takıma katılmak ister misin?</string>
+    <string name="insufficientSubscriberGems">Bu ay satın alabileceğin bütün Elmasları satın aldın. Her ayın ilk üç gününde daha fazlası erişimine açılacaktır. Aboneliğin için teşekkür ederiz!</string>
+    <string name="world_boss_description_title">Dünya Canavarı nedir?</string>
+    <string name="world_boss_description_intro">Dünya Canavarı Habitica topluluğunu, işleriyle güçlü bir canavarı haklamak için bir araya getiren özel bir etkinliktir!</string>
   <string name="world_boss_description_1">Canavara hasar vermek için işlerini tamamla</string>
   <string name="world_boss_description_2">Dünya Canavarı, aksattığın işlerin yüzünden sana hasar vermez ama Öfke barı yükselir. Eğer bar dolarsa, Canavar Habitica\'nın mağaza sahiplerinden birine saldırır!</string>
   <string name="world_boss_description_3">Normal Görev Canavarları ile devam edebilirsin, vereceğin hasar ikisine de etki eder</string>
   <string name="world_boss_description_4">Dünya Canavarı ilerlemesini ve Öfke saldırılarını görmek için Tavernayı düzenli olarak kontrol et</string>
-  <string name="world_boss_action_prompt" formatted="false">Özel ödüller kazanmak ve Habitica\'yı %s gazabından kurtarmak için Canavarı yen!</string>
-  <string name="world_boss_description_subtitle">%s saldırdı!</string>
-  <string name="questShop_owner_long">Görev Rehberi Ian</string>
+  <string name="world_boss_action_prompt">Özel ödüller kazanmak ve Habitica\'yı %s gazabından kurtarmak için Canavarı yen!</string>
+    <string name="questShop_owner_long">Görev Rehberi Ian</string>
   <string name="seasonalShop_owner_long">Mevsimsel Büyücü</string>
   <string name="rage_attack">Öfke saldırısı:</string>
   <string name="tavern_description_world_boss">Ah canım, aşağıdaki canavarı görmezden gel — burası hala molalarında sohbet etmen için güvenli bir bölge.</string>
   <string name="report">Bildir</string>
-  <string name="like">Beğen</string>
-  <string name="reply">Cevapla</string>
+    <string name="reply">Cevapla</string>
   <string name="challenge_prize">Mücadele Ödülü</string>
   <string name="challenge_categories">Mücadele Kategorileri</string>
   <string name="created_challenge">Mücadele Oluşturuldu</string>
@@ -786,17 +639,15 @@
   <string name="two_handed">Çift Elli</string>
   <string name="usernamePromptTitle">Kullanıcı adına karar verme vakti!</string>
   <string name="usernamePromptBody">Giriş isimleri artık görünen adının yanında görünecek ve davetiyelerde, sohbet @bahsetmelerinde ve mesajlaşmalarda kullanılacak eşsiz kullanıcı adlarına dönüştü.</string>
-  <string name="usernamePromptWiki">Eğer bu değişim hakkında daha fazla şey öğrenmek istiyorsan, <a href="https://habitica.wikia.com/wiki/Player_Names">wikimizi ziyaret et.</a></string>
-  <string name="confirmUsername">Kullanıcı adını onayla</string>
-  <string name="usernamePromptDisclaimer">Kullanıcı Adları <a href="https://habitica.com/static/terms">Hizmet Koşulları\'mıza</a> ve <a href="https://habitica.com/static/community-guidelines">Topluluk İlkeleri\'mize</a> uygun olmalıdır. Daha önce bir Giriş Adı belirlemediysen, Kullanıcı Adın otomatik olarak oluşturulmuştur.</string>
+  <string name="usernamePromptWiki">Eğer bu değişim hakkında daha fazla şey öğrenmek istiyorsan, <a href="https://habitica.wikia_com/wiki/Player_Names">wikimizi ziyaret et.</a></string>
+    <string name="usernamePromptDisclaimer">Kullanıcı Adları <a href="https://habitica.com/static/terms">Hizmet Koşulları\'mıza</a> ve <a href="https://habitica_com/static/community-guidelines">Topluluk İlkeleri\'mize</a> uygun olmalıdır. Daha önce bir Giriş Adı belirlemediysen, Kullanıcı Adın otomatik olarak oluşturulmuştur.</string>
   <string name="confirm_username_title">Geçerli kullanıcı adını onaylamak istediğine emin misin?</string>
   <string name="confirm_username_description">Kullanıcı adını onaylayarak onu davetlerde, sohbetlerde ve mesajlaşmalarda aleni hâle getiriyorsun. Kullanıcı adını istediğin her an ayarlardan değiştirebilirsin.</string>
   <string name="cancel">İptal </string>
   <string name="confirm_username">Kullanıcı adını onayla</string>
   <string name="username_not_confirmed">Kullanıcı adı onaylanmadı</string>
   <string name="username_confirmed">Kullanıcı Adı Onaylandı</string>
-  <string name="username_level">\@%s ・Svy %d</string>
-  <string name="enter_recipient_username">Alıcının @ kullanıcı adını Gir</string>
+    <string name="enter_recipient_username">Alıcının @ kullanıcı adını Gir</string>
   <string name="username_copied">Kullanıcı adı panoya kopyalandı</string>
   <string name="verification_pet">Onaylamayı tamamladığında Kıdemli Hayvanlardan biri seni bekliyor olacak!</string>
   <string name="welcomeNameTitle">Sana nasıl hitap edelim?</string>
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
new file mode 100755
index 000000000..da355aaa4
--- /dev/null
+++ b/Habitica/res/values-uk/strings.xml
@@ -0,0 +1,189 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Оновити</string>
+  <string name="XP_default">Досвід</string>
+  <string name="HP_default">Здоров’я</string>
+  <string name="MP_default">Мана</string>
+  <string name="ERR_pb_barcode">Налаштування не завантажуються зі штрих-коду</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Налаштування</string>
+  <string name="SP_address_hint">Ваш нестандартний сервер</string>
+  <string name="SP_userID_title">ID користувача</string>
+  <string name="SP_userID_summary">Ваш ID користувача</string>
+  <string name="SP_APIToken_title">Токен API </string>
+  <string name="SP_APIToken_summary">Ваш токен API </string>
+  <string name="Language_title">Мова</string>
+  <string name="Language_summary">Змінити мову Habitica</string>
+  <string name="SP_user_qr_code">Ваш QR-код</string>
+  <string name="PS_contact_title">Напишіть мені</string>
+  <string name="unknown_error">Сталася помилка</string>
+  <string name="pref_account_header">Акаунт</string>
+  <string name="pref_first_day_of_the_week_title">Перший день тижня</string>
+  <string name="pref_first_day_of_the_week_summary">Перший день тижня у всіх календарях</string>
+  <string name="pref_reminder_header">Щоденний нагадувач</string>
+  <string name="pref_reminder_checkbox">Активувати нагадувач</string>
+  <string name="pref_reminder_picker">Встановити час нагадувача</string>
+  <string name="pref_cds_header">Власний початок дня</string>
+  <string name="pref_cds_picker">Встановити власний початок дня</string>
+  <string name="pref_push_notifications_checkbox">Користувацькі примусові сповіщення</string>
+  <string name="push_notifications">Примусові сповіщення</string>
+  <string name="push_notifications_sum">Налаштуйте ваші примусові сповіщення</string>
+  <string name="preference_push_you_won_challenge">Ви перемогли у випробуванні!</string>
+  <string name="preference_push_received_a_private_message">Отримано приватне повідомлення</string>
+  <string name="preference_push_gifted_gems">Подаровані самоцвіти</string>
+  <string name="preference_push_gifted_subscription">Подарована підписка</string>
+  <string name="preference_push_invited_to_party">Запрошено до гурту</string>
+  <string name="preference_push_invited_to_guild">Запрошено до гільдії</string>
+  <string name="preference_push_your_quest_has_begun">Розпочався ваш квест</string>
+  <string name="preference_push_invited_to_quest">Запрошення до квесту</string>
+  <!--Adding tasks-->
+  <string name="task_value">Цінність</string>
+  <string name="new_todo">Нова задача</string>
+  <string name="new_reward">Нова нагорода</string>
+  <string name="new_daily">Нове щоденне</string>
+  <string name="new_habit">Нова звичка</string>
+  <string name="action_edit">Редагувати</string>
+  <string name="action_delete">Видалити</string>
+  <string name="action_cancel">Скасувати</string>
+  <string name="login_btn">Увійти</string>
+  <string name="register_btn">Зареєструватися</string>
+  <string name="username">Логін</string>
+  <string name="email_username">Ел. пошта або логін</string>
+  <string name="password">Пароль</string>
+  <string name="emailAddress">Адреса електронної пошти</string>
+  <string name="confirmpassword">Підтвердити пароль</string>
+  <string name="logout">Вийти</string>
+  <string name="logout_description">Вийти з вашого акаунта</string>
+  <string name="account_details">Відомості про акаунт</string>
+  <string name="LoginActivityName">Вітаємо</string>
+  <string name="string_revive">Відродити</string>
+  <string name="please_connect">Будь ласка, підключіться через застосунок перед використанням віджету.</string>
+  <string name="about.title">Про</string>
+  <string name="about.libraries">Бібліотеки</string>
+  <string name="about.versionhistory">Історія версій</string>
+  <string name="about.habitica_open_source">Habitica доступна як програмне забезпечення з відкритим кодом на Github</string>
+  <string name="about.rate_our_app">Оцініть наш застосунок</string>
+  <string name="about.give_us_feedback">Надішліть нам відгук!</string>
+  <string name="about.bugreport">Повідомте про баґ</string>
+  <string name="about.source_code">Код</string>
+  <string name="repeatEvery">Повторювати кожні</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Помилка підключення</string>
+  <string name="network_error_no_network_body">Ви не підключені до Інтернету.</string>
+  <string name="internal_error_api">Схоже, є проблема на сервері. Спробуйте знову пізніше.</string>
+  <string name="authentication_error_title">Помилка автентифікації</string>
+  <string name="authentication_error_body">Ваш логін і/або пароль неправильні.</string>
+  <string name="login_validation_error_title">Помилка перевірки</string>
+  <string name="login_validation_error_fieldsmissing">Вам слід заповнити усі поля.</string>
+  <string name="save_changes">Зберегти</string>
+  <string name="copy">Копіювати</string>
+  <string name="notes">Нотатки</string>
+  <string name="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="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="repeatables_summary_title">Підсумок</string>
+  <string name="repeatables_title">Повтори</string>
+  <string name="repeatables_on_title">Повтори по</string>
+  <string name="repeatables_frequency_daily">Щоденно</string>
+  <string name="repeatables_frequency_weekly">Щотижня</string>
+  <string name="repeatables_frequency_monthly">Щомісяця</string>
+  <string name="repeatables_frequency_yearly">Щороку</string>
+  <string name="repeatables_frequency_day_of_month">День місяця</string>
+  <string name="repeatables_frequency_day_of_week">День тижня</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_button">Ура!</string>
+  <string name="faint_subtitle">Не впадайте у відчай!</string>
+  <string name="faint_header">У вас закінчилося здоров’я!</string>
+  <string name="faint_button">Поповнити здоров’я і спробувати знову</string>
+  <string name="filter">Фільтр</string>
+  <string name="profile_image">Зображення профілю</string>
+  <string name="mana_price_button">%d мани</string>
+  <string name="used_skill">Ви використали %1$s мани з %2$d.</string>
+  <string name="used_skill_without_mana">Ви використали %1$s.</string>
+  <string name="new_checklist_item">нове підзавдання</string>
+  <string name="add_checklist_item">Додати</string>
+  <string name="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="tavern.inn.checkOut">Відновити щоденні</string>
+  <string name="tavern.inn.rest">Призупинити щоденні</string>
+  <string name="reward.dialog.buy">Купити</string>
+  <string name="reward.dialog.dismiss">Відхили</string>
+  <string name="party">Гурт</string>
+  <string name="chat">Чат</string>
+  <string name="members">Учасники</string>
+  <string name="habits">Звички</string>
+  <string name="dailies">Щоденні</string>
+  <string name="todos">Задачі</string>
+  <string name="rewards">Нагороди</string>
+  <string name="taskform.delete.title">Ви впевнені?</string>
+  <string name="taskform.delete.message">Ви дійсно хочете видалити?</string>
+  <string name="yes">Так</string>
+  <string name="no">Ні</string>
+  <string name="quest">Квест</string>
+  <string name="avatar_body">Тіло</string>
+  <string name="avatar_hair">Волосся</string>
+  <string name="avatar_shirt">Сорочка</string>
+  <string name="avatar_skin">Шкіра</string>
+  <string name="avatar_ears">Тваринні вуха</string>
+  <string name="avatar_base">Основа</string>
+  <string name="avatar_color">Колір</string>
+  <string name="avatar_beard">Борода</string>
+  <string name="avatar_mustache">Вуса</string>
+  <string name="avatar_flower">Квітка</string>
+  <string name="avatar_bangs">Хвостик</string>
+  <string name="avatar_nothing">Нічого не встановлено</string>
+  <string name="avatar_size">Розмір</string>
+  <string name="avatar_size_slim">Худий</string>
+  <string name="avatar_size_broad">Повний</string>
+  <string name="avatar_background">Тло</string>
+  <string name="purchase_customization">Прибрати пристосування</string>
+  <string name="purchase_set_button">Розблокувати набір за %d самоцвітів</string>
+  <string name="purchase_button">Придбати</string>
+  <string name="purchase_set_title">Придбати набір %s</string>
+  <string name="due_date">Термін виконання</string>
+  <string name="quest.accept">Прийняти</string>
+  <string name="quest.reject">Відхилити</string>
+  <string name="quest.begin">Почати квест</string>
+  <string name="quest.cancel">Скасувати запрошення</string>
+  <string name="quest.abort">Скасувати квест</string>
+  <string name="quest.leave">Залишити квест</string>
+  <string name="quest.pending">У черзі</string>
+  <string name="quest.accepted">Прийнято</string>
+  <string name="quest.rejected">Відхилено</string>
+  <string name="quest.participants">Учасники</string>
+  <string name="version_info">Версія %1$s (%2$d)</string>
+  <string name="sidebar_help">Допомога і ЧаПи</string>
+  <string name="complete_tutorial">Зрозуміло!</string>
+  <string name="dismiss_tutorial">Нагадати пізніше</string>
+  <string name="intro_1_subtitle">Вітаємо у </string>
+  <string name="intro_1_title">Habitica</string>
+  <!--QR Strings-->
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml
new file mode 100755
index 000000000..38011ba93
--- /dev/null
+++ b/Habitica/res/values-vi/strings.xml
@@ -0,0 +1,239 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Tải lại</string>
+  <string name="XP_default">Điểm Kinh Nghiệm</string>
+  <string name="HP_default">Máu</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Không thể tải Prefs từ mã vạch</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Cài Đặt</string>
+  <string name="SP_address_hint">Server Tự Tạo Của Bạn</string>
+  <string name="SP_userID_title">ID Người Chơi</string>
+  <string name="SP_userID_summary">ID Người Chơi Của Bạn</string>
+  <string name="SP_APIToken_title">Mã API</string>
+  <string name="SP_APIToken_summary">Mã API Của Bạn</string>
+  <string name="Language_title">Ngôn Ngữ</string>
+  <string name="Language_summary">Thay Đổi Ngôn Ngữ Của Habitica</string>
+  <string name="SP_user_qr_code">Mã QR Của Bạn</string>
+  <string name="PS_contact_title">Liên hệ tôi</string>
+  <string name="unknown_error">Đã xảy ra lỗi...</string>
+  <string name="pref_account_header">Tài Khoản</string>
+  <string name="pref_first_day_of_the_week_title">Ngày Đầu Tiên trong Tuần</string>
+  <string name="pref_first_day_of_the_week_summary">Ngày đầu tiên trong tuần trên tất cả các lịch</string>
+  <string name="pref_reminder_header">Nhắc Nhở Hằng Ngày</string>
+  <string name="pref_reminder_checkbox">Kích hoạt tính năng Nhắc Nhở</string>
+  <string name="pref_reminder_picker">Cài giờ Nhắc Nhở</string>
+  <string name="pref_cds_header">Tùy chỉnh ngày bắt đầu</string>
+  <string name="pref_cds_picker">Đặt thời gian ngày tùy chỉnh bắt đầu</string>
+  <string name="pref_push_notifications_checkbox">Thông báo đẩy cho người dùng </string>
+  <string name="push_notifications">Thông báo đẩy</string>
+  <string name="push_notifications_sum">Cài đặt thông báo đẩy</string>
+  <string name="preference_push_you_won_challenge">Bạn đã thắng một Thử Thách!</string>
+  <string name="preference_push_received_a_private_message">Đã nhận một Tin Nhắn Riêng</string>
+  <string name="preference_push_gifted_gems">Gem tặng</string>
+  <string name="preference_push_gifted_subscription">Đăng kí quà tặng</string>
+  <string name="preference_push_invited_to_party">Đã mời vào Party</string>
+  <string name="preference_push_invited_to_guild">Đã mời vào Guild</string>
+  <string name="preference_push_your_quest_has_begun">Quest của bạn đã Bắt đầu</string>
+  <string name="preference_push_invited_to_quest">Đã mời tham gia Quest</string>
+  <!--Adding tasks-->
+  <string name="task_value">Giá trị</string>
+  <string name="new_todo">Việc Cần Làm mới</string>
+  <string name="new_reward">Phần Thưởng mới</string>
+  <string name="new_daily">Công Việc Hằng Ngày mới</string>
+  <string name="new_habit">Thói Quen mới</string>
+  <string name="action_edit">Chỉnh sửa</string>
+  <string name="action_delete">Xóa</string>
+  <string name="action_cancel">Hủy</string>
+  <string name="login_btn">Đăng nhập</string>
+  <string name="register_btn">Đăng ký</string>
+  <string name="username">Tên tài khoản</string>
+  <string name="email_username">Email hoặc Tên tài khoản</string>
+  <string name="password">Mật khẩu</string>
+  <string name="emailAddress">Địa chỉ email</string>
+  <string name="confirmpassword">Xác nhận mật khẩu</string>
+  <string name="logout">Đăng xuất</string>
+  <string name="logout_description">Thoát tài khoản của bạn</string>
+  <string name="account_details">Chi tiết Tài khoản</string>
+  <string name="LoginActivityName">Chào Mừng</string>
+  <string name="string_revive">Hồi sinh</string>
+  <string name="about.title">Về chúng tôi</string>
+  <string name="about.libraries">Thư viện</string>
+  <string name="about.versionhistory">Lịch sử phiên bản</string>
+  <string name="about.habitica_open_source">Habitica là một phần mềm mã nguồn mở trên Github</string>
+  <string name="about.rate_our_app">Đánh giá Ứng dụng của chúng tôi</string>
+  <string name="about.give_us_feedback">Phản hồi cho chúng tôi!</string>
+  <string name="about.bugreport">Báo lỗi</string>
+  <string name="about.source_code">Mã Nguồn</string>
+  <string name="repeatEvery">Lặp lại mỗi</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Lỗi Kết nối</string>
+  <string name="network_error_no_network_body">Không có kết nối Internet</string>
+  <string name="internal_error_api">Dường như có vấn đề với máy chủ. Vui lòng quay lại sau.</string>
+  <string name="authentication_error_title">Lỗi Ủy quyền</string>
+  <string name="authentication_error_body">Sai Tên tài khoản và/hoặc Mật khẩu.</string>
+  <string name="login_validation_error_title">Lỗi xác thực</string>
+  <string name="save_changes">Lưu</string>
+  <string name="copy">Copy</string>
+  <string name="notes">Ghi chú</string>
+  <string name="text">Văn bản</string>
+  <string name="difficulty">Độ khó</string>
+  <string name="tags">Thẻ/Nhãn</string>
+  <string name="trivial">Không đáng kể</string>
+  <string name="easy">Dễ</string>
+  <string name="medium">Trung bình</string>
+  <string name="hard">Khó</string>
+  <string name="start_date">Ngày bắt đầu</string>
+  <string name="positive_habit_form">Tích cực ( + )</string>
+  <string name="negative_habit_form">Tiêu cực ( - )</string>
+  <string name="checklist">Danh mục</string>
+  <string name="reminders">Nhắc nhở</string>
+  <string name="actions">Hành động</string>
+  <string name="attributes">Thuộc tính</string>
+  <string name="physical">STR</string>
+  <string name="mental">INT</string>
+  <string name="social">CON</string>
+  <string name="other">PER</string>
+  <string name="frequency">Tần suất</string>
+  <string name="frequency_weekly">Vào những Ngày cụ thể trong Tuần</string>
+  <string name="frequency_daily">Mỗi X ngày</string>
+  <string name="repeatables_summary_title">Tóm lại</string>
+  <string name="repeatables_title">Lặp lại</string>
+  <string name="repeatables_on_title">Lặp lại vào</string>
+  <string name="repeatables_frequency_daily">Mỗi ngày</string>
+  <string name="repeatables_frequency_weekly">Mỗi tuần</string>
+  <string name="repeatables_frequency_monthly">Mỗi tháng</string>
+  <string name="repeatables_frequency_yearly">Mỗi năm</string>
+  <string name="repeatables_frequency_day_of_month">Ngày của Tháng</string>
+  <string name="repeatables_frequency_day_of_week">Ngày của Tuần</string>
+  <string name="monday">Thứ 2</string>
+  <string name="tuesday">Thứ 3</string>
+  <string name="wednesday">Thứ 4</string>
+  <string name="thursday">Thứ 5</string>
+  <string name="friday">Thứ 6</string>
+  <string name="saturday">Thứ 7</string>
+  <string name="sunday">Chủ nhật</string>
+  <string name="levelup_button">Hoan hô!</string>
+  <string name="faint_subtitle">Đừng tuyệt vọng!</string>
+  <string name="faint_header">Bạn đã hết Máu</string>
+  <string name="faint_button">Hồi máu &amp; Thử Lại</string>
+  <string name="filter">Màng lọc</string>
+  <string name="profile_image">Hình đại diện</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Bạn dùng %1$s tốn %2$d mana.</string>
+  <string name="used_skill_without_mana">Bạn dùng %1$s.</string>
+  <string name="new_checklist_item">mục mới trong danh mục</string>
+  <string name="add_checklist_item">Thêm</string>
+  <string name="skill_progress_title">Sử dụng Kĩ Năng</string>
+  <string name="coming_soon">Sắp có mặt</string>
+  <string name="chat_flag_confirmation">Bạn có chắc tin nhắn này vi phạm nội quy không?</string>
+  <string name="flag_confirm">Gắn Cờ </string>
+  <string name="unlock_lvl_11">Mở khóa ở Cấp 11</string>
+  <string name="no_party_message">Bạn không ở trong nhóm nào cả. Để tham gia một nhóm, vui lòng ghé thăm trang web.</string>
+  <string name="forgot_pw_btn">Quên Mật khẩu</string>
+  <string name="tavern.inn.checkOut">Tái kích hoạt Công Việc Hằng Ngày</string>
+  <string name="tavern.inn.rest">Tạm dừng Công Việc Hằng Ngày</string>
+  <string name="reward.dialog.buy">Mua</string>
+  <string name="reward.dialog.dismiss">Giải tán</string>
+  <string name="party">Party</string>
+  <string name="chat">Chat</string>
+  <string name="members">Thành viên</string>
+  <string name="habits">Thói Quen</string>
+  <string name="dailies"> Công Việc Hằng Ngày</string>
+  <string name="todos">Việc Cần Làm</string>
+  <string name="rewards">Phần Thưởng</string>
+  <string name="taskform.delete.title">Bạn chắc chứ?</string>
+  <string name="taskform.delete.message">Bạn có chắc là muốn xóa không?</string>
+  <string name="yes">Có</string>
+  <string name="no">Không</string>
+  <string name="quest">Quest</string>
+  <string name="avatar_body">Thân</string>
+  <string name="avatar_hair">Tóc</string>
+  <string name="avatar_shirt">Áo</string>
+  <string name="avatar_skin">Skin</string>
+  <string name="avatar_ears">Tai Động vật</string>
+  <string name="avatar_base">Thân cơ thể</string>
+  <string name="avatar_color">Màu da</string>
+  <string name="avatar_beard">Râu</string>
+  <string name="avatar_mustache">Ria</string>
+  <string name="avatar_flower">Hoa gắn đầu</string>
+  <string name="avatar_bangs">Kiểu tóc</string>
+  <string name="avatar_size">Kích cỡ</string>
+  <string name="avatar_size_slim">Mảnh mai</string>
+  <string name="avatar_size_broad">Cơ bắp</string>
+  <string name="avatar_background">Phông nền</string>
+  <string name="purchase_set_button">Mở khóa set với %d Đá Quý </string>
+  <string name="purchase_button">Mua</string>
+  <string name="purchase_set_title">Mua set %s</string>
+  <string name="quest.accept">Chấp nhận</string>
+  <string name="quest.reject">Từ chối</string>
+  <string name="quest.begin">Bắt đầu Quest</string>
+  <string name="quest.cancel">Hủy lời mời</string>
+  <string name="quest.abort">Hủy Quest</string>
+  <string name="quest.leave">Rời Quest</string>
+  <string name="quest.pending">Đang chờ</string>
+  <string name="quest.accepted">Đã chấp nhận</string>
+  <string name="quest.rejected">Đã từ chối</string>
+  <string name="quest.participants">Người tham gia</string>
+  <string name="version_info">Phiên bản %1$s (%2$d)</string>
+  <string name="sidebar_help">Help &amp; FAQ</string>
+  <string name="complete_tutorial">Đã hiểu!</string>
+  <string name="dismiss_tutorial">Nhắc tôi lại lần nữa</string>
+  <string name="intro_1_subtitle">Chào mừng đến</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Giờ là lúc có được niềm vui khi hoàn thành công việc. Tham gia với %s người khác đang cải thiện cuộc sống của họ với một nhiệm vụ mỗi lần</string>
+  <string name="intro_2_subtitle">Tiến trình trong trò chơi</string>
+  <string name="intro_2_title">Tiến trình ngoài đời thực</string>
+  <string name="intro_3_subtitle">Chiến đấu quái vật</string>
+  <string name="intro_finish_button">Bắt đầu nào!</string>
+  <string name="setup_welcome_description">Chào mừng tới Habitica, nơi mà tiến bộ trong game sẽ cải thiện cuộc sống thực! Khi bạn hoàn thành mục tiêu đời thực, bạn sẽ mở khóa Trang bị, Thú cưng, Nhiệm vụ, và nhiều hơn thế nữa.</string>
+  <string name="setup_group_work">Việc làm</string>
+  <string name="setup_group_exercise">Thể dục</string>
+  <string name="setup_group_health">Sức khỏe</string>
+  <string name="setup_group_school">Học tập</string>
+  <string name="setup_group_teams">Nhóm</string>
+  <string name="setup_group_chores">Việc nhà</string>
+  <string name="setup_group_creativity">Sáng tạo</string>
+  <string name="setup_task_work_1">Xử lí email</string>
+  <string name="setup_task_work_2">Công việc quan trọng nhất</string>
+  <string name="setup_task_exercise_1">Tập thể dục 10 phút</string>
+  <string name="setup_task_healthWellness_1">Ăn lành mạnh / Ăn vặt</string>
+  <string name="setup_task_school_1">Học tập / Trì hoãn</string>
+  <string name="setup_task_school_2">Làm bài tập</string>
+  <string name="setup_task_school_3">Hoàn thành bài tập về nhà của lớp</string>
+  <string name="setup_task_chores_1">Dọn dẹp 10 phút</string>
+  <string name="setup_task_chores_2">Rửa bát </string>
+  <string name="setup_task_chores_3">Xếp quần áo</string>
+  <string name="guild">Guild</string>
+  <string name="leave">Rời</string>
+  <string name="join">Tham gia</string>
+  <string name="leader">Người đứng đầu</string>
+  <string name="gems">Đá Quý</string>
+  <string name="send_pm">Gửi Tin nhắn riêng</string>
+  <string name="flag">Gắn cờ</string>
+  <string name="delete">Xóa</string>
+  <string name="name">Tên</string>
+  <string name="description">Mô tả</string>
+  <string name="privacy">Riêng tư</string>
+  <string name="write_message">Viết tin nhắn</string>
+  <string name="guild_search_hint">Tìm Guild</string>
+  <string name="battle_gear">Trang bị Chiến đấu</string>
+  <string name="today">Hôm nay</string>
+  <string name="sidebar_items">Vật phẩm</string>
+  <string name="eggs">Trứng </string>
+  <string name="hatching_potions">Thuốc Ấp Trứng</string>
+  <string name="food">Thức ăn</string>
+  <string name="quests">Quest</string>
+  <string name="pets">Thú cưng</string>
+  <string name="mounts">Thú cưỡi</string>
+  <string name="sell">Bán (%d vàng)</string>
+  <string name="hatch_with_potion">Ấp bằng Thuốc</string>
+  <string name="feed_to_pet">Cho thú cưng ăn</string>
+  <string name="hatch_egg">Ấp bằng trứng</string>
+  <string name="dialog_feeding">Cho %2$s %1$s ăn:</string>
+  <string name="feed">Cho ăn</string>
+  <string name="hatch_with">Ấp bằng %s</string>
+  <string name="hatched_pet_title">Bạn đã ấp một con %2$s %1$s!</string>
+  <!--QR Strings-->
+  <!--Login Incentives-->
+</resources>
diff --git a/Habitica/res/values-w360dp/styles.xml b/Habitica/res/values-w360dp/styles.xml
index e19efefad..a6b3daec9 100644
--- a/Habitica/res/values-w360dp/styles.xml
+++ b/Habitica/res/values-w360dp/styles.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AlertDialogContainer">
-        <item name="android:layout_width">300dp</item>
-    </style>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh-rTW/strings.profile.xml b/Habitica/res/values-zh-rTW/strings.profile.xml
index 922f98cdb..615efe2db 100644
--- a/Habitica/res/values-zh-rTW/strings.profile.xml
+++ b/Habitica/res/values-zh-rTW/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">等級：</string>
     <string name="profile_class_bonus">加成獎勵：</string>
     <string name="profile_allocated">已分配：</string>
-    <string name="profile_boosts">增益：</string>
     <string name="profile_private_message">私人訊息</string>
     <string name="profile_achievements">成就</string>
-    <string name="profile_achievement_ok">了解 </string>
-    <string name="profile_qrcode_close">關閉</string>
 
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.sidebar.xml b/Habitica/res/values-zh-rTW/strings.sidebar.xml
index 950a2ce6e..8f8202249 100644
--- a/Habitica/res/values-zh-rTW/strings.sidebar.xml
+++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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_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_about">關於</string>
   <string name="sidebar_shops">商店</string>
   <string name="sidebar_stats">統計</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.tutorial.xml b/Habitica/res/values-zh-rTW/strings.tutorial.xml
index 292f6b012..9c6dfc61c 100644
--- a/Habitica/res/values-zh-rTW/strings.tutorial.xml
+++ b/Habitica/res/values-zh-rTW/strings.tutorial.xml
@@ -1,23 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_overview">來吧！我已經根據你的興趣給你添加了幾個任務。也試試自己添加幾個吧！你還可以點擊任務標題來修改它們。</string>
+  <string name="tutorial_overview">我們在這兒！我已經根據你的興趣給你添加了幾個任務~也試試自己添加幾個吧！你還可以點擊任務標題來修改它們。</string>
   <string name="tutorial_habits_1">首先是習慣。它們可以是你想養成的好習慣，也可以是你想戒掉的壞習慣。</string>
-  <string name="tutorial_habits_2">每當你完成一次好習慣，點擊習慣前的 +，就可以獲得經驗和金幣啦！</string>
-  <string name="tutorial_habits_3">如果你一不留神完成了一次壞習慣，點擊 -，這會減少角色的生命值來幫助你戒掉壞習慣。</string>
+  <string name="tutorial_habits_2">每當你完成一次好的習慣，點擊習慣前的加號，就可以獲得經驗和金幣啦！</string>
+  <string name="tutorial_habits_3">如果你一不留神完成了一次壞習慣，點擊減號，這會減少角色的生命值來幫助你戒掉壞習慣。</string>
   <string name="tutorial_habits_4">試試看吧！你可以在下方導航列中發掘更多任務類型。</string>
   <string name="tutorial_dailies_1">有一定規律的、或是時間緊迫的任務，可以將其新增至每日任務。</string>
-  <string name="tutorial_dailies_2">小心——如果你沒有完成，你的角色會在過夜後受到傷害。而經常記得完成並勾選它們能帶來豐厚獎勵！</string>
+  <string name="tutorial_dailies_2">小心 - 如果你沒有完成，你的角色會在一夜之間受到傷害！</string>
   <string name="tutorial_todos_1">待辦事項是只需要執行一次的任務。</string>
   <string name="tutorial_todos_2">如果您的待辦事項必須在特定時間內完成，請設置截止日期！</string>
   <string name="tutorial_rewards_1">用金幣為你的角色添購裝備吧！</string>
-  <string name="tutorial_rewards_2">你也可以自訂獎勵。</string>
-  <string name="tutorial_tasks_complete">目前為止就這樣了。如果您想了解更多，請查看 FAQ 部分。</string>
-  <string name="tutorial_equipment">在你購買裝備後會在這裡顯示。你的裝備會影響你的屬性，你的服裝 (若有啟用這項功能) 會另外在你的角色上顯示。</string>
-  <string name="tutorial_items">通過升級和完成任務獲得物品。點擊一個物品來使用！</string>
-  <string name="tutorial_pets">完成現實任務後，隨機掉落寵物蛋和藥水。將藥水灑在寵物蛋上孵化寵物</string>
-  <string name="tutorial_skills">技能是有強大作用的特殊能力！點擊技能使用。使用技能需要消耗魔力值 (藍色條)，魔力值可由每日打卡和完成現實任務來獲得。更多資訊請查詢 FAQ！</string>
-  <string name="tutorial_party">在這裡，你和你的朋友可以互相激勵完成目標，並藉由完成任務組團打怪！</string>
-  <string name="tutorial_tavern">歡迎來到酒館，這裡是一個公開的不分年齡的聊天室！這裡，可以聊聊心得，問問疑惑。祝您玩的愉快！</string>
-  <string name="tutorial_classes">選擇成為戰士、法師、補師或者盜賊！每個職業有獨特的裝備和技能。點擊 (\?) 查看更多！</string>
-  <string name="tutorial_stats">按灰色的按鈕可以把所有的能力點用於一次升級某項能力，或是按箭頭以個別分配能力點。</string>
+  <string name="tutorial_rewards_2">你也可以自定義獎勵。</string>
+  <string name="tutorial_tasks_complete">目前為止就這樣了。如果您想了解更多，請查看FAQ部分。</string>
+    <string name="tutorial_skills">技能是有強大作用的特殊能力！點擊技能使用。使用技能需要消耗魔法值(藍色條)，魔力可由每日打卡和完成現實任務來獲得。更多信息請查詢FAQ！</string>
+  <string name="tutorial_party">在這裡，你和你的朋友可以互相激勵完成目標並通過完成任務組團打BOSS！</string>
+  <string name="tutorial_tavern">歡迎來到酒館，這裡是一個公開的不分年齡的聊天室！這裡，可以聊聊心得，問問問題。祝您玩的愉快！</string>
+    <string name="tutorial_stats">按灰色的按鈕可以把所有的能力點用於一次升級某項能力，或是按箭頭以批次分配能力點。</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 912d41d2a..47f68118d 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -3,109 +3,78 @@
   <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="MP_default">魔法值</string>
+    <!--Prefs-->
   <string name="PS_settings_title">設定</string>
-  <string name="SP_address_hint">你的自訂伺服器</string>
-  <string name="SP_userID_title">使用者 ID (UUID)</string>
+    <string name="SP_userID_title">使用者 ID (UUID)</string>
   <string name="SP_userID_summary">你的使用者 ID (UUID)</string>
-  <string name="SP_APIToken_title">API token</string>
-  <string name="SP_APIToken_summary">你的 API token</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="PS_contact_title">聯絡我</string>
+    <string name="pref_account_header">帳號</string>
+  <string name="pref_first_day_of_the_week_title">每周的第一天</string>
+  <string name="pref_first_day_of_the_week_summary">毎周的第一天</string>
   <string name="pref_reminder_header">每日任務提醒</string>
   <string name="pref_reminder_checkbox">啟用提醒</string>
   <string name="pref_reminder_picker">設置提醒時間</string>
-  <string name="pref_cds_header">自訂開始時間</string>
-  <string name="pref_cds_picker">設置自訂開始時間</string>
-  <string name="pref_push_notifications_checkbox">使用者推送通知</string>
+  <string name="pref_cds_header">自定開始時間</string>
+    <string name="pref_push_notifications_checkbox">開啟推送通知</string>
   <string name="push_notifications">推送通知</string>
-  <string name="push_notifications_sum">設定你的推送通知</string>
-  <string name="preference_push_you_won_challenge">你完成了一項挑戰！</string>
-  <string name="preference_push_received_a_private_message">你收到一則私訊</string>
-  <string name="preference_push_gifted_gems">贈送的鑽石</string>
+  <string name="push_notifications_sum">設定你的推送通知設置</string>
+  <string name="preference_push_you_won_challenge">你贏得了一個挑戰！</string>
+  <string name="preference_push_received_a_private_message">你收到一則私人訊息</string>
+  <string name="preference_push_gifted_gems">贈送的寶石</string>
   <string name="preference_push_gifted_subscription">贈送的訂閱</string>
   <string name="preference_push_invited_to_party">你受邀加入隊伍</string>
-  <string name="preference_push_invited_to_guild">你受邀加入公會</string>
+  <string name="preference_push_invited_to_guild">你受邀請到公會</string>
   <string name="preference_push_your_quest_has_begun">你的副本開始了</string>
-  <string name="preference_push_invited_to_quest">你受邀參加副本</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="action_edit">編輯</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="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">Habitica 是一個發佈在 GitHub 上的開放原始碼軟體</string>
-  <string name="about.rate_our_app">評價我們的應用程式</string>
-  <string name="about.give_us_feedback">請提交給我們建議！</string>
-  <string name="about.bugreport">回報問題與漏洞</string>
-  <string name="about.source_code">原始程式碼</string>
-  <string name="repeatEvery">每...重複</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="LoginActivityName">歡迎</string>
+    <string name="about_title">關於</string>
+  <string name="about_libraries">資源庫</string>
+    <string name="about_habitica_open_source">Habitica 是一個發佈在 Github 上的開源軟體</string>
+  <string name="about_rate_our_app">評價我們的應用程式</string>
+  <string name="about_give_us_feedback">請給我們提交建議！</string>
+  <string name="about_bugreport">回報問題與漏洞</string>
+  <string name="about_source_code">原始程式碼</string>
+    <!--Network Errors-->
+    <string name="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_title">驗證錯誤</string>
   <string name="login_validation_error_fieldsmissing">請填寫所有內容。</string>
   <string name="save_changes">儲存</string>
   <string name="copy">複製</string>
-  <string name="notes">筆記</string>
-  <string name="text">文字</string>
-  <string name="difficulty">難度</string>
+  <string name="notes">注釋</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="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="repeatables_summary_title">概要</string>
-  <string name="repeatables_title">設定週期</string>
-  <string name="repeatables_on_title">開啟重複</string>
-  <string name="repeatables_frequency_daily">每日</string>
-  <string name="repeatables_frequency_weekly">每週</string>
-  <string name="repeatables_frequency_monthly">每月</string>
-  <string name="repeatables_frequency_yearly">每年</string>
+    <string name="attributes">屬性</string>
+    <string name="repeatables_frequency_daily">每日任務</string>
+  <string name="repeatables_frequency_weekly">每週任務</string>
+  <string name="repeatables_frequency_monthly">每月任務</string>
+  <string name="repeatables_frequency_yearly">每年任務</string>
   <string name="repeatables_frequency_day_of_month">一個月中的一天</string>
   <string name="repeatables_frequency_day_of_week">一週中的一天</string>
   <string name="monday">一</string>
@@ -115,28 +84,19 @@
   <string name="friday">五</string>
   <string name="saturday">六</string>
   <string name="sunday">日</string>
-  <string name="onwards">向前邁進！</string>
+  <string name="onwards">吼啊~！</string>
   <string name="faint_subtitle">別失望！</string>
   <string name="faint_header">你的生命值已經見底！</string>
   <string name="faint_button">補滿生命值並再重試</string>
   <string name="filter">篩選</string>
-  <string name="profile_image">頭像</string>
-  <string name="mana_price_button">%d 魔力值</string>
-  <string name="used_skill">你在 %1$s 用了 %2$d 魔力值。</string>
-  <string name="used_skill_without_mana">你使用了 %1$s。</string>
-  <string name="new_checklist_item">新增清單項目</string>
-  <string name="add_checklist_item">添加</string>
-  <string name="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="tavern.inn.checkOut">重啟每日任務</string>
-  <string name="tavern.inn.rest">暫停每日任務</string>
-  <string name="reward.dialog.buy">購買</string>
-  <string name="reward.dialog.dismiss">取消</string>
+    <string name="used_skill_without_mana">你使用了 %1$s。</string>
+  <string name="new_checklist_item">新增清單內容</string>
+    <string name="unlock_lvl_11">11 級時解鎖</string>
+    <string name="forgot_pw_btn">忘記密碼</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>
@@ -144,49 +104,39 @@
   <string name="dailies">每日任務</string>
   <string name="todos">待辦事項</string>
   <string name="rewards">獎勵</string>
-  <string name="taskform.delete.title">你確定嗎？</string>
-  <string name="taskform.delete.message">你確定要刪除嗎？</string>
-  <string name="yes">是的</string>
+    <string name="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_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_flower">花</string>
   <string name="avatar_bangs">瀏海</string>
-  <string name="avatar_nothing">沒有設置</string>
-  <string name="avatar_size">尺寸</string>
+    <string name="avatar_size">尺寸</string>
   <string name="avatar_size_slim">瘦小</string>
   <string name="avatar_size_broad">強壯</string>
   <string name="avatar_background">背景</string>
-  <string name="purchase_customization">用戶購買</string>
-  <string name="purchase_set_button">用 %d 鑽石解鎖</string>
+  <string name="purchase_customization">用戶支付</string>
+  <string name="purchase_set_button">用 %d 寶石解鎖</string>
   <string name="purchase_button">購買</string>
-  <string name="purchase_set_title">購買套組 %s</string>
+  <string name="purchase_set_title">購買禮包 %s</string>
   <string name="due_date">截止日期</string>
-  <string name="quest.accept">接受</string>
-  <string name="quest.reject">拒絕</string>
-  <string name="quest.begin">開始執行副本</string>
-  <string name="quest.cancel">取消邀請</string>
-  <string name="quest.abort">放棄副本</string>
-  <string name="quest.leave">放棄副本</string>
-  <string name="quest.pending">等待中</string>
-  <string name="quest.accepted">已接受</string>
-  <string name="quest.rejected">已拒絕</string>
-  <string name="quest.participants">參與者</string>
-  <string name="version_info">版本 %1$s (%2$d)</string>
+  <string name="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="version_info">版本 %1$s (%2$d)</string>
   <string name="sidebar_help">幫助 &amp; 常見問題</string>
   <string name="complete_tutorial">瞭解！</string>
   <string name="dismiss_tutorial">再次提醒我</string>
   <string name="intro_1_subtitle">歡迎來到</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">和 %s 玩家一起用遊戲戰勝拖延症！你可以創建一個帳號，用它來追蹤你生活中的點滴瑣事。</string>
+    <string name="intro_1_description">和 %s 玩家一起用遊戲戰勝拖延症！你可以創建一個帳戶，用它來追蹤你生活中的點滴瑣事。</string>
   <string name="intro_2_subtitle">遊戲進度</string>
   <string name="intro_2_title">生活進度</string>
   <string name="intro_2_description">通過完成現實生活中的任務來解鎖遊戲內容。得到裝備、寵物和更多的獎勵來促使你完成目標。</string>
@@ -194,13 +144,12 @@
   <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="next_button">下一頁</string>
   <string name="skip_button">跳過</string>
-  <string name="setup_welcome_description">歡迎來到 Habitica，在遊戲中打怪升級的同時改善自己的現實生活。完成現實中的生活目標，解鎖大量裝備、寵物、副本，更多特色等你探索。</string>
-  <string name="setup_welcome_title">歡迎</string>
-  <string name="avatar_setup_description">那麼，你想擁有如何的外觀？不用太過顧慮，之後仍然能夠更改。</string>
-  <string name="task_setup_description">太棒了！現在開始設定你的任務，開始賺取經驗和金幣吧。首先，你想改善生活中的哪一部分呢？</string>
+    <string name="avatar_setup_description">那麼，你想擁有如何的外觀？不用太過顧慮，之後仍然能夠更改。</string>
+  <string name="task_setup_description">太棒了！現在開始設定你的任務，開始賺取經驗和金幣吧。
+
+首先，你想改善生活中的哪一部分呢？</string>
   <string name="setup_group_work">工作</string>
   <string name="setup_group_exercise">運動</string>
   <string name="setup_group_health">健康</string>
@@ -212,55 +161,37 @@
   <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_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_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_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_1">學習以成為藝術能手</string>
   <string name="setup_task_creativity_2">進行創新項目</string>
   <string name="setup_task_creativity_3">完成創新項目</string>
-  <string name="gem.purchase.support">想要幫助我們維持 Habitica？透過購買鑽石來支持開發團隊吧！
-\n 
-\n鑽石能用來購買額外的樂趣，包括：
-\n 
-\n - 角色的酷酷服裝
-\n - 好看的背景
-\n - 能獲得寵物蛋的有趣副本
-\n - 100 級之前改變職業的能力
-\n 
-\n非常感謝您幫助我們使 Habitica 變的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的工會</string>
+    <string name="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="gems">寶石</string>
+    <string name="delete">刪除</string>
   <string name="name">名稱</string>
   <string name="description">描述</string>
   <string name="add_tag">添加新標籤</string>
   <string name="privacy">隱私</string>
   <string name="write_message">寫訊息</string>
-  <string name="post">公告</string>
-  <string name="guild_search_hint">搜尋公會</string>
-  <string name="todo_due">到期：%s</string>
-  <string name="daily_streak">目前連擊數：%d</string>
-  <string name="todo_has_duedate">任務有截止日</string>
-  <string name="battle_gear">戰鬥裝備</string>
+    <string name="guild_search_hint">搜尋公會</string>
+    <string name="battle_gear">戰鬥裝備</string>
   <string name="costume">服裝</string>
   <string name="outfit_head">頭部</string>
   <string name="outfit_headAccessory">頭飾</string>
@@ -273,10 +204,8 @@
   <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">當所有玩家加入或拒絕邀請時，副本會自動開始。你的 %2$d 位隊伍成員中只有 %1$d 位加入副本！你是否確定要直接開始這個副本？一旦開始，其他隊伍成員就不能加入這個副本。</string>
-  <string name="quest.invitation.text">你已經被邀請加入副本！</string>
-  <string name="ago_1day">1 天前</string>
+    <string name="quest_begin_message">當所有玩家加入或拒絕邀請時，副本會自動開始。你的 %2$d 位隊伍成員中只有 %1$d 位加入副本！你是否確定要直接開始這個副本？一旦開始，其他隊伍成員就不能加入這個副本。</string>
+    <string name="ago_1day">1 天前</string>
   <string name="ago_days">%d 天前</string>
   <string name="ago_1Minute">1 分鐘前</string>
   <string name="ago_minutes">%d 分鐘前</string>
@@ -290,43 +219,30 @@
   <string name="quests">副本</string>
   <string name="pets">寵物</string>
   <string name="mounts">坐騎</string>
-  <string name="armoireEquipment">你在神秘寶箱裡找到：%s</string>
-  <string name="armoireFood">你在神秘寶箱裡找到了%1$s %2$s。它怎麼會被放在這？</string>
+  <string name="armoireEquipment">你在神秘寶箱裡找到稀有物品：%s！真是太棒了！</string>
+  <string name="armoireFood">你在神秘寶箱裡找到了%1$s %2$s。它是用來做什麼的？</string>
   <string name="armoireExp">你奮力打開神秘寶箱而且獲得經驗值！</string>
-  <string name="armoireNotesFull">打開神秘寶箱會隨機獲得特殊裝備、經驗、或是食物！數量剩下：%d 份</string>
-  <string name="armoireLastItem">你在神秘寶箱裡找到了最後一件稀有裝備。</string>
-  <string name="armoireNotesEmpty">神秘寶箱會在每個月的第一個星期更新，在那之前時常簽到以獲得經驗值與食物！</string>
-  <string name="sell">出售 (%d 金幣)</string>
+    <string name="sell">出售 (%d 金幣)</string>
   <string name="hatch_with_potion">用藥水孵化</string>
-  <string name="feed_to_pet">餵食寵物</string>
-  <string name="hatch_egg">孵化寵物蛋</string>
+    <string name="hatch_egg">孵化寵物蛋</string>
   <string name="invite_party">隊伍邀請</string>
-  <string name="dialog_feeding">餵給%s：</string>
+  <string name="dialog_feeding">餵養%s用：</string>
   <string name="use_animal">用</string>
   <string name="feed">餵</string>
   <string name="hatch_with">用%s孵化寵物</string>
-  <string name="hatched_pet_title">你孵化了一隻%1$s%2$s！</string>
+  <string name="hatched_pet_title">你孵化了一隻 %1$s %2$s！</string>
   <string name="evolved_pet_title">你馴服了%s，讓我們騎上牠吧！</string>
   <string name="close">關閉</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你餵食了你的%s！</string>
-  <string name="notification_purchase">你購買了%s</string>
-  <string name="notification_purchase_reward">你購買了一個獎勵</string>
-  <string name="sectiondrop">基本寵物</string>
-  <string name="sectionpremium">神奇藥水寵物</string>
-  <string name="sectionquest">副本寵物</string>
-  <string name="sectionspecial">稀有寵物</string>
-  <string name="sectionmounts">基本坐騎</string>
-  <string name="sectionpremiumMounts">神奇藥水坐騎</string>
-  <string name="sectionquestMounts">副本坐騎</string>
-  <string name="sectionspecialMounts">稀有坐騎</string>
-  <string name="world_quest">世界副本</string>
+    <string name="notification_purchase_reward">你購買了一個獎勵</string>
+    <string name="world_quest">世界副本</string>
   <string name="inn_description">需要休息一會兒？在 Daniel 的酒館客棧登記住宿將暫停一些 Habitica 中比較艱難的遊戲機制：
-\n 
+\n
 \n • 未完成的每日任務不會對你造成傷害
 \n • 任務不會中斷連擊或改變顏色
 \n • Boss 不會因為你未完成的任務造成傷害
-\n • 您對 Boss 造成的傷害或收藏的副本物品將維持直到退房離開</string>
+\n • 您對 boss 造成的傷害或收藏的副本物品將維持直到退房離開</string>
   <string name="empty_items">你沒有任何%s</string>
   <string name="user_level">等級 %d</string>
   <string name="user_level_with_class">等級 %1$d %2$s</string>
@@ -334,42 +250,36 @@
   <string name="rogue">盜賊</string>
   <string name="mage">法師</string>
   <string name="healer">補師</string>
-  <string name="mage_description">法師鑽研能夠立即傷害 Boss 和提昇經驗值和魔力值的法術。如果您渴望於快速升級，那就成為法師吧！法師得利於其智力屬性。</string>
-  <string name="rogue_description">盜賊鑽研能使他們自身以及隊伍獲得更多金幣及隨機掉落物品的技巧。如果你熱衷於蒐集物品並積累財富，那就成為盜賊吧！盜賊得利於其感知屬性。</string>
-  <string name="healer_description">補師鑽研能夠治癒並保護自身以及隊伍的技術。如果你喜愛幫助隊友或免除傷害，那就成為補師吧！補師得利於其體質屬性。</string>
+  <string name="mage_description">法師向來學習迅速，所以獲得的經驗值數量以及提升等級的速度將比其他職業來得更快。同時他們也擁有用來施展特殊技能的大量魔力。如果您熱衷在 Habitica 中運用策略，或者您渴望於升級和解鎖進階功能，就來加入法師的行列吧！</string>
+  <string name="rogue_description">盜賊熱衷於積累財富，所以能比其他人獲得更多的金幣，同時還擅長於尋找隨機物品。他們特有的匿蹤技能可以讓他們躲避未完成的每日任務所帶來的傷害。如果您渴望獲得獎勵、成就以及戰利品和徽章，就來加入盜賊的行列吧！</string>
+  <string name="healer_description">補師對於突如其來的傷害擁有強大的抵抗能力，同時還能保護夥伴。未完成的每日任務和壞習慣都不是補師的對手。而且他們總是有辦法從失敗中恢復生命。如果您熱衷於輔助其他隊友或是享受從死神手中奪回生命的快感，就來加入補師的行列吧！</string>
   <string name="select_class">選擇職業</string>
   <string name="opt_out_class">退出</string>
-  <string name="opt_out_description">不知道該選甚麼職業？想晚點再決定嗎？可以暫時不選擇—您將暫時成為沒有任何特殊技能的戰士。您隨時可到 wiki 頁面了解職業系統，並在「玩家圖示 &gt; 設定」中啟用職業。</string>
-  <string name="class_confirmation">你確定想要成為%1$s嗎？</string>
+    <string name="class_confirmation">你確定想要成為%1$s嗎？</string>
   <string name="class_changed">你成為了%s！</string>
   <string name="class_changed_description">你有新的默認的戰鬥裝備，你可以在裝備裡替換！</string>
   <string name="choose_class">選擇職業</string>
   <string name="dialog_go_back">返回</string>
   <string name="opt_out_confirmation">你確定要退出嗎？</string>
   <string name="change_class">更換你的職業</string>
-  <string name="change_class_description">變更職業並重新分配屬性點，這會花費 3 鑽石。</string>
+  <string name="change_class_description">變更職業並重新分配屬性點，這會花費 3 寶石。</string>
   <string name="enable_class">開啟職業系統</string>
   <string name="changing_class_progress">更換職業</string>
-  <string name="by_email">透過電子郵件</string>
+  <string name="by_email">通過電子郵件</string>
   <string name="invite_existing_users">邀請現有玩家</string>
   <string name="send">送出</string>
   <string name="invite">邀請朋友</string>
-  <string name="invite_id_description">如果你的朋友們已經在使用 Habitica 了，透過用戶 ID 邀請他們。</string>
-  <string name="invite_email_description">如果您的朋友透過電子郵件加入 Habitica，他們將會自動被邀請加入您的隊伍！</string>
+    <string name="invite_email_description">如果您的朋友透過電子郵件加入 Habitica，他們將會自動被邀請加入您的隊伍!</string>
   <string name="add_invites">添加邀請</string>
-  <string name="user_id">使用者 ID (UUID)</string>
-  <string name="email">Email</string>
-  <string name="invite_users">邀請至隊伍</string>
-  <string name="share_using">分享使用</string>
-  <string name="share_levelup">透過改善現實生活中的習慣，我在 Habitica 到達了 %d 級！</string>
-  <string name="share_hatched">透過完成現實生活中的任務，我剛剛在 Habitica 孵化了一隻寵物%1$s %2$s！</string>
-  <string name="share_raised">透過完成現實生活中的任務，我剛剛在 Habitica 得到了一匹坐騎%1$s！</string>
-  <string name="open_in_store">開啟 Play sotre</string>
-  <string name="change_class_confirmation">你確定要變更職業嗎？這會花費 3 鑽石。</string>
-  <string name="change_class_equipment_warning">提示：你無法再購買%s職業的裝備了 (已頂級)。</string>
-  <string name="leaderMessage">訊息來自 %1$s</string>
-  <string name="leaderName">會長：%1$s</string>
-  <string name="confirm">確認</string>
+    <string name="email">Email</string>
+    <string name="share_using">分享使用</string>
+  <string name="share_levelup">我在Habitica中通過改善我現實生活中的習慣到達了%d級！</string>
+  <string name="share_hatched">我剛剛在Habitica中通完成我現實生活中的任務孵化了一隻寵物%1$s %2$s！</string>
+  <string name="share_raised">我剛剛在Habitica中通完成我現實生活中的任務得到了一匹坐騎%1$s！</string>
+  <string name="open_in_store">開啟Play sotre</string>
+  <string name="change_class_confirmation">你確定要變更職業嗎？這會花費3寶石。</string>
+  <string name="change_class_equipment_warning">提示：你無法再購買%s職業的裝備了（已頂級）。</string>
+    <string name="confirm">確認</string>
   <string name="market">市場</string>
   <string name="timeTravelers">時光旅行者</string>
   <string name="seasonalShop">季節限定商店</string>
@@ -377,37 +287,16 @@
   <string name="party_invite">透過邀請朋友解鎖</string>
   <string name="login_incentive">透過定期登入解鎖</string>
   <string name="create_account">透過創建帳號解鎖</string>
-  <string name="no_gold">金幣不足</string>
-  <string name="no_potion">你不需要購買治療藥水</string>
-  <string name="successful_purchase">成功購入%1$s</string>
-  <string name="purchase_confirmation_title">確認購買</string>
-  <string name="confirm_purchase_text">用 %2$s %3$s購買%1$s</string>
-  <string name="gem">鑽石</string>
-  <string name="hourglass">沙漏</string>
-  <string name="hourglasses">沙漏</string>
-  <string name="gold_singular">金幣</string>
-  <string name="gold_plural">金幣</string>
+    <string name="successful_purchase">成功購入%1$s</string>
+    <string name="gold_plural">金幣</string>
   <string name="chat_message_copied">訊息已複製到剪貼板</string>
-  <string name="copy_chat_message">複製到剪貼簿</string>
-  <string name="edit_tag_title">編輯標籤</string>
-  <string name="edit_tag_btn_edit">編輯</string>
-  <string name="edit_tag_btn_done">完成</string>
-  <string name="edit_tag_btn_delete">刪除</string>
-  <string name="confirm_delete_tag_title">你確定嗎？</string>
+    <string name="edit_tag_btn_edit">編輯</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>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">選擇訊息收件人</string>
   <string name="action_continue">繼續</string>
-  <string name="scan_qr_code">掃描 QR 碼</string>
-  <string name="enter_recipient_uuid">請輸入收件人 ID</string>
-  <string name="invited_to_party">你被邀請參加隊伍！</string>
+    <string name="invited_to_party">你被邀請參加隊伍！</string>
   <string name="stats_widget_label">Habitica 狀態</string>
   <string name="add_task">添加任務</string>
   <string name="add_habit">添加習慣</string>
@@ -418,20 +307,19 @@
   <string name="widget_habit_button">Habitica 完成習慣</string>
   <string name="widget_dailies">Habitica 每日任務</string>
   <string name="widget_todo_list">Habitica 待辦事項列表</string>
-  <string name="widget_add_task">Habitica 添加任務</string>
-  <string name="google_services_missing">找不到 Google Play 服務。</string>
-  <string name="gem.purchase.toolbartitle">購買</string>
-  <string name="gem.purchase.title">購買鑽石可以支持開發人員並幫助 Habitica 繼續營運</string>
-  <string name="gem.purchase.subtitle">鑽石可讓您購買額外有趣的物品，包含了：</string>
-  <string name="gem.purchase.listitem1">為您的角色穿上酷炫的服飾</string>
-  <string name="gem.purchase.listitem2">超讚的背景</string>
-  <string name="gem.purchase.listitem3">有寵物蛋獎勵的副本</string>
-  <string name="gem.purchase.listitem4">100 級以前更換職業的能力</string>
-  <string name="support_habitica">訂閱 Habitica</string>
+    <string name="google_services_missing">找不到 Google play 服務。</string>
+  <string name="gem_purchase_toolbartitle">購買</string>
+  <string name="gem_purchase_title">購買鑽石可以支持開發人員並幫助 Habitica 繼續營運</string>
+  <string name="gem_purchase_subtitle">鑽石可讓您購買額外有趣的物品，包含了:</string>
+  <string name="gem_purchase_listitem1">為您的角色穿上酷炫的服飾</string>
+  <string name="gem_purchase_listitem2">超讚的背景</string>
+  <string name="gem_purchase_listitem3">有寵物蛋獎勵的副本</string>
+  <string name="gem_purchase_listitem4">100 級以前更換職業的能力</string>
+  <string name="support_habitica">贊助 Habitica</string>
   <string name="skill_transformation_use">使用</string>
   <string name="hatching_market_info">沒有得到想要的掉落物品？來市場看看！</string>
   <string name="feeding_market_info">需要不同的食物嗎？到市場中購買更多食物！</string>
-  <string name="open_market">打開市場</string>
+  <string name="open_market">打開市集</string>
   <string name="cds_description">你的每日任務將會在 %1$s 後第一次打開 Habitica 時進行結算並被重置。請確保在此之前完成所有的每日任務！</string>
   <string name="AudioTheme_title">聲音主題</string>
   <string name="AudioTheme_summary">更改 Habitica 的聲音主題</string>
@@ -440,96 +328,80 @@
   <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_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="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="subscription_duration">每%s重複出現</string>
   <string name="subscribe">加入會員</string>
-  <string name="subscribe.listitem1.description">商人 Alexander 將會按每顆鑽石 20 金幣的價格向你出售鑽石！ 
-\n 
-\n他每個月的初始進貨量是 25 個鑽石，進貨量會隨著您的訂閱額度增長！ 
-\n 
-\n每三個月鑽石上限就會增加 5 顆，直到最多 1 個月 50 顆鑽石！</string>
-  <string name="subscribe.listitem2.description">每個月你將會收到一件獨特的角色飾品！ 
-\n 
-\n另外每連續訂閱三個月，神秘的時間旅行者將授予你得到過去 (和未來) 飾品的資格。</string>
-  <string name="subscribe.listitem3.description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
-  <string name="subscribe.listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
+  <string name="subscribe_listitem1_description">商人 Alexander 可以按每個寶石 20 金幣的價格向你出售寶石！
+\n
+\n他每個月的初始進貨量是 25 個寶石，進貨量會隨著您的捐助額度增長！
+\n
+\n 每三個月寶石上限就會增加 5，直到最多 1 個月 50 顆寶石！</string>
+  <string name="subscribe_listitem2_description">每個月你將會收到一件獨特的角色飾品！
+\n
+\n另外每連續訂閱三個月，神秘的時間旅行者將授予你得到過去(和未來)飾品的資格。</string>
+  <string name="subscribe_listitem3_description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
+  <string name="subscribe_listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
   <string name="subscription_hourglasses">%d 個神秘沙漏</string>
   <string name="payment_method">付款方式</string>
   <string name="subscription">訂閱</string>
-  <string name="active">有效</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">查訪 Habitica 官方網站</string>
   <string name="current_bonuses">現在的加成獎勵</string>
-  <string name="months_subscribed">個月訂閱</string>
+  <string name="months_subscribed">月訂閱</string>
   <string name="current_hourclasses">現有的神秘沙漏</string>
-  <string name="monthly_gem_cap">每月鑽石上限</string>
-  <string name="inactive">失效</string>
+  <string name="monthly_gem_cap">每月寶石上限</string>
+  <string name="inactive">不活躍的</string>
   <string name="one_month">1 個月</string>
-  <string name="months">月</string>
+  <string name="months">%d 個月</string>
   <string name="month">月</string>
   <string name="three_months">3 個月</string>
   <string name="six_months">6 個月</string>
   <string name="twelve_months">12 個月</string>
   <string name="subscribe_prompt_thanks">只要訂閱的話，你就可以享有這些禮遇：</string>
   <string name="subscription_status">訂閱狀態</string>
-  <string name="byLeader">由 %s</string>
-  <string name="challenge_details">挑戰細節</string>
-  <string name="challenge_leave_title">離開挑戰</string>
-  <string name="challenge_leave_text">你確認你要離開「%s」挑戰嗎？</string>
+    <string name="challenge_leave_title">離開挑戰</string>
+  <string name="challenge_leave_text">你確認你要離開\"%s\"挑戰嗎？</string>
   <string name="challenge_remove_tasks_title">移除任務</string>
   <string name="challenge_remove_tasks_text">你確定要刪除這個任務嗎？</string>
   <string name="remove_tasks">刪除</string>
   <string name="keep_tasks">保留</string>
   <string name="my_challenges">我的挑戰</string>
-  <string name="public_challenges">公開</string>
-  <string name="challenges">挑戰</string>
-  <string name="daily">每日任務</string>
+    <string name="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">參加挑戰會將這些任務加進你的任務列表。完成任務、戰勝其他 Habitica 玩家來贏得成就和鑽石吧！</string>
+  <string name="official">官方的</string>
+    <string name="challenge">挑戰</string>
+    <string name="not_part_of_a_challenge">你現在沒有加入任何挑戰！</string>
+  <string name="join_a_challenge">參加挑戰會將這些任務加進你的任務列表。完成任務、戰勝其他 Habitica 玩家來贏得成就和寶石吧！</string>
   <string name="check_the_public_challenge_tab">點擊「公會挑戰」按鈕來尋找其他勇士創建的挑戰吧！也許會有適合你的喲！</string>
-  <string name="add_reminder">添加提醒</string>
-  <string name="warning">注意</string>
-  <string name="open_settings">打開設定</string>
-  <string name="dont_keep_activities_warning">看來您將開發者選項「不要保留活動 (Don\'t keep Activities)」打開了。啟用這個選項將會造成應用程式不必要的影響。我們建議您將其關閉。</string>
-  <string name="inbox">訊息</string>
-  <string name="FAQ">常見問題</string>
-  <string name="special">特殊的</string>
-  <string name="gem_for_gold_description">由於你訂閱了 Habitica，你每個月可以用一定數量的金幣購買鑽石。</string>
-  <string name="limited_count">剩下 %d 個</string>
-  <string name="gem_shop">鑽石</string>
+    <string name="inbox">訊息</string>
+    <string name="special">特殊的</string>
+  <string name="gem_for_gold_description">由於你訂閱了 Habitica，你每個月可以用一定數量的金幣購買寶石。</string>
+    <string name="gem_shop">寶石</string>
   <string name="mystery_item">神秘物品</string>
   <string name="myster_item_notes">每個月，訂閱者將會收到一份神秘禮物。依照慣例將於月底前一個星期公佈。</string>
   <string name="open">打開</string>
-  <string name="notification_mystery_item">你打開了盒子並發現了%s！</string>
-  <string name="checkInRewardEarned">你因為致力於改善你的生活而獲得了%1$s。</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">距離下次獎勵還有 %1$d 次簽到</string>
+    <string name="checkInRewardEarned">你因為致力於改善你的生活而獲得了%1$s。</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">你的下一次獎勵在簽到%1$d後解鎖</string>
   <string name="pending_approval">等待審批的任務</string>
   <string name="filters">篩選</string>
   <string name="done">完成</string>
-  <string name="group_tasks_edit_description">團隊任務無法被編輯。</string>
-  <string name="group_tasks_edit_title">無法編輯這個任務</string>
-  <string name="groups">團隊</string>
+    <string name="groups">團隊</string>
   <string name="all">所有</string>
   <string name="none">無</string>
   <string name="owned">已擁有</string>
   <string name="not_owned">尚未擁有</string>
-  <string name="new_game">新遊戲</string>
-  <string name="login_btn_fb">透過 Facebook 帳號登入</string>
+    <string name="login_btn_fb">透過 Facebook 帳號登入</string>
   <string name="login_btn_google">透過 Google 帳號登入</string>
   <string name="action_back">返回</string>
   <string name="randomize">隨機</string>
@@ -541,7 +413,7 @@
   <string name="avatar_glasses">眼鏡</string>
   <string name="avatar_wheelchair">輪椅</string>
   <string name="weak">虛弱</string>
-  <string name="strong">強壯</string>
+  <string name="strong">強的</string>
   <string name="gray">灰色</string>
   <string name="dated">已排程</string>
   <string name="completed">已完成</string>
@@ -554,22 +426,20 @@
   <string name="empty_title_todos">你沒有任何待辦事項</string>
   <string name="empty_description_todos">待辦事項是只需要完成一次的任務。在待辦事項當中增加檢核清單以提昇待辦事項的價值。</string>
   <string name="empty_title_rewards">你沒有任何獎勵</string>
-  <string name="reset_walkthrough">重新導覽</string>
-  <string name="read_community_guidelines">發表之前檢視我們的<u>社區守則</u></string>
+  <string name="reset_walkthrough">重新 Justin 的介紹</string>
+  <string name="read_community_guidelines">請在發表之前閱讀我們的社區守則</string>
   <string name="maintenance">維修</string>
   <string name="reload_content">重整留言</string>
   <string name="dailyDueDefaultView">預設每日任務顯示「待辦」欄</string>
   <string name="dailyDueDefaultViewDescription">啟用此設定後，會將每日任務預設顯示的「全部」改設為「待辦」</string>
-  <string name="repeat_summary">重複%1$s，在每%2$s%3$s的%4$s</string>
-  <string name="no_billing_gems">你的裝置沒有任何支援的購買方式。如果你要購買鑽石，請使用 Habitica 網站。</string>
+  <string name="no_billing_gems">你的裝置沒有任何支援的購買方式。如果你要購買寶石，請使用 Habitica 網站。</string>
   <string name="no_billing_subscriptions">你的裝置沒有任何支援的購買方式。如果你要訂閱，請使用 Habitica 網站。</string>
   <string name="save">儲存</string>
   <string name="location">位置</string>
-  <string name="gem_reward">獎勵鑽石</string>
+  <string name="gem_reward">獎勵寶石</string>
   <string name="tasks">任務</string>
   <string name="create_challenge">建立挑戰</string>
-  <string name="edit_challenge">編輯</string>
-  <string name="challenge_create_error_tavern_one_gem">你最少需要 1 顆鑽石來建立公眾挑戰。</string>
+    <string name="challenge_create_error_tavern_one_gem">你最少需要 1 個寶石來建立公眾挑戰。</string>
   <string name="challenge_create_error_enough_gems">你沒有足夠的鑽石來發出此挑戰。</string>
   <string name="identify_your_challenge_with_a_tag">給你的挑戰一個簡短的名稱</string>
   <string name="challenge_create_error_tag">你需要給你的挑戰一個簡短的名字。</string>
@@ -579,41 +449,36 @@
   <string name="new_challenge_title">新的挑戰名稱</string>
   <string name="ownership">擁有者</string>
   <string name="inn">客棧</string>
-  <string name="system">系統</string>
-  <string name="start_quest">開始一個新副本</string>
+    <string name="start_quest">開始一個新副本</string>
   <string name="leave_party">退出隊伍</string>
   <string name="party_description">隊伍介紹</string>
-  <string name="abort_confirmation">你確定要放棄此次副本？你和你隊伍中的成員進度將會全數歸零，副本捲軸將會歸還給擁有者。</string>
-  <string name="leave_quest_confirmation">你確定要放棄正在進行中的副本？你的副本進度將會全數歸零。</string>
-  <string name="number_participants">%1$d 位參與者</string>
+    <string name="number_participants">%1$d 位參與者</string>
   <string name="welcome_back">歡迎回來</string>
-  <string name="yesterdaililes_prompt">為昨天完成的每日任務打勾：</string>
+  <string name="yesterdaililes_prompt">你昨天有完成以下的每日任務嗎？</string>
   <string name="start_day">開始我的一天</string>
   <string name="leave_party_confirmation">你確定你想要離開隊伍？</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">%d 次簽到後的獎品</string>
-  <string name="pending">等待中</string>
+    <string name="pending">等待中</string>
   <string name="accepted">已接受</string>
   <string name="declined">已拒絕</string>
   <string name="participants">參與者</string>
   <string name="invitations">邀請</string>
-  <string name="quest_leader_header" formatted="false">由 %s 發起</string>
+  <string name="quest_leader_header">由%s發起</string>
   <string name="quest_abort_message">你確定要放棄此次副本？你和你隊伍中的成員進度將會全數歸零，副本捲軸將會歸還給擁有者。</string>
   <string name="reloading_content">正在重整留言</string>
   <string name="thousand_abbrev">千</string>
   <string name="million_abbrev">百萬</string>
   <string name="billion_abbrev">十億</string>
-  <string name="your_balance">你的餘額：</string>
-  <string name="available_until" formatted="false">%s 前可購入</string>
-  <string name="gems_left_max" formatted="false">當月鑽石：剩下 %1$d/%2$d</string>
-  <string name="gems_left_nomax" formatted="false">當月鑽石：剩下 %d</string>
+    <string name="available_until">可供購買直到%s</string>
+  <string name="gems_left_max">每月寶石：剩下 %1$d/%2$d</string>
+  <string name="gems_left_nomax">每月寶石：剩下 %d</string>
   <string name="health">生命值</string>
   <string name="collect">蒐集</string>
   <string name="rage_meter">狂暴值</string>
   <string name="boss_quest">Boss 副本</string>
   <string name="collection_quest">蒐集副本</string>
-  <string name="quest_reward_count" formatted="false">%1$sx%2$d</string>
-  <string name="experience_reward" formatted="false">%d 經驗值</string>
-  <string name="gold_reward" formatted="false">%d 金幣</string>
+  <string name="quest_reward_count">%1$sx%2$d</string>
+  <string name="experience_reward">%d 經驗值</string>
+  <string name="gold_reward">%d 金幣</string>
   <string name="quest_owner_rewards">副本擁有者獎勵</string>
   <string name="str_abbrv">力量</string>
   <string name="per_abbrv">感知</string>
@@ -621,19 +486,18 @@
   <string name="con_abbrv">體質</string>
   <string name="reset_account">重置帳號</string>
   <string name="reset_account_description">警告！這會重置你帳號的許多數值。強烈不建議你這麼做，不過，在短暫地試玩一段時間後，進行重置或許會有所幫助。
-\n 
+\n
 \n您將會失去所有的等級、金幣以及經驗值。您所有的任務 (除了那些來自挑戰除外) 將會被永久刪除，且您將會失去所有相關的歷史數據。您將會失去所有的裝備，但您可透過購買將他們買回來，包含所有您已經擁有的限定版裝備或訂閱者專屬的神秘裝備 (但您需要相同的職業才能重從新購買職業限定的裝備)。您將會保留現有的職業、已擁有的寵物及坐騎。您可能會較喜歡使用重生球來代替，它是一個比較安全的方法，同時它可以保留您的任務及裝備。</string>
   <string name="delete_account">刪除帳號</string>
-  <string name="delete_account_description">您確定嗎？這將會永久刪除您的帳號，並且再也無法恢復！如果您希望再次使用 Habitica，就需要再註冊一個全新的帳號。舊帳號內儲存的和已花費的鑽石也將無法被退還。如果您非常確定要刪除帳號，請在下面的文字欄中輸入您的密碼。</string>
+  <string name="delete_account_description">您確定嗎？這將會永久刪除您的帳號，並且再也無法恢復！如果您希望再次使用 Habitica，就需要再註冊一個全新的帳號。舊帳號內儲存的和已花費的鑽石也將無法被退還。如果您非常確要刪除帳號，請在下面的文字欄中輸入您的密碼。</string>
   <string name="reset_account_confirmation">重置我的帳號</string>
   <string name="delete_account_confirmation">刪除我的帳號</string>
   <string name="danger_zone">危險區域</string>
-  <string name="nevermind">別在意</string>
-  <string name="resetting_account">重置帳號</string>
+    <string name="resetting_account">重置帳號</string>
   <string name="deleting_account">刪除帳號</string>
   <string name="insufficientGold">你需要完成更多任務才足以負擔這件物品！</string>
-  <string name="insufficientGems">你需要更多鑽石來購買這件物品！</string>
-  <string name="purchase_gems">購買鑽石</string>
+  <string name="insufficientGems">你需要更多寶石來購買這件物品！</string>
+  <string name="purchase_gems">購買寶石</string>
   <string name="insufficientHourglasses">你需要更多神秘沙漏以購買此物品！</string>
   <string name="get_hourglasses">獲得神秘沙漏</string>
   <string name="subscribe_for_hourglasses">訂閱以取得神秘沙漏</string>
@@ -644,7 +508,7 @@
   <string name="level">等級</string>
   <string name="streak_label">21 天連擊</string>
   <string name="stats">統計</string>
-  <string name="fix_character_description">如果您遇到 bug 或不小心變更到您的角色，您可以在這裡手動更正這些值。</string>
+  <string name="fix_character_description">如果您遇到 Bug 或不小心變更到您的角色，您可以在這裡手動更正這些值。</string>
   <string name="fix_character_values">修正角色數值</string>
   <string name="saving">儲存中</string>
   <string name="forgot_password_title">發送重設密碼的連結到您的信箱</string>
@@ -662,8 +526,7 @@
   <string name="authentication_summary">變更你的認證設定。</string>
   <string name="change_password">修改密碼</string>
   <string name="change_email">更改電子郵件地址</string>
-  <string name="change_login_name">變更登入名稱</string>
-  <string name="change">變更</string>
+    <string name="change">變更</string>
   <string name="character_level">角色等級</string>
   <string name="auto_allocate_points">自動分配點數</string>
   <string name="stat_guide">屬性概要</string>
@@ -672,7 +535,7 @@
   <string name="strength">力量</string>
   <string name="strength_description">這個屬性增加玩家完成任務時觸發暴擊的機率，並且增加通過暴擊獲得的額外獎勵的數量和對 boss 造成的傷害。</string>
   <string name="intelligence">智力</string>
-  <string name="intelligence_description">這個屬性允許玩家從任務中獲得更多經驗值，等級提升更快。魔力值的最大值和再生速度也會上升。</string>
+  <string name="intelligence_description">這個屬性允許玩家從任務中獲得更多經驗值，等級提升更快。魔法值的最大值和再生速度也會上升。</string>
   <string name="constitution">體質</string>
   <string name="constitution_description">這個屬性減少玩家從自己的任務中受到的傷害，例如負面習慣或者未完成的每日任務，但不能減少 boss 造成的傷害。</string>
   <string name="perception">感知</string>
@@ -681,21 +544,19 @@
   <string name="allocated">分配</string>
   <string name="distribute_evenly">平均分配</string>
   <string name="distribute_class">根據職業分配</string>
-  <string name="distribute_task">根據任務分配</string>
+  <string name="distribute_task">根據任務活動分配</string>
   <string name="no_points_to_allocate">沒有屬性點可以分配</string>
-  <string name="points_to_allocate" formatted="false">%d 屬性點可以分配</string>
+  <string name="points_to_allocate">%d 屬性點可以分配</string>
   <string name="distribute_evenly_help">平均分配屬性點至所有屬性。</string>
   <string name="distribute_class_help">分配較多的屬性點至對您的職業較重要的屬性。</string>
   <string name="distribute_task_help">依據您完成的任務所關聯的特質分配屬性點。</string>
   <string name="allocating_points">點數分配中</string>
   <string name="class_equipment">裝備</string>
-  <string name="equipment_empty">您已擁有所有您所屬職業的裝備！更多裝備將於下一個季節時進貨。</string>
+  <string name="equipment_empty">"您已擁有所有您所屬職業的裝備!  更多裝備將於下一個季節時進貨。"</string>
   <string name="classless">無職業</string>
   <string name="class_equipment_shop_dialog">這個物品只對特定職業開放。\n你可以在設置改變你的職業。</string>
   <string name="class_gear_disclaimer">你只能購買當前職業的裝備</string>
-  <string name="available_stats" formatted="false">%d 點</string>
-  <string name="toogle_emojis">切換 Emoji</string>
-  <string name="tavern_description">歡迎來到酒館客棧！拉張椅子坐下聊天，或者暫停任務休息一下。</string>
+    <string name="tavern_description">歡迎來到酒館小棧！拉張椅子坐下聊天，或者暫停任務休息一下。</string>
   <string name="check_into_inn">入住客棧</string>
   <string name="community_guidelines">社群規範</string>
   <string name="view_community_guidelines">查看社群規範</string>
@@ -708,54 +569,36 @@
   <string name="tiers_descriptions">聊天畫面中使用者名稱上的顏色代表著個人的貢獻者層級。層級越高，就證明了他對 Habitica 裡的美術、程式碼、社群等地方貢獻得越多！</string>
   <string name="navigation_drawer_open">開啟導航欄</string>
   <string name="navigation_drawer_close">關閉導航欄</string>
-  <string name="world_boss">世界 Boss</string>
-  <string name="world_boss_art">Boss 圖像</string>
-  <string name="boss_art">Boss 圖像</string>
-  <string name="world_boss_description">世界 Boss 簡介</string>
-  <string name="rage_strike_count" formatted="false">暴走攻擊：%d/%d</string>
-  <string name="pending_strike_description">攻擊尚未來襲！ 
-\n世界 Boss 會在暴走值到達滿值時，毒打店主。持續完成每日任務，來避免此事發生！</string>
-  <string name="pending_strike_title">即將造成的攻擊</string>
+  <string name="world_boss">世界 boss</string>
+    <string name="boss_art">Boss 圖像</string>
+  <string name="world_boss_description">世界 boss 簡介</string>
+  <string name="rage_strike_count">暴走攻擊：%d/%d</string>
+    <string name="pending_strike_title">即將造成的攻擊</string>
   <string name="strike_description_title">暴走攻擊是什麽？</string>
-  <string name="strike_description_subtitle">Boss 可以有 3 次暴走攻擊</string>
-  <string name="strike_description_description">這個進度條會在有玩家錯失他們的任務時提升。如果達到上限，DysHeartener 會釋放驚天動地的心碎攻擊，攻擊 Habitica 上隨機的一個店主，所以努力完成你的任務！</string>
-  <string name="pending_strike_subtitle">攻擊尚未發生！</string>
-  <string name="strike_active_title" formatted="false">%s被攻擊了！</string>
-  <string name="strike_active_subtitle" formatted="false">%s心碎了！</string>
-  <string name="strike_active_description" formatted="false">我們心愛的%s在%s攻擊%s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
+    <string name="strike_active_title">%s被攻擊了！</string>
+    <string name="strike_active_description">我們心愛的%s在%s攻擊%s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
   <string name="questShop">副本商店</string>
   <string name="market_owner_long">商人 Alex</string>
   <string name="tavern_owner_long">酒館老闆 Daniel</string>
   <string name="stable_owner_long">馴獸師 Matt</string>
-  <string name="hide_boss_art">隱藏 Boss 圖像</string>
-  <string name="active_world_boss">活躍的世界 Boss</string>
+  <string name="hide_boss_art">隱藏 boss 圖像</string>
+  <string name="active_world_boss">活躍的世界 boss</string>
   <string name="no_party_description">和朋友一同完成或單獨完成副本。和怪物戰鬥，創建挑戰，在隊伍中挑起大梁。</string>
   <string name="no_party_title">在 Habitica 和隊伍的成員一起玩</string>
   <string name="join_party_title">想要加入隊伍？</string>
-  <string name="create_party_website">打開網頁來創建隊伍</string>
-  <string name="id_copied">ID 已複製到剪貼板</string>
-  <string name="insufficientSubscriberGems">你已經將這個月可購買的鑽石全數掃空，每個月的前三天將會有更多鑽石可供購買！謝謝你的熱情訂閱！</string>
-  <string name="insufficientSubscriberGemsTitle">已達到每月鑽石上限</string>
-  <string name="chat_message">聊天訊息</string>
-  <string name="world_boss_description_title">什麼是世界 boss？</string>
-  <string name="world_boss_description_description">世界 Boss 是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！
-\n完成任務即可對 Boss 造成傷害
-\n你沒完成任務時，Boss 不會攻擊你，但是暴走值會提升，當暴走值達到上限時，將會隨機攻擊一個店主！
-\n你可以同時挑戰一般的副本 Boss，傷害會同時灌注在兩者身上
-\n點擊酒館來確認世界 Boss 的攻略進度和暴走攻擊</string>
-  <string name="world_boss_description_intro">世界 Boss 是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！</string>
-  <string name="world_boss_description_1">完成任務來攻擊世界 Boss</string>
-  <string name="world_boss_description_2">世界 Boss 不會因為您未完成的任務而對您產生傷害，但是將會增加他的怒氣值。一旦怒氣值全滿，Boss 將會隨機攻擊一位 Habitica 的商人！</string>
-  <string name="world_boss_description_3">您可以持續對付一般的副本 Boss，傷害會同時灌注在兩者身上</string>
-  <string name="world_boss_description_4">請到酒館查看最新的 Boss 進度和怒氣值</string>
-  <string name="world_boss_action_prompt" formatted="false">想要獲得特殊獎勵，從%s的魔爪中拯救 Habitica 嗎？那就來打敗 Boss 吧！</string>
-  <string name="world_boss_description_subtitle">%s攻擊了！</string>
-  <string name="questShop_owner_long">副本嚮導 Ian</string>
-  <string name="seasonalShop_owner_long">季節女巫</string>
+    <string name="insufficientSubscriberGems">你已經將這個月可購買的寶石全數掃空，每個月的前三天將會有更多寶石可供購買！謝謝你的熱情訂閱！</string>
+    <string name="world_boss_description_title">什麼是世界 boss？</string>
+    <string name="world_boss_description_intro">世界 boss 是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！</string>
+  <string name="world_boss_description_1">完成任務來攻擊世界 boss</string>
+  <string name="world_boss_description_2">世界 boss 不會因為您未完成的任務而對您產生傷害，但是將會增加他的怒氣值。一旦怒氣值全滿，boss 將會隨機攻擊一位 Habitica 的商人！</string>
+  <string name="world_boss_description_3">您可以持續對付一般的副本 boss，傷害會同時灌注在兩者身上</string>
+  <string name="world_boss_description_4">請到酒館查看最新的 boss 進度和怒氣值</string>
+  <string name="world_boss_action_prompt">想要獲得特殊獎勵，從%s的魔爪中拯救 Habitica 嗎？那就來打敗 boss 吧！</string>
+    <string name="questShop_owner_long">副本嚮導 Ian</string>
+  <string name="seasonalShop_owner_long">季節性女巫</string>
   <string name="rage_attack">憤怒攻擊：</string>
   <string name="report">檢舉</string>
-  <string name="like">讚</string>
-  <string name="reply">回覆</string>
+    <string name="reply">回覆</string>
   <string name="challenge_prize">挑戰獎品</string>
   <string name="challenge_categories">挑戰類別</string>
   <string name="created_challenge">創建挑戰</string>
@@ -765,35 +608,33 @@
   <string name="unlock_attribute_points">分配屬性點在 10 等時解鎖</string>
   <string name="moderator">管理員</string>
 <string name="levelup_header">你升到第 %1$d 級！</string>
-    <string name="levelup_detail">藉由完成現實中的生活目標，你已經升級並完全回血了！</string>
-    <string name="loading">讀取中…</string>
+    <string name="levelup_detail">透過完成你在現實生活中的目標，你現在已經升級並完全治癒了！</string>
     <string name="faint_penalty_body">你降了一級，丟失了所有的金幣和一件裝備。不過繼續努力，你就可以把他們都拿回來！加油，你會更棒的。</string>
     <string name="reminder_title">記得完成你的任務</string>
-    <string name="warrior_description">戰士會有更高的暴擊率，能對 Boss 造成更強的傷害。如果你想輕鬆擊退怪物，那就當個戰士吧！戰士得利於其力量屬性。</string>
+    <string name="warrior_description">戰士將有較大的機率能觸發「會心一擊」，並在完成任務時可隨機獲得額外的金幣、經驗和掉落率。同時他們還能對 boss 施加巨大的傷害。如果您希望像樂透一樣獲得不可預期的獎勵，或是想在 boss 副本中重創 boss，就來加入戰士的行列吧！</string>
     <string name="opting_out_progress">退出</string>
-    <string name="invite_username_description">如果你已有朋友在使用 Habitica，透過這裡的使用者名稱邀請他們。</string>
+    <string name="invite_username_description">如果你已有朋友在使用 Habitica，透過這裡的用戶名邀請他們。</string>
     <string name="subscription_duration_norenew">為了 %s</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="subscribe1month_gemcap">25 寶石</string>
+    <string name="subscribe3month_gemcap">30 寶石</string>
+    <string name="subscribe6month_gemcap">35 寶石</string>
+    <string name="subscribe12month_gemcap">45 寶石</string>
     <string name="due">期限</string>
     <string name="welcome_text">哦，你一定是新來的。我是 Justin，你在 Habitica 的嚮導。
-\n 
+\n
 \n開始之前，我們該怎麽稱呼您？你可隨意修改預設值，等你都填好後，我們就可以開始創建你的個人形象！</string>
     <string name="delete_oauth_account_description">您確定嗎？這將會永久刪除您的帳號，並且再也無法恢復！如果您希望再次使用 Habitica，就需要再註冊一個全新的帳號。舊帳號內儲存的和已花費的鑽石也將無法被退還。如果您非常確定要刪除帳號，請在下面的文字欄中輸入您的密碼。</string>
     <string name="change_username">修改使用者名稱</string>
-    <string name="join_party_description">把下方的使用者名稱給一個隊伍成員，這樣他們就能邀請你加入了</string>
-    <string name="join_party_description_id">把你的使用者 ID 給他們，或者讓他們掃你的 QR 碼來邀請你</string>
+    <string name="join_party_description">把下方的用戶名給一個隊伍成員，這樣他們就能邀請你加入了</string>
     <string name="tavern_description_world_boss">噢我親愛的老夥計，不用擔心下面的怪物，這裏仍然是一個安全的避風港，來聊聊天吧。</string>
     <string name="same_day_reminder_title">你添加任務了嗎？</string>
     <string name="same_day_reminder_text">你增加得越多，獎勵就會越多。溪流終將匯聚成大海。</string>
     <string name="next_day_reminder_title">今天完成任務了嗎？</string>
     <string name="next_day_reminder_text">升級後有許多可解鎖和發現的，所以繼續你的任務。祝玩得愉快！</string>
-    <string name="daily_tip_0">想試試新東西？加入一個挑戰來擴充你的人物列表並贏得一些鑽石吧！</string>
+    <string name="daily_tip_0">想試試新東西？加入一個挑戰來擴充你的人物列表並贏得一些寶石吧！</string>
     <string name="daily_tip_1">把待辦事項都加到你的待辦事項列表來贏取獎勵！</string>
-    <string name="daily_tip_2">你可以修改你的每日任務的重覆頻率。多麼偶發的任務都能被簡單排程。</string>
-    <string name="daily_tip_3">你也可以針對每日任務安排提醒。</string>
+    <string name="daily_tip_2">你可以修改你的每日任務的重覆頻率。多罕見的任務都能被安排得明明白白。</string>
+    <string name="daily_tip_3">你也可以安排特定的日程提醒。</string>
     <string name="daily_tip_4">偶爾審視一下你的任務以免偏離正道。</string>
     <string name="daily_tip_5">深呼吸！保持專注！你能辦到！</string>
     <string name="daily_tip_6">嘗試設置一個 10 分鐘的計時看看你能完成多少！</string>
@@ -809,24 +650,22 @@
     <string name="last_login">最新簽到時間</string>
     <string name="total_checkins">總簽到數</string>
     <string name="two_handed">雙手握持</string>
-    <string name="usernamePromptTitle">是時候設置使用者名稱了！</string>
-    <string name="usernamePromptBody">現在使用者名稱就是登入帳號，同時使用者名稱還用於邀請、聊天版上@你，還有私訊。</string>
-    <string name="usernamePromptWiki">如果你想了解更多關於變動的信息，可以<a href="https://habitica.wikia.com/wiki/Player_Names">訪問我們的 wiki。</a></string>
-    <string name="confirmUsername">確認使用者名稱</string>
+    <string name="usernamePromptTitle">是時候設置用戶名了！</string>
+    <string name="usernamePromptBody">現在用戶名就是登錄名，同時用戶名還用於邀請、聊天版上@你，還有私信。</string>
+    <string name="usernamePromptWiki">如果你想了解更多關於變動的信息， <a href="https://habitica.wikia.com/wiki/Player_Names">訪問我們的百科</a></string>
     <string name="usernamePromptDisclaimer">使用者名稱必須遵守我們的<a href="https://habitica.com/static/terms">服務條款</a>和<a href="https://habitica.com/static/community-guidelines">社群守則</a>。如果您之前尚未設立登入名稱，您的使用者名稱將會被自動產生。</string>
     <string name="confirm_username_title">你確定要用這個名字嗎？</string>
-    <string name="confirm_username_description">使用者名稱一經確認就會顯示在邀請，@提到你和私信中。你隨時都可以在設定裏修改使用者名稱。</string>
+    <string name="confirm_username_description">用戶名一經確認就會顯示在邀請，@提到你和私信中。你隨時都可以在設定裏修改用戶名。</string>
     <string name="cancel">取消</string>
-    <string name="confirm_username">確認使用者名稱</string>
-    <string name="username_not_confirmed">使用者名稱未確認</string>
-    <string name="username_confirmed">使用者名稱已確認</string>
-    <string name="username_level">\@%s・等級 %d</string>
-    <string name="enter_recipient_username">輸入收件人的@使用者名稱</string>
-    <string name="username_copied">使用者名稱已複製到剪貼板</string>
-    <string name="verification_pet">確認後，其中一隻將領寵物在等待著你！</string>
+    <string name="confirm_username">確認用戶名</string>
+    <string name="username_not_confirmed">用戶名未確認</string>
+    <string name="username_confirmed">用戶名已確認</string>
+    <string name="enter_recipient_username">輸入收件人的@用戶名</string>
+    <string name="username_copied">用戶名已複製到剪貼板</string>
+    <string name="verification_pet">確認後，其中一只久經沙場的寵物在等待著你！</string>
     <string name="welcomeNameTitle">我們應該怎麽稱呼你呢？</string>
     <string name="display_name_length_error">暱稱長度必須介於 1 至 30 個字符之間</string>
-    <string name="setup_task_join_habitica">加入 Habitica (幫我勾選掉！)</string>
+    <string name="setup_task_join_habitica">加入 Habitica ( 幫我勾選掉！)</string>
     <string name="setup_task_join_habitica_notes">您可以完成此待辦事項、編輯它、或刪除它。</string>
     <string name="setup_task_reward">獎勵自己</string>
     <string name="setup_task_reward_notes">看電視、玩遊戲、或者吃點東西，都取決於你！</string>
@@ -854,88 +693,16 @@
     <string name="only_leader_create_challenge">只有會長可以創建挑戰</string>
     <string name="create_party">創建隊伍</string>
   <string name="notifications">通知</string>
-  <string name="no_notifications_title">已查看所有新訊息！</string>
+  <string name="no_notifications_title">已查看所有新訊息!</string>
   <string name="no_notifications_text">通知仙女給您一陣熱烈的掌聲！做得好！</string>
   <string name="dismiss_all">清除全部</string>
-  <string name="new_bailey_update">Bailey 的新訊息！</string>
-  <string name="new_msg_guild"><b>%1$s</b> 有新的貼文</string>
-  <string name="new_msg_party">您的隊伍 <b>%1$s</b> 有新的貼文</string>
-  <string name="unallocated_stats_points">你有 <b>%1$s 點屬性點未分配</b></string>
+  <string name="new_bailey_update">Bailey的新信息！</string>
+  <string name="new_msg_guild"><![CDATA[<b>%1$s</b>有新的貼文]]></string>
+  <string name="new_msg_party"><![CDATA[您的隊伍<b>%1$s</b>有新的貼文]]></string>
+  <string name="unallocated_stats_points"><![CDATA[你有<b>%1$s點未分配屬性點</b>]]></string>
   <string name="new_subscriber_item"><![CDATA[您有新的<b>神秘裝備</b>]]></string>
-  <string name="invited_to_party_notification">您受邀加入 <b>%1$s</b> 隊伍</string>
-  <string name="invited_to_private_guild">您受邀加入 <b>%1$s</b> 私人公會</string>
-  <string name="invited_to_public_guild">您受邀加入 <b>%1$s</b> 公會</string>
-  <string name="invited_to_quest">您受邀加入 <b>%1$s</b> 副本</string>
-<string name="sectionwacky">古怪寵物</string>
-    <string name="x_months">%d 個月</string>
-    <string name="insufficientGoldTitle">金幣不足</string>
-    <string name="join_party_description_guild">將下方的使用者名稱發給好友，或是前往%s找尋隊友</string>
-    <string name="defeat">擊退</string>
-    <string name="add_local_authentication">新增地區性驗證</string>
-    <string name="task_title">任務標題</string>
-
-    <string name="old_password">舊密碼</string>
-    <string name="new_password">新密碼</string>
-    <string name="new_password_repeat">再次輸入新密碼</string>
-    <string name="adjust_streak">修正連擊數</string>
-    <string name="password_changed">成功變更密碼</string>
-    <string name="assigned_stat">指定屬性</string>
-    <string name="monthly">每月</string>
-    <string name="weekly">每週</string>
-    <string name="repeats">重複</string>
-    <string name="every">每個</string>
-    <string name="scheduling">排程</string>
-    <string name="days">日</string>
-    <string name="weeks">週</string>
-    <string name="years">年</string>
-    <string name="checklist_text">清單</string>
-    <string name="new_reminder">新增提醒</string>
-    <string name="streak">連擊</string>
-    <string name="update_available">有可用的更新：%1$s (%2$d)</string>
-    <string name="need_help_header_description">到 %s 發訊息提問，讓其他玩家幫忙解惑。</string>
-    <string name="need_more_help">需要其他幫助？</string>
-    <string name="become_x">成為%s</string>
-    <string name="x_class">%s職業</string>
-    <string name="report_explanation">**只有**在貼文違反了[社群守則](https://habitica.com/static/community-guidelines)或者[服務條款](https://habitica.com/static/terms)才能檢舉。不當檢舉貼文會被視為違規行為。</string>
-    <string name="report_message_title">檢舉 %s 違反：</string>
-    <string name="reason_for_report">檢舉原因 (選填)</string>
-    <string name="mystery_sets">神秘套組</string>
-    <string name="guild_description">公會介紹</string>
-    <string name="invite_to_guild">邀請至公會</string>
-    <string name="join_guild">加入公會</string>
-    <string name="garden">花園</string>
-    <string name="i_agree_to_follow_the_guidelines">我願意遵守規範</string>
-    <string name="report_violation">檢舉違規行為</string>
-    <string name="leave_guild">退出公會</string>
-    <string name="left_guild">你退出了公會</string>
-    <string name="joined_guild">你加入了公會</string>
-    <string name="setup_task_habit_1">添加一個任務到 Habitica 裡</string>
-    <string name="setup_task_habit_1_notes">不論是一個習慣或是每日任務亦或是待辦事項</string>
-    <string name="setup_task_habit_2">點擊這裡來將它編輯為一個您想戒掉的壞習慣</string>
-    <string name="setup_task_habit_2_notes">或者在編輯頁面中刪除</string>
-    <string name="guild_summary">公會簡介</string>
-    <string name="guild_members">公會成員</string>
-    <string name="guild_bank">公會銀行</string>
-    <string name="invite_to_party">邀請至隊伍</string>
-    <string name="are_you_sure">你確定嗎？</string>
-    <string name="delete_task">刪除任務</string>
-    <string name="not_now">現在先不要</string>
-    <string name="levelup_detail_10">選擇一個符合你遊玩風格的職業，解鎖特殊技能和裝備來幫助你的冒險旅程</string>
-    <string name="levelup_title_10">職業系統解鎖！</string>
-    <string name="pin">釘選</string>
-    <string name="unpin">取消釘選</string>
-    <string name="take_me_back">返回</string>
-    <string name="sidebar_achievements">成就</string>
-    <string name="basic_achievements">基礎成就</string>
-    <string name="seasonal_achievements">季節成就</string>
-    <string name="special_achievements">特殊成就</string>
-    <string name="switch_to_list_view">切換到清單排版</string>
-    <string name="switch_to_grid_view">切換到格柵排版</string>
-    <string name="confirm_deletion">確認刪除</string>
-    <string name="new_task">新任務</string>
-    <string name="create_task">建立%s</string>
-    <string name="details">詳細內容</string>
-    <string name="share_challenge_with">分享挑戰</string>
-<string name="trillion_abbrev">兆</string>
-    <string name="cost">價格</string>
-    </resources>
+  <string name="invited_to_party_notification"><![CDATA[您受邀加入<b>%1$s</b>隊伍]]></string>
+  <string name="invited_to_private_guild"><![CDATA[您受邀加入<b>%1$s</b>私人公會]]></string>
+  <string name="invited_to_public_guild"><![CDATA[您受邀加入<b>%1$s</b>您受邀加入]]></string>
+  <string name="invited_to_quest"><![CDATA[您受邀加入<b>%1$s</b>副本]]></string>
+</resources>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index 9bd19f400..374b5f69a 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">级别：</string>
     <string name="profile_class_bonus">职业的额外奖励：</string>
     <string name="profile_allocated">已分配：</string>
-    <string name="profile_boosts">增益：</string>
     <string name="profile_private_message">私信</string>
     <string name="profile_achievements">成就</string>
-    <string name="profile_achievement_ok">了解了</string>
-    <string name="profile_qrcode_close">关闭</string>
 
 </resources>
diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml
index 8b38b397e..0081abbb7 100644
--- a/Habitica/res/values-zh/strings.sidebar.xml
+++ b/Habitica/res/values-zh/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?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">宝石&amp;开通会员</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_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">宝石&amp;开通会员</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_about">关于</string>
   <string name="sidebar_shops">商店</string>
   <string name="sidebar_stats">统计</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index 9f44b490b..3c902da87 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">用你获得的金币给你的人物购买装备！</string>
   <string name="tutorial_rewards_2">你也可以根据你的动力源创造现实中的自定义奖励。</string>
   <string name="tutorial_tasks_complete">暂时就是这么多了。如果你需要再次提醒，去看看FAQ部分。</string>
-  <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
-  <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用！</string>
-  <string name="tutorial_pets">完成现实任务后就会随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物</string>
-  <string name="tutorial_skills">技能是有强大作用的特殊能力！点击技能来释放它。使用技能需要消耗魔法值(蓝色条)，魔力可由每日签到和完成现实任务来获得。更多信息请查询FAQ！</string>
+    <string name="tutorial_skills">技能是有强大作用的特殊能力！点击技能来释放它。使用技能需要消耗魔法值(蓝色条)，魔力可由每日签到和完成现实任务来获得。更多信息请查询FAQ！</string>
   <string name="tutorial_party">在这里，你和你的朋友可以互相督促完成目标并通过完成任务组团打小怪兽！</string>
   <string name="tutorial_tavern">欢迎来到酒馆，这里是一个公开的不分年龄的聊天室！这里，可以聊聊心得，问问问题。祝您玩的愉快！</string>
-  <string name="tutorial_classes">选择成为战士、法师、医者或者盗贼！每个职业有独特的装备和技能。点击(?)查看更多！</string>
-  <string name="tutorial_stats">按灰色按钮来一次分配你的属性，或者按箭头一次加一点。</string>
+    <string name="tutorial_stats">按灰色按钮来一次分配你的属性，或者按箭头一次加一点。</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 5f48fb730..dde9e3116 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">经验值</string>
   <string name="HP_default">生命值</string>
   <string name="MP_default">魔法值</string>
-  <string name="ERR_pb_barcode">无法从条码上读取数据</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">设置</string>
-  <string name="SP_address_hint">你的自定义服务器</string>
-  <string name="SP_userID_title">用户ID</string>
+    <string name="SP_userID_title">用户ID</string>
   <string name="SP_userID_summary">你的用户ID</string>
   <string name="SP_APIToken_title">API令牌</string>
   <string name="SP_APIToken_summary">你的API令牌</string>
   <string name="Language_title">语言</string>
   <string name="Language_summary">更改 Habitica的语言</string>
-  <string name="SP_user_qr_code">你的二维码</string>
-  <string name="PS_contact_title">联系我</string>
-  <string name="unknown_error">发生错误……</string>
-  <string name="pref_account_header">账号</string>
+    <string name="PS_contact_title">联系我</string>
+    <string name="pref_account_header">账号</string>
   <string name="pref_first_day_of_the_week_title">每周的第一天</string>
   <string name="pref_first_day_of_the_week_summary">在所有的日程表中，每周的第一天</string>
   <string name="pref_reminder_header">每日任务提醒</string>
   <string name="pref_reminder_checkbox">激活提醒</string>
   <string name="pref_reminder_picker">设置提醒时间</string>
   <string name="pref_cds_header">自定义每日起始时间</string>
-  <string name="pref_cds_picker">设置每天的起始时间（用于任务结算）</string>
-  <string name="pref_push_notifications_checkbox">用户推送通知</string>
+    <string name="pref_push_notifications_checkbox">用户推送通知</string>
   <string name="push_notifications">推送通知</string>
   <string name="push_notifications_sum">设置用户推送通知</string>
   <string name="preference_push_you_won_challenge">你赢得了一项挑战！</string>
@@ -37,14 +32,8 @@
   <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="action_edit">编辑</string>
+    <string name="action_cancel">取消</string>
   <string name="login_btn">登陆</string>
   <string name="register_btn">注册</string>
   <string name="username">用户名</string>
@@ -54,32 +43,23 @@
   <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">Habitica是一个发布在Github上的开源软件</string>
-  <string name="about.rate_our_app">评价我们的应用</string>
-  <string name="about.give_us_feedback">请给我们提交建议！</string>
-  <string name="about.bugreport">反馈漏洞</string>
-  <string name="about.source_code">源代码</string>
-  <string name="repeatEvery">于每……重复</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="LoginActivityName">欢迎</string>
+    <string name="about_title">关于</string>
+  <string name="about_libraries">资源库</string>
+    <string name="about_habitica_open_source">Habitica是一个发布在Github上的开源软件</string>
+  <string name="about_rate_our_app">评价我们的应用</string>
+  <string name="about_give_us_feedback">请给我们提交建议！</string>
+  <string name="about_bugreport">反馈漏洞</string>
+  <string name="about_source_code">源代码</string>
+    <!--Network Errors-->
+    <string name="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_title">认可错误</string>
   <string name="login_validation_error_fieldsmissing">请填写所有内容。</string>
   <string name="save_changes">保存</string>
   <string name="copy">复制</string>
   <string name="notes">注释</string>
-  <string name="text">文字</string>
-  <string name="difficulty">难度</string>
+    <string name="difficulty">难度</string>
   <string name="tags">标签</string>
   <string name="trivial">琐事</string>
   <string name="easy">简单</string>
@@ -90,19 +70,8 @@
   <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="repeatables_summary_title">概要</string>
-  <string name="repeatables_title">重复</string>
-  <string name="repeatables_on_title">于……重复</string>
-  <string name="repeatables_frequency_daily">每日</string>
+    <string name="attributes">属性</string>
+    <string name="repeatables_frequency_daily">每日</string>
   <string name="repeatables_frequency_weekly">每周</string>
   <string name="repeatables_frequency_monthly">每月</string>
   <string name="repeatables_frequency_yearly">每年</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">你失去了所有的生命值！</string>
   <string name="faint_button">补满生命值 &amp; 再次尝试</string>
   <string name="filter">筛选</string>
-  <string name="profile_image">头像</string>
-  <string name="mana_price_button">%d 魔法值</string>
-  <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana">你使用了 %1$s.</string>
+    <string name="used_skill_without_mana">你使用了 %1$s.</string>
   <string name="new_checklist_item">新增清单内容</string>
-  <string name="add_checklist_item">添加</string>
-  <string name="reminder_title">记得完成你的任务</string>
-  <string name="skill_progress_title">使用技能</string>
-  <string name="coming_soon">即将推出</string>
-  <string name="chat_flag_confirmation">你确认要举报这条消息吗？</string>
-  <string name="flag_confirm">举报消息</string>
-  <string name="unlock_lvl_11">11级时解锁</string>
-  <string name="no_party_message">你没有加入任何队伍。如想加入队伍，请访问网页版。</string>
-  <string name="forgot_pw_btn">忘记密码</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="reminder_title">记得完成你的任务</string>
+    <string name="unlock_lvl_11">11级时解锁</string>
+    <string name="forgot_pw_btn">忘记密码</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>
@@ -148,24 +108,20 @@
   <string name="dailies">每日任务</string>
   <string name="todos">待办事项</string>
   <string name="rewards">奖励</string>
-  <string name="taskform.delete.title">你确定吗？</string>
-  <string name="taskform.delete.message">你确定要删除吗？</string>
-  <string name="yes">是的</string>
+    <string name="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_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">尺寸</string>
   <string name="avatar_size_slim">瘦小</string>
   <string name="avatar_size_broad">强壮</string>
   <string name="avatar_background">背景</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">支付</string>
   <string name="purchase_set_title">购买礼包 %s</string>
   <string name="due_date">截止日期</string>
-  <string name="quest.accept">接受</string>
-  <string name="quest.reject">拒绝</string>
-  <string name="quest.begin">开始探索任务</string>
-  <string name="quest.cancel">取消邀请</string>
-  <string name="quest.abort">放弃探索任务</string>
-  <string name="quest.leave">放弃任务</string>
-  <string name="quest.pending">等待中</string>
-  <string name="quest.accepted">接受了</string>
-  <string name="quest.rejected">拒绝的</string>
-  <string name="quest.participants">参与者</string>
-  <string name="version_info">版本%1$s (%2$d)</string>
+  <string name="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="version_info">版本%1$s (%2$d)</string>
   <string name="sidebar_help">帮助 &amp; FAQ</string>
   <string name="complete_tutorial">成功！</string>
   <string name="dismiss_tutorial">再次提醒我</string>
   <string name="intro_1_subtitle">欢迎来到</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
+    <string name="intro_1_description">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
   <string name="intro_2_subtitle">游戏进度</string>
   <string name="intro_2_title">生活进度</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧。</string>
@@ -198,12 +148,9 @@
   <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="next_button">下一页</string>
   <string name="skip_button">跳过</string>
-  <string name="setup_welcome_description">欢迎来到Habitica，在游戏中打怪升级的同时改善自己的真实生活。完成现实生活中的目标，解锁大量装备、宠物、任务卷轴，更多特色等你探索。</string>
-  <string name="setup_welcome_title">欢迎你</string>
-  <string name="avatar_setup_description">首先，你需要创建一个角色。之后可以随时更改。</string>
+    <string name="avatar_setup_description">首先，你需要创建一个角色。之后可以随时更改。</string>
   <string name="task_setup_description">太棒了！现在开始设定你的任务，开始赚取经验和金币吧。
 
 首先，你想改善生活中的哪一部分呢？</string>
@@ -235,38 +182,20 @@
   <string name="setup_task_creativity_1">学习以成为艺术能手</string>
   <string name="setup_task_creativity_2">进行创新项目</string>
   <string name="setup_task_creativity_3">完成创新项目</string>
-  <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！
-\n
-\n你可以通过宝石给你的账户购买更多有趣的额外物品，包括：
-\n
-\n - 角色的酷酷的服装
-\n - 好看的背景
-\n - 能获得宠物蛋的有趣的任务
-\n - 100级之前改变职业的能力
-\n
-\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的公会</string>
+    <string name="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="gems">宝石</string>
+    <string name="delete">删除</string>
   <string name="name">名称</string>
   <string name="description">描述</string>
   <string name="add_tag">添加新标签</string>
   <string name="privacy">隐私</string>
   <string name="write_message">写消息</string>
-  <string name="post">公告</string>
-  <string name="guild_search_hint">查找公会</string>
-  <string name="todo_due">到期：%s</string>
-  <string name="daily_streak">目前连击数：%d</string>
-  <string name="todo_has_duedate">任务有截止日</string>
-  <string name="battle_gear">战斗装备</string>
+    <string name="guild_search_hint">查找公会</string>
+    <string name="battle_gear">战斗装备</string>
   <string name="costume">服装</string>
   <string name="outfit_head">头部</string>
   <string name="outfit_headAccessory">头部配件</string>
@@ -279,10 +208,8 @@
   <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">当所有玩家加入或拒绝邀请时，任务会自动开始。只有%1$d你的%2$d团队成员加入了这个任务！你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
-  <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
-  <string name="ago_1day">1天前</string>
+    <string name="quest_begin_message">当所有玩家加入或拒绝邀请时，任务会自动开始。只有%1$d你的%2$d团队成员加入了这个任务！你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
+    <string name="ago_1day">1天前</string>
   <string name="ago_days">%d天前</string>
   <string name="ago_1Minute">1分钟前</string>
   <string name="ago_minutes">%d分钟前</string>
@@ -299,13 +226,9 @@
   <string name="armoireEquipment">你在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
   <string name="armoireFood">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
   <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
-  <string name="armoireNotesFull">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
-  <string name="armoireLastItem">你在魔法衣橱里找到了最后一件稀有装备。</string>
-  <string name="armoireNotesEmpty">每个月的第一个星期这里都会有新的装备，到时记得常点进来获得经验和食物！</string>
-  <string name="sell">出售 (%d金币)</string>
+    <string name="sell">出售 (%d金币)</string>
   <string name="hatch_with_potion">用孵化药水孵化</string>
-  <string name="feed_to_pet">喂养宠物</string>
-  <string name="hatch_egg">孵化宠物蛋</string>
+    <string name="hatch_egg">孵化宠物蛋</string>
   <string name="invite_party">邀请队伍</string>
   <string name="dialog_feeding">喂养%s用：</string>
   <string name="use_animal">使用</string>
@@ -316,17 +239,8 @@
   <string name="close">关闭</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你喂食了你的%s！</string>
-  <string name="notification_purchase">你购买了%s</string>
-  <string name="notification_purchase_reward">你购买了一个奖励</string>
-  <string name="sectiondrop">基本宠物</string>
-  <string name="sectionpremium">神奇药水宠物</string>
-  <string name="sectionquest">剧情任务宠物</string>
-  <string name="sectionspecial">稀有宠物</string>
-  <string name="sectionmounts">基本坐骑</string>
-  <string name="sectionpremiumMounts">神奇药水坐骑</string>
-  <string name="sectionquestMounts">剧情任务坐骑</string>
-  <string name="sectionspecialMounts">稀有坐骑</string>
-  <string name="world_quest">世界任务</string>
+    <string name="notification_purchase_reward">你购买了一个奖励</string>
+    <string name="world_quest">世界任务</string>
   <string name="inn_description">需要休息？进入Daniel的客栈并暂停Habitica的一些困难机制吧。
 \n
 \n • 未完成的每日任务不会造成伤害
@@ -345,8 +259,7 @@
   <string name="healer_description">医师们对伤害的抗性很强，也可以保护其他的人。错过的日常任务和坏习惯无法伤害他们太多，而且他们有很多回血的技能。如果你热衷于辅助其他的队友，或者是享受那种从死神手里夺取生命的快感，那就成为一名医师吧！</string>
   <string name="select_class">选择职业</string>
   <string name="opt_out_class">退出</string>
-  <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
-  <string name="class_confirmation">你确定想要成为%s吗？</string>
+    <string name="class_confirmation">你确定想要成为%s吗？</string>
   <string name="class_changed">你现在是 %s级了！</string>
   <string name="class_changed_description">你有新的默认战斗装备，你可以在装备栏换上它们！</string>
   <string name="choose_class">选择职业</string>
@@ -360,23 +273,18 @@
   <string name="invite_existing_users">邀请已存在的用户</string>
   <string name="send">发送</string>
   <string name="invite">邀请朋友</string>
-  <string name="invite_id_description">如果你的朋友们已经在使用Habitica 了，通过&lt;用户ID邀请他们 。</string>
-  <string name="invite_username_description">如果你已有朋友在使用Habitica，通过这里的用户名邀请他们。</string>
+    <string name="invite_username_description">如果你已有朋友在使用Habitica，通过这里的用户名邀请他们。</string>
   <string name="invite_email_description">如果你的朋友通过你的邮件加入Habitica，他们将自动被邀请加入你的队伍！</string>
   <string name="add_invites">添加邀请</string>
-  <string name="user_id">用户ID</string>
-  <string name="email">电子邮件</string>
-  <string name="invite_users">邀请加入队伍</string>
-  <string name="share_using">分享使用</string>
+    <string name="email">电子邮件</string>
+    <string name="share_using">分享使用</string>
   <string name="share_levelup">我在Habitica中通过改善我现实生活中的习惯到达了%d级！</string>
   <string name="share_hatched">我刚刚在Habitica中通完成我现实生活中的任务孵化了一只宠物%1$s %2$s！</string>
   <string name="share_raised">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s！</string>
   <string name="open_in_store">在应用商店中打开</string>
   <string name="change_class_confirmation">你确定想要转变职业吗？这将花费3颗宝石。</string>
   <string name="change_class_equipment_warning">提示：你无法再购买%s职业的装备了。</string>
-  <string name="leaderMessage">从%1$s来的消息</string>
-  <string name="leaderName">%1$s的会长</string>
-  <string name="confirm">确认</string>
+    <string name="confirm">确认</string>
   <string name="market">市场</string>
   <string name="timeTravelers">时光旅行</string>
   <string name="seasonalShop">四季商店</string>
@@ -384,37 +292,16 @@
   <string name="party_invite">通过邀请朋友来解锁</string>
   <string name="login_incentive">定期登录Habitica可解锁</string>
   <string name="create_account">创建帐户可以解锁</string>
-  <string name="no_gold">没有足够的金币</string>
-  <string name="no_potion">你不需要购买生命药水</string>
-  <string name="successful_purchase">购买%1$s</string>
-  <string name="purchase_confirmation_title">确认购买</string>
-  <string name="confirm_purchase_text">为 %2$s %3$s 购买 %1$s</string>
-  <string name="gem">宝石</string>
-  <string name="hourglass">沙漏</string>
-  <string name="hourglasses">沙漏</string>
-  <string name="gold_singular">金币</string>
-  <string name="gold_plural">金币</string>
+    <string name="successful_purchase">购买%1$s</string>
+    <string name="gold_plural">金币</string>
   <string name="chat_message_copied">复制到剪帖板的信息</string>
-  <string name="copy_chat_message">复制到剪贴板</string>
-  <string name="edit_tag_title">编辑按钮</string>
-  <string name="edit_tag_btn_edit">编辑</string>
-  <string name="edit_tag_btn_done">完成</string>
-  <string name="edit_tag_btn_delete">删除</string>
-  <string name="confirm_delete_tag_title">你确定吗？</string>
+    <string name="edit_tag_btn_edit">编辑</string>
+    <string name="confirm_delete_tag_title">你确定吗？</string>
   <string name="confirm_delete_tag_message">你确定要删除吗？</string>
-  <string name="filter_drawer_edit_tags">编辑按钮</string>
-  <string name="filter_drawer_filter_tags">过滤按钮</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">让别人通过此二维码邀请你</string>
-  <string name="qr_save_message">将二维码保存至</string>
-  <string name="qr_dialogue_title">你的二维码</string>
-  <string name="download">下载</string>
-  <string name="send_new_message">发送新消息</string>
-  <string name="choose_recipient_title">选择消息接收者</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">选择消息接收者</string>
   <string name="action_continue">继续</string>
-  <string name="scan_qr_code">扫描二维码</string>
-  <string name="enter_recipient_uuid">输入接受者的用户ID</string>
-  <string name="invited_to_party">你被邀请加入一个队伍！</string>
+    <string name="invited_to_party">你被邀请加入一个队伍！</string>
   <string name="stats_widget_label">Habitica状态</string>
   <string name="add_task">添加任务</string>
   <string name="add_habit">添加习惯</string>
@@ -425,15 +312,14 @@
   <string name="widget_habit_button">Habitica完成习惯</string>
   <string name="widget_dailies">Habitica每日任务</string>
   <string name="widget_todo_list">Habitica 待办事项</string>
-  <string name="widget_add_task">Habitica增加任务</string>
-  <string name="google_services_missing">没有找到Google play服务。</string>
-  <string name="gem.purchase.toolbartitle">购买</string>
-  <string name="gem.purchase.title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
-  <string name="gem.purchase.subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
-  <string name="gem.purchase.listitem1">角色形象的炫酷装扮</string>
-  <string name="gem.purchase.listitem2">超棒的背景</string>
-  <string name="gem.purchase.listitem3">任务会奖励你宠物蛋</string>
-  <string name="gem.purchase.listitem4">100级前改变你职业的能力</string>
+    <string name="google_services_missing">没有找到Google play服务。</string>
+  <string name="gem_purchase_toolbartitle">购买</string>
+  <string name="gem_purchase_title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
+  <string name="gem_purchase_subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
+  <string name="gem_purchase_listitem1">角色形象的炫酷装扮</string>
+  <string name="gem_purchase_listitem2">超棒的背景</string>
+  <string name="gem_purchase_listitem3">任务会奖励你宠物蛋</string>
+  <string name="gem_purchase_listitem4">100级前改变你职业的能力</string>
   <string name="support_habitica">支持Habitica</string>
   <string name="skill_transformation_use">使用</string>
   <string name="hatching_market_info">没有得到想要的掉落物品？来市场瞧瞧！</string>
@@ -447,34 +333,34 @@
   <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_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="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">商人Alexander可以按每个宝石20金币的价格向你出售宝石！
+  <string name="subscribe_listitem1_description">商人Alexander可以按每个宝石20金币的价格向你出售宝石！
 \n
 \n他每个月的初始进货量是25个宝石，进货量会随着您的捐助时长而增加！
 \n
 \n 每三个月宝石上限就会增加5，最大直到1个月50颗宝石！</string>
-  <string name="subscribe.listitem2.description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
-  <string name="subscribe.listitem3.description">使完成的待办事项和任务的历史记录保留更长时间。</string>
-  <string name="subscribe.listitem4.description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
-  <string name="subscribe1month.gemcap">25 宝石</string>
-  <string name="subscribe3month.gemcap">30 宝石</string>
-  <string name="subscribe6month.gemcap">35 宝石</string>
-  <string name="subscribe12month.gemcap">45 宝石</string>
+  <string name="subscribe_listitem2_description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
+  <string name="subscribe_listitem3_description">使完成的待办事项和任务的历史记录保留更长时间。</string>
+  <string name="subscribe_listitem4_description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
+  <string name="subscribe1month_gemcap">25 宝石</string>
+  <string name="subscribe3month_gemcap">30 宝石</string>
+  <string name="subscribe6month_gemcap">35 宝石</string>
+  <string name="subscribe12month_gemcap">45 宝石</string>
   <string name="subscription_hourglasses">+%d 神秘沙漏</string>
   <string name="payment_method">付款方式</string>
   <string name="subscription">捐助</string>
   <string name="active">活跃的</string>
   <string name="cancel_subscription">取消订阅</string>
-  <string name="cancel_subscription_google.description">不想再继续捐助了？你可以在Google应用商店里的“我的应用程序”部分找到退订选项。</string>
-  <string name="cancel_subscription_notgoogle.description">不想再继续捐助了？由于您的付款方式，您只能通过这个网站停止捐助。点击下面的按钮，在您的浏览器中打开站点！</string>
+  <string name="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>
@@ -489,57 +375,40 @@
   <string name="twelve_months">12个月</string>
   <string name="subscribe_prompt_thanks">通过捐助你会获得这些好处：</string>
   <string name="subscription_status">捐助状态</string>
-  <string name="byLeader">由 %s</string>
-  <string name="challenge_details">挑战细节</string>
-  <string name="challenge_leave_title">放弃挑战</string>
+    <string name="challenge_leave_title">放弃挑战</string>
   <string name="challenge_leave_text">你是否确定想放弃这个挑战“%s”？</string>
   <string name="challenge_remove_tasks_title">删除任务</string>
   <string name="challenge_remove_tasks_text">你确定要删除这个任务吗？</string>
   <string name="remove_tasks">删除</string>
   <string name="keep_tasks">保持</string>
   <string name="my_challenges">我的挑战</string>
-  <string name="public_challenges">公共挑战</string>
-  <string name="challenges">挑战</string>
-  <string name="daily">每日任务</string>
+    <string name="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="challenge">挑战</string>
+    <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
   <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</string>
   <string name="check_the_public_challenge_tab">点击“公会挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
-  <string name="add_reminder">增加提醒</string>
-  <string name="warning">警告</string>
-  <string name="open_settings">打开设置</string>
-  <string name="dont_keep_activities_warning">看来您将开发者选项 \"不要保留活动” 英语: \Don\'t keep Activities\ 打开了。启用这个选项将会对应用造成不必要的影响。我们建议您将其关闭。</string>
-  <string name="inbox">消息</string>
-  <string name="FAQ">常见问题</string>
-  <string name="special">特殊的</string>
+    <string name="inbox">消息</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="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="checkInRewardEarned">由于你投入改善你的生活，你得到%1$s。</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">你的下一次奖赏在签到%1$d后解锁</string>
   <string name="pending_approval">等待审批的任务</string>
   <string name="filters">过滤器</string>
   <string name="done">完成</string>
-  <string name="group_tasks_edit_description">团队任务无法被编辑。</string>
-  <string name="group_tasks_edit_title">无法编辑此任务</string>
-  <string name="groups">团队</string>
+    <string name="groups">团队</string>
   <string name="all">所有</string>
   <string name="none">无</string>
   <string name="owned">已拥有的</string>
   <string name="not_owned">未拥有的</string>
-  <string name="new_game">新
-游戏</string>
-  <string name="login_btn_fb">Facebook登录</string>
+    <string name="login_btn_fb">Facebook登录</string>
   <string name="login_btn_google">Google登录</string>
   <string name="action_back">背部</string>
   <string name="welcome_text">哦，你一定是新来的。我是Justin，你在Habitica的向导。
@@ -572,7 +441,6 @@
   <string name="maintenance">维护</string>
   <string name="reload_content">重新加载内容</string>
   <string name="dailyDueDefaultView">默认设置每日任务出现于即将到期页面</string>
-  <string name="repeat_summary">每%2$s%3$s%4$s重复%1$s</string>
   <string name="no_billing_gems">你的设备没有任何支持的支付方式。如果你要购买宝石，请使用Habitica网站。</string>
   <string name="no_billing_subscriptions">你的设备没有任何支持的支付方式。如果你要订阅，请使用Habitica网站。</string>
   <string name="save">保存</string>
@@ -580,8 +448,7 @@
   <string name="gem_reward">钻石奖励</string>
   <string name="tasks">任务</string>
   <string name="create_challenge">创建挑战</string>
-  <string name="edit_challenge">编辑</string>
-  <string name="challenge_create_error_tavern_one_gem">你需要至少一个宝石以便创建一个公开挑战。</string>
+    <string name="challenge_create_error_tavern_one_gem">你需要至少一个宝石以便创建一个公开挑战。</string>
   <string name="challenge_create_error_enough_gems">你没有足够的宝石来创建挑战。</string>
   <string name="identify_your_challenge_with_a_tag">用一个简短的名字让你的挑战容易识别</string>
   <string name="challenge_create_error_tag">你需要为你的挑战起个简短的名字。</string>
@@ -591,37 +458,31 @@
   <string name="new_challenge_title">新挑战名</string>
   <string name="ownership">所有者</string>
   <string name="inn">酒馆</string>
-  <string name="system">系统</string>
-  <string name="start_quest">开始新的探索任务</string>
+    <string name="start_quest">开始新的探索任务</string>
   <string name="leave_party">离开队伍</string>
   <string name="party_description">队伍介绍</string>
-  <string name="abort_confirmation">你是否确定要放弃这个任务吗?如果你放弃，团队中所有人也将被终止任务，并且所有的任务进展都会丢失。而探索任务卷轴将重新返回给探索任务拥有者。</string>
-  <string name="leave_quest_confirmation">你是否确定想放弃这个进行中的探索任务？如此，你所有的任务进度都将丢失。</string>
-  <string name="number_participants">%1$d参与者</string>
+    <string name="number_participants">%1$d参与者</string>
   <string name="welcome_back">欢迎回来</string>
   <string name="yesterdaililes_prompt">昨天你完成了这些每日任务吗？</string>
   <string name="start_day">开始我的一天</string>
   <string name="leave_party_confirmation">是否确定离开队伍？</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">你的下一次奖赏将在签到%d次后解锁</string>
-  <string name="pending">等待中</string>
+    <string name="pending">等待中</string>
   <string name="accepted">已接受</string>
   <string name="declined">已拒绝</string>
   <string name="participants">参与者</string>
   <string name="invitations">邀请</string>
-  <string name="quest_leader_header" formatted="false">由%s发起</string>
+  <string name="quest_leader_header">由%s发起</string>
   <string name="quest_abort_message">你是否确定要放弃这个任务吗?如果你放弃，团队中所有人也将被终止任务，并且所有的任务进展都会丢失。而探索任务卷轴将重新返回给探索任务拥有者。</string>
-  <string name="loading">加载中…</string>
-  <string name="reloading_content">重新加载内容</string>
-  <string name="your_balance">你的余额：</string>
-  <string name="available_until" formatted="false">到%s可用</string>
-  <string name="gems_left_nomax" formatted="false">每月宝石：还剩%d 颗</string>
+    <string name="reloading_content">重新加载内容</string>
+    <string name="available_until">到%s可用</string>
+  <string name="gems_left_nomax">每月宝石：还剩%d 颗</string>
   <string name="health">生命值</string>
   <string name="collect">收集</string>
   <string name="rage_meter">怒气值</string>
   <string name="boss_quest">打怪任务</string>
   <string name="collection_quest">收藏任务</string>
-  <string name="experience_reward" formatted="false">%d经验值</string>
-  <string name="gold_reward" formatted="false">%d金币</string>
+  <string name="experience_reward">%d经验值</string>
+  <string name="gold_reward">%d金币</string>
   <string name="quest_owner_rewards">探索任务拥有者奖励</string>
   <string name="str_abbrv">力量</string>
   <string name="per_abbrv">感知</string>
@@ -635,8 +496,7 @@
   <string name="reset_account_confirmation">重置我的账号</string>
   <string name="delete_account_confirmation">删除我的账户</string>
   <string name="danger_zone">危险区域</string>
-  <string name="nevermind">打扰了</string>
-  <string name="resetting_account">重置账号</string>
+    <string name="resetting_account">重置账号</string>
   <string name="deleting_account">删除账号</string>
   <string name="insufficientGold">你还需要完成更多任务才能购买这个物品！</string>
   <string name="insufficientGems">你需要更多的宝石来购买这个物品！</string>
@@ -667,8 +527,7 @@
   <string name="authentication_summary">修改认证方式。</string>
   <string name="change_password">修改密码</string>
   <string name="change_email">修改邮箱</string>
-  <string name="change_login_name">更换你的登录名</string>
-  <string name="change_username">修改用户名</string>
+    <string name="change_username">修改用户名</string>
   <string name="change">确定修改</string>
   <string name="character_level">角色等级</string>
   <string name="auto_allocate_points">自动分配点数</string>
@@ -689,7 +548,7 @@
   <string name="distribute_class">根据职业分配</string>
   <string name="distribute_task">根据任务活动分配</string>
   <string name="no_points_to_allocate">没有可以分配的属性点</string>
-  <string name="points_to_allocate" formatted="false">%d点可以分配</string>
+  <string name="points_to_allocate">%d点可以分配</string>
   <string name="distribute_evenly_help">给每项属性分配等量的属性点。</string>
   <string name="distribute_class_help">把更多属性点分配给你的职业最需要的属性。</string>
   <string name="allocating_points">分配属性点</string>
@@ -698,8 +557,7 @@
   <string name="classless">无职业</string>
   <string name="class_equipment_shop_dialog">这个物品只对特定职业开放。\n你可以在设置改变你的职业。</string>
   <string name="class_gear_disclaimer">你只能购买当前职业的装备</string>
-  <string name="available_stats" formatted="false">%d分</string>
-  <string name="tavern_description">欢迎来到客栈！ 拉张凳子坐下聊天，或者暂停任务休息一下。</string>
+    <string name="tavern_description">欢迎来到客栈！ 拉张凳子坐下聊天，或者暂停任务休息一下。</string>
   <string name="check_into_inn">入住客栈</string>
   <string name="community_guidelines">社区守则</string>
   <string name="view_community_guidelines">查看社区守则</string>
@@ -712,13 +570,11 @@
   <string name="navigation_drawer_open">打开导航栏</string>
   <string name="navigation_drawer_close">关闭导航栏</string>
   <string name="world_boss">世界Boss</string>
-  <string name="world_boss_art">boss图像</string>
-  <string name="boss_art">boss图像</string>
+    <string name="boss_art">boss图像</string>
   <string name="world_boss_description">世界boss简介</string>
-  <string name="rage_strike_count" formatted="false">暴走：%d/%d</string>
+  <string name="rage_strike_count">暴走：%d/%d</string>
   <string name="strike_description_title">什么是暴击？</string>
-  <string name="strike_description_subtitle">Boss可以有3次暴走</string>
-  <string name="strike_active_title" formatted="false">%s被攻击了！</string>
+    <string name="strike_active_title">%s被攻击了！</string>
   <string name="questShop">用户商店</string>
   <string name="market_owner_long">商人Alex</string>
   <string name="tavern_owner_long">客栈老板Daniel</string>
@@ -727,17 +583,12 @@
   <string name="active_world_boss">活跃的世界boss</string>
   <string name="no_party_title">在队伍中玩Habitica </string>
   <string name="join_party_title">想要加入队伍？</string>
-  <string name="create_party_website">打开网页来创建队伍</string>
-  <string name="id_copied">ID已复制到剪贴板</string>
-  <string name="insufficientSubscriberGemsTitle">已达到每月宝石上限</string>
-  <string name="chat_message">聊天信息</string>
-  <string name="world_boss_description_title">世界boss是什么？</string>
+    <string name="world_boss_description_title">世界boss是什么？</string>
   <string name="world_boss_description_1">完成任务就会伤害boss</string>
   <string name="questShop_owner_long">探索任务向导Ian</string>
   <string name="rage_attack">愤怒攻击:</string>
   <string name="report">报告</string>
-  <string name="like">赞</string>
-  <string name="reply">回复</string>
+    <string name="reply">回复</string>
   <string name="challenge_prize">挑战奖品</string>
   <string name="created_challenge">新建挑战</string>
   <string name="public_challenge">公开挑战</string>
@@ -753,36 +604,23 @@
     <string name="thousand_abbrev">千</string>
     <string name="million_abbrev">百万</string>
     <string name="billion_abbrev">十亿</string>
-    <string name="gems_left_max" formatted="false">每月宝石：剩余 %1$d/%2$d</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+    <string name="gems_left_max">每月宝石：剩余 %1$d/%2$d</string>
+    <string name="quest_reward_count">%1$s x%2$d</string>
     <string name="delete_oauth_account_description">你确定吗？这个操作会永久删除你的账户，无法恢复！你需要重新注册才能再使用Habitica。剩余或者已经消费的宝石都无法退款，如果你已经下定决心，点击下方的删除按钮。</string>
     <string name="forgot_password_confirmation">如果我们的记录里有你的电子邮件地址，重设密码的邮件已经发过去啦。</string>
     <string name="ok">好的</string>
     <string name="distribute_task_help">根据你已完成任务的关联属性：力量，智力，体质和感知来分配点数。</string>
-    <string name="toogle_emojis">切换Emoji</string>
     <string name="staff_moderators">工作人员和管理员</string>
-    <string name="pending_strike_description">攻击尚未发生！
-\n世界Boss会在暴走值满值时攻击一个商人。持续完成每日任务来避免此事发生！</string>
     <string name="pending_strike_title">即将造成的攻击</string>
-    <string name="strike_description_description">如果有玩家忘了做每日任务，这个进度条就会前进，如果进度条达到上限，DysHeartener就会释放惊天动地级别的心碎攻击，还会随机攻击Habitica的一个店主，所以别忘了完成你的任务！</string>
-    <string name="pending_strike_subtitle">攻击还未发生！</string>
-    <string name="strike_active_subtitle" formatted="false">%s 心碎了！</string>
-    <string name="strike_active_description" formatted="false">我们心爱的 %s 在 %s 攻击 %s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
+    <string name="strike_active_description">我们心爱的 %s 在 %s 攻击 %s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
     <string name="no_party_description">和朋友一同完成任务或者独自出击。和怪物战斗，创建挑战，能力越大，责任越大。</string>
     <string name="join_party_description">把下方的用户名给一个队伍成员，这样他们就能邀请你加入了</string>
-    <string name="join_party_description_id">把你的UserID给他们，或者让他们扫你的QR码来邀请你</string>
     <string name="insufficientSubscriberGems">你已经买空了这个月所有的宝石限额！每月可购买的宝石将于当月前三天内上架，感谢你开通会员！</string>
-    <string name="world_boss_description_description">世界级Boss是全体玩家一同攻略的特别活动，团结一致，用任务来打倒这个强力Boss！
-\n完成任务就可以对Boss造成伤害
-\n如果你没有完成任务，Boss不会攻击你，但是会累计怒气值，一旦怒气值达到上限，Boss就会随机攻击一个NPC店主！
-\n你可以同时挑战一般的副本Boss，伤害对两者同时有效
-\n在酒馆可以看到Boss攻略进度和Boss的怒气攻击</string>
     <string name="world_boss_description_intro">世界Boss是一個全体玩家一同参与的特殊活动，大家一起团结一致通过完成任务来打败这个强力的怪物！</string>
     <string name="world_boss_description_2">Boss不会因为你没完成任务而攻击你，但是会积累怒气值，如果怒气值蓄满，Boss会随机攻击一个店主！</string>
     <string name="world_boss_description_3">你可以同时挑战普通任务的Boss们，伤害对两者都有效</string>
     <string name="world_boss_description_4">在酒馆可以看到Boss攻略进度和怒气伤害</string>
-    <string name="world_boss_action_prompt" formatted="false">打败Boss就能获得特殊奖励！快来从%s的手里拯救Habitica吧！</string>
-    <string name="world_boss_description_subtitle">%s 发动了攻击！</string>
+    <string name="world_boss_action_prompt">打败Boss就能获得特殊奖励！快来从%s的手里拯救Habitica吧！</string>
     <string name="seasonalShop_owner_long">季节女巫</string>
     <string name="tavern_description_world_boss">噢我亲爱的老伙计，不用担心下面的怪物，这里仍然是一个安全的避风港，来聊聊天吧。</string>
     <string name="challenge_categories">挑战类型</string>
@@ -810,16 +648,14 @@
     <string name="total_checkins">总签到数</string>
     <string name="usernamePromptTitle">是时候设置用户名了！</string>
     <string name="usernamePromptBody">现在用户名就是登录名，同时用户名还用于邀请、聊天版上@你，还有私信。</string>
-    <string name="usernamePromptWiki">如果你想了解更多关于变动的信息， <a href="https://habitica.wikia.com/wiki/Player_Names">访问我们的百科</a></string>
-    <string name="confirmUsername">确认用户名</string>
-    <string name="usernamePromptDisclaimer">用户名应该符合我们的<a href="https://habitica.com/static/terms">服务协议</a>以及<a href="https://habitica.com/static/community-guidelines">社区准则</a>。如果你之前没有设置登录名，你的用户名会自动生成。</string>
+    <string name="usernamePromptWiki">如果你想了解更多关于变动的信息， <a href="https://habitica.wikia_com/wiki/Player_Names">访问我们的百科</a></string>
+    <string name="usernamePromptDisclaimer">用户名应该符合我们的<a href="https://habitica.com/static/terms">服务协议</a>以及<a href="https://habitica_com/static/community-guidelines">社区准则</a>。如果你之前没有设置登录名，你的用户名会自动生成。</string>
     <string name="confirm_username_title">你确定要用这个名字吗？</string>
     <string name="confirm_username_description">用户名一经确认就会显示在邀请，@提到你和私信中。你随时都可以在设置里修改用户名。</string>
     <string name="cancel">取消</string>
     <string name="confirm_username">确认用户名</string>
     <string name="username_not_confirmed">用户名未确认</string>
     <string name="username_confirmed">用户名已确认</string>
-    <string name="username_level">\@%s ・等级 %d</string>
     <string name="enter_recipient_username">输入收信人的@ 用户名</string>
     <string name="username_copied">用户名已复制到剪贴板</string>
     <string name="welcomeNameTitle">我们应该怎么称呼你呢？</string>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index aba07135f..cf1a55d25 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -8,6 +8,8 @@
     <attr name="textColorPrimary" format="color" />
     <attr name="textColorSecondary" format="color" />
     <attr name="textColorPrimaryDark" format="color" />
+    <attr name="barColor" format="color" />
+    <attr name="taskFormTint" format="color" />
     <attr name="textColorSecondaryDark" format="color" />
     <attr name="statsColor" format="color" />
     <attr name="statsTitle" format="string" />
@@ -29,7 +31,6 @@
         <attr name="gemAmount" format="integer" />
         <attr name="priceText" format="string" />
         <attr name="gemDrawable" format="integer" />
-        <attr name="showSeedsPromo" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="MaxHeightLinearLayout">
diff --git a/Habitica/res/values/bools.xml b/Habitica/res/values/bools.xml
index dad6c5eeb..a6b3daec9 100644
--- a/Habitica/res/values/bools.xml
+++ b/Habitica/res/values/bools.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="is_portrait_mode">true</bool>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.classes.xml b/Habitica/res/values/colors.classes.xml
index fa89e2749..a6b3daec9 100644
--- a/Habitica/res/values/colors.classes.xml
+++ b/Habitica/res/values/colors.classes.xml
@@ -1,7 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="class_healer">@color/yellow_100</color>
-    <color name="class_warrior">@color/red_100</color>
-    <color name="class_wizard">@color/blue_100</color>
-    <color name="class_rogue">@color/brand_100</color>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.contributor.xml b/Habitica/res/values/colors.contributor.xml
index c45043d68..d5d968c40 100644
--- a/Habitica/res/values/colors.contributor.xml
+++ b/Habitica/res/values/colors.contributor.xml
@@ -10,6 +10,4 @@
     <color name="contributor.7">#167e87</color>
     <color name="contributor.mod">#277eab</color>
     <color name="contributor.staff">#6133b4</color>
-    <color name="contributor.npc">#000</color>
-    <color name="contributor.npc.font">#00FF00</color>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index bd2e4b134..24a4143d8 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -15,16 +15,20 @@
     <color name="maroon_100">#DE3F3F</color>
     <color name="maroon_50">#C92B2B</color>
     <color name="maroon_10">#B01515</color>
+    <color name="maroon_5">#7D0C0C</color>
 
     <color name="red_500">#ffb6b8</color>
     <color name="red_100">#FF6165</color>
     <color name="red_50">#F74E52</color>
     <color name="red_10">#F23035</color>
+    <color name="red_5">#BF262B</color>
+    <color name="red_1">#8C1C20</color>
 
     <color name="orange_500">#ffc8a7</color>
     <color name="orange_100">#FF944C</color>
     <color name="orange_50">#FA8537</color>
     <color name="orange_10">#F47825</color>
+    <color name="orange_5">#A85219</color>
 
     <color name="yellow_500">#fedead</color>
     <color name="yellow_100">#FFBE5D</color>
@@ -42,6 +46,7 @@
     <color name="teal_100">#3BCAD7</color>
     <color name="teal_50">#34B5C1</color>
     <color name="teal_10">#26A0AB</color>
+    <color name="teal_5">#1A7078</color>
 
     <color name="blue_500">#a9dcf6</color>
     <color name="blue_100">#50B5E9</color>
@@ -62,38 +67,20 @@
 
     <color name="gray_600_30">#4cedecee</color>
 
-    <color name="completed">#D9D9D9</color>
-    <color name="completed_btn">#989898</color>
-
     <color name="hpColor">@color/red_100</color>
-    <color name="hpColorBackground">#fcf0f0</color>
-    <color name="hpColorForeground">#250808</color>
     <color name="xpColor">@color/yellow_100</color>
-    <color name="xpColorBackground">#fffbf0</color>
-    <color name="xpColorForeground">#2e2200</color>
     <color name="mpColor">@color/blue_100</color>
-    <color name="mpColorBackground">#eff4fd</color>
-    <color name="mpColorForeground">#051228</color>
-
-    <color name="changelog.note">#ffcf42</color>
 
     <color name="colorPrimary">@color/brand_300</color>
     <color name="colorPrimaryDark">@color/brand_50</color>
     <!-- text -->
-    <color name="textColorDark">#FFFFFF</color>
     <color name="textColorSecondaryDark">@color/brand_500</color>
     <color name="textColorLight">#212121</color>
-    <color name="textColorSecondaryLight">#727272</color>
 
     <!-- Cards -->
-    <color name="stroke">@color/gray_500</color>
     <color name="text_light">#66000000</color>
     <color name="card_text">@color/gray_200</color>
     <color name="card_title_text">@color/gray_100</color>
-    <color name="card_light_text">@color/gray_300</color>
-    <color name="card_grid_text">@color/gray_100</color>
-    <color name="card_separator">@color/gray_600</color>
-    <color name="card_border">@color/gray_500</color>
 
     <!-- dialog -->
     <color name="primary_text_light">#000000</color>
@@ -102,13 +89,9 @@
 
     <!--  clock styled weekdays -->
     <color name="days_gray">#ffb5b5b5</color>
-    <color name="days_black">#FF000000</color>
 
-    <color name="btn_separator">@color/gray_300</color>
     <color name="white">#ffffff </color>
 
-    <color name="checkbox_tint_color">@color/gray_500</color>
-
     <color name="cell_separator">@color/gray_400</color>
     <color name="checklist_separator">@color/gray_600</color>
     <color name="task_gray">@color/gray_400</color>
@@ -122,7 +105,6 @@
     <color name="preference_fallback_accent_color">@color/colorAccent</color>
     <!-- buttons -->
     <color name="btn_success">@color/green_10</color>
-    <color name="btn_warning">@color/yellow_10</color>
     <color name="btn_danger">@color/red_10</color>
 
     <color name="widget_background">#c8432874</color>
@@ -130,7 +112,6 @@
     <color name="gem_view_background">@color/habit_inactive_gray</color>
     <color name="task_border_gray">#1a000000</color>
     <color name="task_secondary_text">#B2B2B2</color>
-    <color name="header_class_name">#CCBEED</color>
     <color name="gem_icon_color">#24cc8f</color>
     <color name="subscription_description_text">#b1000000</color>
     <color name="pill_gray">#efefef</color>
@@ -139,7 +120,6 @@
     <color name="white_75_alpha">#bfffffff</color>
     <color name="white_50_alpha">#7fffffff</color>
     <color name="white_15_alpha">#26ffffff</color>
-    <color name="black_5_alpha">#0b000000</color>
     <color name="black_10_alpha">#16000000</color>
     <color name="black_20_alpha">#33000000</color>
     <color name="black_50_alpha">#89000000</color>
@@ -160,7 +140,6 @@
     <color name="hair_blond">#CFA925</color>
     <color name="hair_red">#EC720E</color>
     <color name="hair_black">#313131</color>
-    <color name="gold">#ee9109</color>
     <color name="reward_buy_button_bg">#4cfedead</color>
     <color name="ic_launcher_background">#331960</color>
     <color name="scrollbarThumb">@color/gray_500</color>
@@ -168,8 +147,5 @@
     <color name="setup_background">#efeff4</color>
     <color name="setup_label_background">#fafaff</color>
 
-    <color name="bb_inActiveBottomBarItemColor">#747474</color>
-    <color name="bb_darkBackgroundColor">#212121</color>
-    <color name="bb_tabletRightBorderDark">#505050</color>
     <color name="dark_brown">#794b00</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index ed99b9d94..bd86cdbb9 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -3,10 +3,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">8dp</dimen>
-    <dimen name="card_vertical_padding">16dip</dimen>
     <dimen name="card_horizontal_padding">4dip</dimen>
 
-    <dimen name="card_large_text">25.0sp</dimen>
     <dimen name="card_medium_text">18.0sp</dimen>
     <dimen name="card_small_text">14.0sp</dimen>
     <dimen name="card_padding">12dp</dimen>
@@ -23,25 +21,10 @@
     <dimen name="avatar_height">147dp</dimen>
     <dimen name="avatar_header_width">108dp</dimen>
     <dimen name="avatar_header_height">113dp</dimen>
-    <dimen name="header_height">70dp</dimen>
-
-    <dimen name="new_task_bar_size">48dp</dimen>
-    <dimen name="new_task_bat_btn_width">48dp</dimen>
-    <dimen name="new_task_bat_btn_padding">8dp</dimen>
-    <dimen name="PB_marginBottom">-10dp</dimen>
-    <dimen name="btn_separator_margin">4dip</dimen>
-
-    <dimen name="list_preferred_item_height">48dp</dimen>
-    <dimen name="minus_plus_buttonsize">65dp</dimen>
-    <dimen name="view_layout_margin">4dp</dimen>
-    <dimen name="row_size">58dp</dimen>
-    <dimen name="btn_height_reward">50dp</dimen>
 
     <dimen name="quest_image_width">219dp</dimen>
-    <dimen name="quest_image_height">200dp</dimen>
 
     <!-- Widget -->
-    <dimen name="widget_bar_horizontal_margin">20dp</dimen>
 
     <dimen name="button_width">54dp</dimen>
     <dimen name="button_compact_width">50dp</dimen>
@@ -61,16 +44,12 @@
     <dimen name="grid_item_margin">6dp</dimen>
     <dimen name="avatar_small_width">90dp</dimen>
     <dimen name="avatar_small_height">90dp</dimen>
-    <dimen name="avatar_compact_width">114dp</dimen>
-    <dimen name="avatar_compact_height">114dp</dimen>
     <dimen name="customization_width">100dp</dimen>
     <dimen name="gear_image_size">68dp</dimen>
     <dimen name="row_padding">12dp</dimen>
     <dimen name="row_title_size">16sp</dimen>
     <dimen name="row_text_size">14sp</dimen>
     <dimen name="row_title_bottommargin">2dp</dimen>
-    <dimen name="drawer_section_item_text">12sp</dimen>
-    <dimen name="material_drawer_section_vertical_padding">4dp</dimen>
     <dimen name="pet_width">120dp</dimen>
     <dimen name="bottom_menu_padding">28dp</dimen>
     <dimen name="pet_image_width">81dp</dimen>
@@ -78,12 +57,8 @@
     <dimen name="shop_height">124dp</dimen>
     <dimen name="bar_icon_padding">10dp</dimen>
     <dimen name="task_text_padding">16dp</dimen>
-    <dimen name="task_text_compactpadding">4dp</dimen>
-    <dimen name="task_right_border_width">5dp</dimen>
     <dimen name="header_bar_spacing">7dp</dimen>
-    <dimen name="habit_circle_background_size">40dp</dimen>
     <dimen name="bar_size_slim">13dp</dimen>
-    <dimen name="widget_rounding">5dp</dimen>
 
     <dimen name="spacing_small">4dp</dimen>
     <dimen name="spacing_large">16dp</dimen>
@@ -92,15 +67,12 @@
 
     <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">10dp</dimen>
     <dimen name="pill_vertical_padding">2dp</dimen>
-    <dimen name="button_padding">32dp</dimen>
     <dimen name="button_padding_small">16dp</dimen>
     <dimen name="button_padding_vertical_small">4dp</dimen>
 
     <dimen name="dialog_marginLeftRight">24dp</dimen>
-    <dimen name="dialog_marginTopBottom">24dp</dimen>
     <dimen name="login_intro_button_size">126dp</dimen>
     <dimen name="diamond_button_height">40dp</dimen>
     <dimen name="setup_customization_size">56dp</dimen>
@@ -109,7 +81,6 @@
     <dimen name="content_border">18dp</dimen>
 	<dimen name="content_section_spacing">21dp</dimen>
 	<dimen name="header_spacing">6dp</dimen>
-    <dimen name="shopitem_width">84dp</dimen>
     <dimen name="shopitem_status_size">24dp</dimen>
     <dimen name="shopitem_image_size">68dp</dimen>
     <dimen name="shop_scene_height">124dp</dimen>
@@ -120,7 +91,6 @@
 
     <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
          https://developer.android.com/design/patterns/navigation-drawer.html -->
-    <dimen name="navigation_drawer_width">240dp</dimen>
     <dimen name="drawer_padding">16dp</dimen>
     <dimen name="snackbar_image_size">46dp</dimen>
     <dimen name="bullet_size">6dp</dimen>
@@ -133,15 +103,11 @@
     <dimen name="customization_drawer_caret_margin">91dp</dimen>
     <dimen name="content_inset">21dp</dimen>
     <dimen name="header_border_spacing">16dp</dimen>
-    <dimen name="login_field_width">300dp</dimen>
 
-    <dimen name="bb_height">65dp</dimen>
-    <dimen name="bb_default_elevation">8dp</dimen>
-    <dimen name="bb_fake_shadow_height">4dp</dimen>
     <dimen name="button_height">38dp</dimen>
     <dimen name="button_height_small">24dp</dimen>
-    <dimen name="button_text_size">16sp</dimen>
     <dimen name="alert_side_padding">26dp</dimen>
     <dimen name="downwards_drop_shadow_height">16dp</dimen>
     <dimen name="collapsible_section_padding">12dp</dimen>
+    <dimen name="widget_rounding">5dp</dimen>
 </resources>
diff --git a/Habitica/res/values/ids.xml b/Habitica/res/values/ids.xml
index 3403bb0e0..a6b3daec9 100644
--- a/Habitica/res/values/ids.xml
+++ b/Habitica/res/values/ids.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="bb_bottom_bar_color_id" type="id"/>
-    <item name="bb_bottom_bar_appearance_id" type="id"/>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index 281e750a3..118966187 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--  Prefs -->
-    <string name="SP_address" translatable="false">ServerAddress</string>
     <string name="SP_userID" translatable="false">UserID</string>
     <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://habitica.com</string>
 
     <!-- Local notification actions -->
@@ -15,9 +12,10 @@
     <string name="reject_guild_invite" translatable="false">REJECT_GUILD_INVITE</string>
     <string name="accept_quest_invite" translatable="false">ACCEPT_QUEST_INVITE</string>
     <string name="reject_quest_invite" translatable="false">REJECT_QUEST_INVITE</string>
+    <string name="group_message_reply" translatable="false">GROUP_MESSAGE_REPLY</string>
+    <string name="inbox_message_reply" translatable="false">INBOX_MESSAGE_REPLY</string>
+    <string name="complete_task_action" translatable="false">COMPLETE_TASK</string>
 
-    <string name="qr_album_name" translatable="false">habitica</string>
-    <string name="qr_file_name" translatable="false"> habitrpg-qr-code.jpg</string>
     <string name="habitica_user_count" translatable="false">2,000,000</string>
     <string name="brand_name" translatable="false">Habitica</string>
 
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index 426adfe57..0c2734e1c 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_qrcode_close">Close</string>
 
 </resources>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index ce47d1527..cd9e9b0d1 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sidebar.tasks">Tasks</string>
-    <string name="sidebar.skills">Skills</string>
-    <string name="sidebar.section.social">Social</string>
-    <string name="sidebar.inbox">Messages</string>
-    <string name="sidebar.tavern">Tavern</string>
-    <string name="sidebar.party">Party</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>
-    <string name="sidebar.avatar">Avatar</string>
-    <string name="sidebar.equipment">Equipment</string>
-    <string name="sidebar.stable">Stable</string>
-    <string name="sidebar.news">News</string>
-    <string name="sidebar.settings">Settings</string>
-    <string name="sidebar.about">About</string>
+    <string name="sidebar_tasks">Tasks</string>
+    <string name="sidebar_skills">Skills</string>
+    <string name="sidebar_section_social">Social</string>
+    <string name="sidebar_inbox">Messages</string>
+    <string name="sidebar_tavern">Tavern</string>
+    <string name="sidebar_party">Party</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>
+    <string name="sidebar_avatar">Avatar</string>
+    <string name="sidebar_equipment">Equipment</string>
+    <string name="sidebar_stable">Stable</string>
+    <string name="sidebar_news">News</string>
+    <string name="sidebar_about">About</string>
     <string name="sidebar_shops">Shops</string>
     <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values/strings.tutorial.xml b/Habitica/res/values/strings.tutorial.xml
index fe1e06ca3..42566a9d1 100644
--- a/Habitica/res/values/strings.tutorial.xml
+++ b/Habitica/res/values/strings.tutorial.xml
@@ -13,12 +13,8 @@
     <string name="tutorial_rewards_2">You can also make real-world Custom Rewards based on what motivates you.</string>
     <string name="tutorial_tasks_complete">That\'s all for now. If you need a reminder, check the FAQ section.</string>
 
-    <string name="tutorial_equipment">When you buy equipment, it appears here. Your Battle Gear affects your stats, and your Costume (if enabled) affects what your avatar wears.</string>
-    <string name="tutorial_items">Earn items by completing tasks and leveling up. Tap on an item to use it!</string>
-    <string name="tutorial_pets">As you complete real-world tasks, you now have a random chance of finding eggs and potions. Combine them to hatch pets</string>
     <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
     <string name="tutorial_party">This is where you and your friends can hold each other accountable to your goals and fight monsters with your tasks!</string>
     <string name="tutorial_tavern">Welcome to the Tavern, a public, all-ages chatroom! Here you can chat about productivity and ask questions. Have fun!</string>
-    <string name="tutorial_classes">Choose to become a Warrior, Mage, Healer, or Rogue! Each class has unique equipment and skills. Tap the (?) to learn more!</string>
     <string name="tutorial_stats">Tap the gray button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 79f990a3d..efbff46ee 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -5,31 +5,25 @@
     <string name="XP_default">Experience</string>
     <string name="HP_default">Health</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
 
     <!--  Prefs -->
     <string name="PS_settings_title">Settings</string>
-    <string name="SP_address_hint">Your custom server</string>
     <string name="SP_userID_title">User ID</string>
     <string name="SP_userID_summary">Your User ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Your API Token</string>
     <string name="Language_title">Language</string>
     <string name="Language_summary">Change Habitica\'s language</string>
-    <string name="SP_user_qr_code">Your QR Code</string>
     <string name="PS_contact_title">Contact me</string>
-    <string name="unknown_error">An error occurred…</string>
     <string name="pref_account_header">Account</string>
     <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
     <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
-    <string name="pref_first_day_of_the_week_default_value" translatable="false">1</string>
     <string name="pref_first_day_of_the_week_key" translatable="false">FirstDayOfTheWeek</string>
     <string name="pref_reminder_header">Daily Reminder</string>
     <string name="pref_reminder_checkbox">Activate Reminder</string>
     <string name="pref_reminder_picker">Set Reminder Time</string>
 
     <string name="pref_cds_header">Custom Day Start</string>
-    <string name="pref_cds_picker">Set Custom Day Start Time</string>
 
     <string name="pref_push_notifications_checkbox">User Push Notifications</string>
     <string name="push_notifications">Push Notifications</string>
@@ -44,13 +38,7 @@
     <string name="preference_push_invited_to_quest">Invited to Quest</string>
 
     <!-- Adding tasks -->
-    <string name="task_value">Value</string>
-    <string name="new_todo">New To-Do</string>
-    <string name="new_reward">New Reward</string>
-    <string name="new_daily">New Daily</string>
-    <string name="new_habit">New Habit</string>
     <string name="action_edit">Edit</string>
-    <string name="action_delete">Delete</string>
     <string name="action_cancel">Cancel</string>
     <string name="login_btn">Login</string>
     <string name="register_btn">Register</string>
@@ -62,22 +50,18 @@
 
     <string name="logout">Logout</string>
     <string name="logout_description">Log out of your account</string>
-    <string name="account_details">Account Details</string>
-    <string name="LoginActivityName">Welcome</string>
+    <string name="LoginActivityName">Welcome</string><![CDATA[
+
 
-    <string name="string_revive">Revive</string>
-    <string name="please_connect">Please connect through the application before using a widget</string>
         
-    <string name="about.title">About</string>
-    <string name="about.libraries">Libraries</string>
-    <string name="about.versionhistory">Version history</string>
-    <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
-    <string name="about.rate_our_app">Rate our App</string>
-    <string name="about.give_us_feedback">Send us Feedback!</string>
-    <string name="about.bugreport">Report a Bug</string>
-    <string name="about.source_code">Source Code</string>
-
-    <string name="repeatEvery">Repeat Every</string>
+    ]]>
+    <string name="about_title">About</string>
+    <string name="about_libraries">Libraries</string>
+    <string name="about_habitica_open_source">Habitica is available as open source software on Github</string>
+    <string name="about_rate_our_app">Rate our App</string>
+    <string name="about_give_us_feedback">Send us Feedback!</string>
+    <string name="about_bugreport">Report a Bug</string>
+    <string name="about_source_code">Source Code</string>
 
 
     <!-- Network Errors -->
@@ -93,7 +77,6 @@
     <string name="save_changes">Save</string>
     <string name="copy">Copy</string>
     <string name="notes">Notes</string>
-    <string name="text">Text</string>
     <string name="difficulty">Difficulty</string>
     <string name="tags">Tags</string>
     <string name="trivial">Trivial</string>
@@ -105,21 +88,9 @@
     <string name="negative_habit_form">Negative</string>
     <string name="checklist">Checklist</string>
     <string name="reminders">Reminders</string>
-    <string name="actions">Actions</string>
 
     <string name="attributes">Attributes</string>
-    <string name="physical">Strength</string>
-    <string name="mental">Intelligence</string>
-    <string name="social">Constitution</string>
-    <string name="other">Perception</string>
 
-    <string name="frequency">Frequency</string>
-    <string name="frequency_weekly">On Certain Days of the Week</string>
-    <string name="frequency_daily">Every X Days</string>
-
-    <string name="repeatables_summary_title">Summary</string>
-    <string name="repeatables_title">Repeats</string>
-    <string name="repeatables_on_title">Repeats On</string>
     <string name="repeatables_frequency_daily">Daily</string>
     <string name="repeatables_frequency_weekly">Weekly</string>
     <string name="repeatables_frequency_monthly">Monthly</string>
@@ -146,26 +117,18 @@
     <string name="faint_button">Refill Health &amp; Try Again</string>
 
     <string name="filter">Filter</string>
-    <string name="profile_image">Profile Image</string>
 
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">You used %1$s for %2$d mana.</string>
     <string name="used_skill_without_mana">You used %1$s.</string>
     <string name="new_checklist_item">New checklist entry</string>
-    <string name="add_checklist_item">Add</string>
 
     <string name="reminder_title">Remember to check off your tasks</string>
     <string name="skill_progress_title">Using Skill</string>
-    <string name="coming_soon">Coming Soon</string>
-    <string name="chat_flag_confirmation">Are you sure you want to report this message for violation?</string>
-    <string name="flag_confirm">Flag Message</string>
     <string name="unlock_lvl_11">Unlock at lvl 11</string>
-    <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
     <string name="forgot_pw_btn">Forgot Password</string>
-    <string name="tavern.inn.checkOut">Reactivate your Dailies</string>
-    <string name="tavern.inn.rest">Pause your Dailies</string>
-    <string name="reward.dialog.buy">Buy</string>
-    <string name="reward.dialog.dismiss">Dismiss</string>
+    <string name="tavern_inn_checkOut">Reactivate your Dailies</string>
+    <string name="tavern_inn_rest">Pause your Dailies</string>
+    <string name="reward_dialog_buy">Buy</string>
+    <string name="reward_dialog_dismiss">Dismiss</string>
     <string name="party">Party</string>
     <string name="chat">Chat</string>
     <string name="members">Members</string>
@@ -173,8 +136,6 @@
     <string name="dailies">Dailies</string>
     <string name="todos">To-Dos</string>
     <string name="rewards">Rewards</string>
-    <string name="taskform.delete.title">Are you sure?</string>
-    <string name="taskform.delete.message">Do you really want to delete?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="quest">Quest</string>
@@ -182,14 +143,12 @@
     <string name="avatar_hair">Hair</string>
     <string name="avatar_shirt">Shirt</string>
     <string name="avatar_skin">Skin</string>
-    <string name="avatar_ears">Animal Ears</string>
     <string name="avatar_base">Base</string>
     <string name="avatar_color">Color</string>
     <string name="avatar_beard">Beard</string>
     <string name="avatar_mustache">Mustache</string>
     <string name="avatar_flower">Flower</string>
     <string name="avatar_bangs">Bangs</string>
-    <string name="avatar_nothing">Nothing set</string>
     <string name="avatar_size">Size</string>
     <string name="avatar_size_slim">Slim</string>
     <string name="avatar_size_broad">Broad</string>
@@ -199,23 +158,17 @@
     <string name="purchase_button">Purchase</string>
     <string name="purchase_set_title">Purchase set %s</string>
     <string name="due_date">Due Date</string>
-    <string name="quest.accept">Accept</string>
-    <string name="quest.reject">Reject</string>
-    <string name="quest.begin">Begin Quest</string>
-    <string name="quest.cancel">Cancel Invitation</string>
-    <string name="quest.abort">Abort Quest</string>
-    <string name="quest.leave">Leave Quest</string>
-    <string name="quest.pending">Pending</string>
-    <string name="quest.accepted">Accepted</string>
-    <string name="quest.rejected">Rejected</string>
-    <string name="quest.participants">Participants</string>
+    <string name="quest_accept">Accept</string>
+    <string name="quest_reject">Reject</string>
+    <string name="quest_begin">Begin Quest</string>
+    <string name="quest_cancel">Cancel Invitation</string>
+    <string name="quest_abort">Abort Quest</string>
     <string name="version_info">Version %1$s (%2$d)</string>
 
     <string name="sidebar_help">Help &amp; FAQ</string>
     <string name="complete_tutorial">Got it!</string>
     <string name="dismiss_tutorial">Remind me again</string>
     <string name="intro_1_subtitle">Welcome to</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
     <string name="intro_2_subtitle">Progress in the game</string>
     <string name="intro_2_title">Progress in life</string>
@@ -224,11 +177,8 @@
     <string name="intro_3_title">Get social</string>
     <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
     <string name="intro_finish_button">Let\'s start!</string>
-    <string name="previous_button">Previous</string>
     <string name="next_button">Next</string>
     <string name="skip_button">Skip</string>
-    <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
-    <string name="setup_welcome_title">Welcome</string>
     <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
     <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
     <string name="setup_group_work">Work</string>
@@ -260,29 +210,20 @@
     <string name="setup_task_creativity_2">Work on creative project</string>
     <string name="setup_task_creativity_3">Finish creative project</string>
 
-    <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
     <string name="my_guilds">My Guilds</string>
     <string name="public_guilds">Public Guilds</string>
     <string name="guild">Guild</string>
     <string name="leave">Leave</string>
     <string name="join">Join</string>
-    <string name="leader">Leader</string>
     <string name="gems">Gems</string>
-    <string name="copy_as_todo">Copy as To-Do</string>
-    <string name="send_pm">Send PM</string>
-    <string name="flag">Flag</string>
     <string name="delete">Delete</string>
     <string name="name">Name</string>
     <string name="description">Description</string>
     <string name="add_tag">Add new Tag</string>
     <string name="privacy">Privacy</string>
     <string name="write_message">Write Message</string>
-    <string name="post">Post</string>
     <string name="guild_search_hint">Search for guilds</string>
 
-    <string name="todo_due">Due: %s</string>
-    <string name="daily_streak">current streak: %d</string>
-    <string name="todo_has_duedate">Task has Due Date</string>
     <string name="battle_gear">Battle Gear</string>
     <string name="costume">Costume</string>
     <string name="outfit_head">Head</string>
@@ -296,9 +237,7 @@
     <string name="wear_costume">Wear Costume</string>
     <string name="equipped">Equipped</string>
     <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
-    <string name="quest.invitation">Quest Invitation</string>
     <string name="quest_begin_message">Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.</string>
-    <string name="quest.invitation.text">You have been invited to participate in a quest!</string>
     <string name="ago_1day">1d ago</string>
     <string name="ago_days">%dd ago</string>
     <string name="ago_1Minute">1m ago</string>
@@ -317,12 +256,8 @@
     <string name="armoireEquipment">You found %s in the Armoire</string>
     <string name="armoireFood">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
     <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
-    <string name="armoireNotesFull">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
-    <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
-    <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
     <string name="sell">Sell (%d Gold)</string>
     <string name="hatch_with_potion">Hatch with potion</string>
-    <string name="feed_to_pet">Feed to pet</string>
     <string name="hatch_egg">Hatch with egg</string>
     <string name="invite_party">Invite party</string>
     <string name="dialog_feeding">Feed %s with:</string>
@@ -334,13 +269,7 @@
     <string name="close">Close</string>
     <string name="share">Share</string>
     <string name="notification_pet_fed" >You fed your %s!</string>
-    <string name="notification_purchase" >You purchased %s</string>
     <string name="notification_purchase_reward" >You purchased a reward</string>
-    <string name="sectiondrop">Standard</string>
-    <string name="sectionpremium">Magic Potion</string>
-    <string name="sectionquest">Quest</string>
-    <string name="sectionspecial">Special</string>
-    <string name="sectionwacky">Wacky</string>
     <string name="world_quest">World Quest</string>
     <string name="inn_description">Need a break? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:\n\n
 &#8226; Missed Dailies won’t damage you\n
@@ -360,7 +289,6 @@
     <string name="healer_description">Healers learn Skills that can heal and protect themselves and their Party. Play a Healer if you enjoy assisting others or avoiding damage! Healers benefit from a high Constitution stat.</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="opting_out_progress">Opting Out</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>
@@ -376,13 +304,10 @@
     <string name="invite_existing_users">Invite Existing Users</string>
     <string name="send">Send</string>
     <string name="invite">Invite Friends</string>
-    <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
     <string name="invite_username_description">If you have friends already using Habitica, invite them by username here.</string>
     <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
     <string name="add_invites">Add Invites</string>
-    <string name="user_id">User ID</string>
     <string name="email">Email</string>
-    <string name="invite_users">Invite to Party</string>
     <string name="share_using">Share using</string>o
     <string name="share_levelup">I got to level %d in Habitica by improving my real-life habits!</string>
     <string name="share_hatched">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
@@ -390,8 +315,6 @@
     <string name="open_in_store">Open in play store</string>
     <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
     <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
-    <string name="leaderMessage">Message from %1$s</string>
-    <string name="leaderName">Leader: %1$s</string>
     <string name="confirm">Confirm</string>
     <string name="market">Market</string>
     <string name="timeTravelers">Time Travelers</string>
@@ -400,37 +323,16 @@
     <string name="party_invite">Unlock by inviting friends</string>
     <string name="login_incentive">Unlock by logging into Habitica regularly</string>
     <string name="create_account">Unlock by creating an account</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">Purchased %1$s</string>
-    <string name="purchase_confirmation_title">Confirm purchase</string>
-    <string name="confirm_purchase_text">Purchase %1$s for %2$s %3$s</string>
-    <string name="gem">gem</string>
-    <string name="hourglass">hourglass</string>
-    <string name="hourglasses">hourglasses</string>
-    <string name="gold_singular">gold</string>
     <string name="gold_plural">gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
-    <string name="copy_chat_message">Copy to clipboard</string>
-    <string name="edit_tag_title">Edit Tag</string>
     <string name="edit_tag_btn_edit">Edit</string>
-    <string name="edit_tag_btn_done">Done</string>
-    <string name="edit_tag_btn_delete">Delete</string>
     <string name="confirm_delete_tag_title">Are you sure?</string>
     <string name="confirm_delete_tag_message">Do you really want to delete?</string>
-    <string name="filter_drawer_edit_tags">Edit Tags</string>
-    <string name="filter_drawer_filter_tags">Filter by Tags</string>
 
     <!-- QR Strings -->
-    <string name="qr_section_title">Have someone invite you with this QR Code</string>
-    <string name="qr_save_message">QR code saved at </string>
-    <string name="qr_dialogue_title">Your QR Code</string>
-    <string name="download">Download</string>
-    <string name="send_new_message">Send new message</string>
     <string name="choose_recipient_title">Choose Message Recipient</string>
     <string name="action_continue">Continue</string>
-    <string name="scan_qr_code">Scan QR Code</string>
-    <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
     <string name="invited_to_party">You were invited to join a party!</string>
     <string name="stats_widget_label">Habitica Stats</string>
     <string name="add_task">Add Task</string>
@@ -442,15 +344,14 @@
     <string name="widget_habit_button">Habitica Do Habit</string>
     <string name="widget_dailies">Habitica Dailies</string>
     <string name="widget_todo_list">Habitica To-Do List</string>
-    <string name="widget_add_task">Habitica Add Task</string>
     <string name="google_services_missing">Google play services could not be found.</string>
-    <string name="gem.purchase.toolbartitle">Purchase</string>
-    <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
-    <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for you account, including:</string>
-    <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
-    <string name="gem.purchase.listitem2">Awesome backgrounds</string>
-    <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
-    <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
+    <string name="gem_purchase_toolbartitle">Purchase</string>
+    <string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+    <string name="gem_purchase_subtitle">Gems allow you to buy fun extras for you account, including:</string>
+    <string name="gem_purchase_listitem1">Cool costumes for your avatar</string>
+    <string name="gem_purchase_listitem2">Awesome backgrounds</string>
+    <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>
+    <string name="gem_purchase_listitem4">The ability to change your class before level 100</string>
     <string name="support_habitica">Support Habitica</string>
     <string name="skill_transformation_use">use</string>
     <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -466,32 +367,32 @@
     <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_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="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="subscription_duration_norenew">For %s</string>
     <string name="subscribe">Subscribe</string>
-    <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-    <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
-    <string name="subscribe.listitem3.description">Makes completed To-Dos and task history available for longer.</string>
-    <string name="subscribe.listitem4.description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
-    <string name="subscribe1month.gemcap">25 Gem cap</string>
-    <string name="subscribe3month.gemcap">30 Gem cap</string>
-    <string name="subscribe6month.gemcap">35 Gem cap</string>
-    <string name="subscribe12month.gemcap">45 Gem cap</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">25 Gem cap</string>
+    <string name="subscribe3month_gemcap">30 Gem cap</string>
+    <string name="subscribe6month_gemcap">35 Gem cap</string>
+    <string name="subscribe12month_gemcap">45 Gem cap</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="due">Due</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="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>
@@ -507,8 +408,6 @@
     <string name="subscribe_prompt_thanks">For Subscribing you are receiving these useful benefits:</string>
     <string name="subscription_status">Subscription Status</string>
 
-    <string name="byLeader">by %s</string>
-    <string name="challenge_details">Challenge Details</string>
     <string name="challenge_leave_title">Leave Challenge</string>
     <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
     <string name="challenge_remove_tasks_title">Remove tasks</string>
@@ -516,47 +415,33 @@
     <string name="remove_tasks">Remove</string>
     <string name="keep_tasks">Keep</string>
     <string name="my_challenges">My Challenges</string>
-    <string name="public_challenges">Public</string>
-    <string name="challenges">Challenges</string>
     <string name="daily">Daily</string>
     <string name="habit">Habit</string>
     <string name="reward">Reward</string>
     <string name="todo">To-Do</string>
     <string name="official">Official</string>
-    <string name="participating">Participating</string>
     <string name="challenge">Challenge</string>
-    <string name="go_to_challenge">Go to Challenge</string>
     <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
     <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
     <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
-    <string name="add_reminder">Add Reminder</string>
-    <string name="warning">Warning</string>
-    <string name="open_settings">Open Settings</string>
-    <string name="dont_keep_activities_warning">It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the habitica app, so we suggest disabling it.</string>
     <string name="inbox">Messages</string>
     <string name="notifications">Notifications</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">Next prize in %1$d Check-Ins</string>
     <string name="pending_approval">pending approval</string>
     <string name="filters">Filters</string>
     <string name="done">Done</string>
-    <string name="group_tasks_edit_description">Group tasks can not be edited.</string>
-    <string name="group_tasks_edit_title">Can\'t edit this task</string>
     <string name="groups">Groups</string>
     <string name="all">All</string>
     <string name="none">None</string>
     <string name="owned">Owned</string>
     <string name="not_owned">Not owned</string>
-    <string name="new_game">New\nGame</string>
     <string name="login_btn_fb">Login with Facebook</string>
     <string name="login_btn_google">Login with Google</string>
     <string name="action_back">Back</string>
@@ -589,7 +474,7 @@
     <string name="reload_content">Reload Content</string>
     <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
     <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
-    <string name="repeat_summary">"Repeats %1$s every %2$s %3$s %4$s"</string>
+    <string name="repeat_summary" translatable="false">"Repeats %1$s every %2$s%3$s %4$s"</string>
 
     <string name="no_billing_gems">Your device does not have any of the supported payment methods. Please use the habitica website if you want to purchase gems.</string>
     <string name="no_billing_subscriptions">Your device does not have any of the supported payment methods. Please use the habitica website if you want to purchase a subscription.</string>
@@ -598,7 +483,6 @@
     <string name="gem_reward">Gem prize</string>
     <string name="tasks">Tasks</string>
     <string name="create_challenge">Create Challenge</string>
-    <string name="edit_challenge">Edit</string>
     <string name="challenge_create_error_tavern_one_gem">You need at least 1 gem to create a public challenge.</string>
     <string name="challenge_create_error_enough_gems">You don\'t have enough gems to create a challenge.</string>
     <string name="identify_your_challenge_with_a_tag">Identify your challenge with a short name</string>
@@ -609,42 +493,36 @@
     <string name="new_challenge_title">New challenge title</string>
     <string name="ownership">Ownership</string>
     <string name="inn">Inn</string>
-    <string name="system">System</string>
     <string name="start_quest">Start a new Quest</string>
     <string name="leave_party">Leave Party</string>
     <string name="party_description">Party Description</string>
-    <string name="abort_confirmation">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
-    <string name="leave_quest_confirmation">Are you sure you want to leave the active quest? All your quest progress will be lost.</string>
     <string name="number_participants">%1$d Participants</string>
     <string name="welcome_back">Welcome Back</string>
     <string name="yesterdaililes_prompt">Check off any Dailies you did yesterday:</string>
     <string name="start_day">Start My Day</string>
-    <string name="leave_party_confirmation">Are you sure you want to leave the Party?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Next Prize in %d Check-ins</string>
+    <string name="leave_party_confirmation">Do you want to leave the party and keep or leave the challenges?</string>
     <string name="pending">Pending</string>
     <string name="accepted">Accepted</string>
     <string name="declined">Declined</string>
     <string name="participants">Participants</string>
     <string name="invitations">Invitations</string>
-    <string name="quest_leader_header" formatted="false">Started by %s</string>
+    <string name="quest_leader_header">Started by %s</string>
     <string name="quest_abort_message">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
-    <string name="loading">Loading…</string>
     <string name="reloading_content">Reloading Content</string>
     <string name="thousand_abbrev">k</string>
     <string name="million_abbrev">m</string>
     <string name="billion_abbrev">b</string>
-    <string name="your_balance">Your balance:</string>
-    <string name="available_until" formatted="false">Available until %s</string>
-    <string name="gems_left_max" formatted="false">Monthly Gems: %1$d/%2$d Remaining</string>
-    <string name="gems_left_nomax" formatted="false">Monthly Gems: %d Remaining</string>
+    <string name="available_until">Available until %s</string>
+    <string name="gems_left_max">Monthly Gems: %1$d/%2$d Remaining</string>
+    <string name="gems_left_nomax">Monthly Gems: %d Remaining</string>
     <string name="health">Health</string>
     <string name="collect">Collect</string>
     <string name="rage_meter">Rage Meter</string>
     <string name="boss_quest">Boss Quest</string>
     <string name="collection_quest">Collection Quest</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-    <string name="experience_reward" formatted="false">%d Experience points</string>
-    <string name="gold_reward" formatted="false">%d Gold</string>
+    <string name="quest_reward_count">%1$s x%2$d</string>
+    <string name="experience_reward">%d Experience points</string>
+    <string name="gold_reward">%d Gold</string>
     <string name="quest_owner_rewards">Quest Owner Rewards</string>
     <string name="str_abbrv">Str</string>
     <string name="per_abbrv">Per</string>
@@ -658,7 +536,6 @@
     <string name="reset_account_confirmation">Reset my Account</string>
     <string name="delete_account_confirmation">Delete my Account</string>
     <string name="danger_zone">Danger Zone</string>
-    <string name="nevermind">Nevermind</string>
     <string name="resetting_account">Resetting Account</string>
     <string name="deleting_account">Deleting Account</string>
     <string name="insufficientGold">You need to complete more tasks before you can afford this item!</string>
@@ -693,7 +570,6 @@
     <string name="authentication_summary">Change your authentication options.</string>
     <string name="change_password">Change Password</string>
     <string name="change_email">Change Email Address</string>
-    <string name="change_login_name">Change Login Name</string>
     <string name="change_username">Change Username</string>
     <string name="change">Change</string>
     <string name="character_level">Character Level</string>
@@ -715,7 +591,7 @@
     <string name="distribute_class">Distribute based on class</string>
     <string name="distribute_task">Distribute based on task activity</string>
     <string name="no_points_to_allocate">No Points to Allocate</string>
-    <string name="points_to_allocate" formatted="false">%d Points to Allocate</string>
+    <string name="points_to_allocate">%d Points to Allocate</string>
     <string name="distribute_evenly_help">Assigns the same number of points to each attribute.</string>
     <string name="distribute_class_help">Assigns more points to the attributes important to your Class.</string>
     <string name="distribute_task_help">Assigns points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.</string>
@@ -725,8 +601,6 @@
     <string name="classless">Classless</string>
     <string name="class_equipment_shop_dialog">This item is only available to a specific class.\nYou can change your class from Settings.</string>
     <string name="class_gear_disclaimer">You can only purchase gear for your current class</string>
-    <string name="available_stats" formatted="false">%d points</string>
-    <string name="toogle_emojis">Toogle Emojis</string>
     <string name="tavern_description">Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.</string>
     <string name="check_into_inn">Check into Inn</string>
     <string name="community_guidelines">Community Guidelines</string>
@@ -741,19 +615,13 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="world_boss">World  Boss</string>
-    <string name="world_boss_art">Boss Art</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
-    <string name="pending_strike_description">This Strike hasn’t happened yet!\nThe World Boss will lash out and attack one of our friendly shopkeepers once its rage bar fills. Keep up with your Dailies to try and prevent it from happening!</string>
+    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
     <string name="pending_strike_title">Pending Strike</string>
     <string name="strike_description_title">What’s a Rage Strike?</string>
-    <string name="strike_description_subtitle">There are 3 potential Rage Strikes</string>
-    <string name="strike_description_description">This gauge fills when Habiticans miss their Dailies. If it fills up, the DysHeartener will unleash its Shattering Heartbreak attack on one of Habitica\'s shopkeepers, so be sure to do your tasks!</string>
-    <string name="pending_strike_subtitle">This Strike hasn’t happened yet!</string>
-    <string name="strike_active_title" formatted="false">The %s was Attacked!</string>
-    <string name="strike_active_subtitle" formatted="false">%s is Heartbroken!</string>
-    <string name="strike_active_description" formatted="false">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+    <string name="strike_active_title">The %s was Attacked!</string>
+    <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
     <string name="questShop">Quest Shop</string>
     <string name="market_owner_long">Alex the Merchant</string>
     <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -763,29 +631,21 @@
     <string name="no_party_description">Take on quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.</string>
     <string name="no_party_title">Play Habitica in a Party</string>
     <string name="join_party_description">Give a Party member the username found below and they can send you an invite</string>
-    <string name="join_party_description_guild">Give the username below to a friend or head to the %s to meet potential comrades!e</string>
-    <string name="join_party_description_id">Give them your User ID or have them scan your QR code while inviting</string>
+    <string name="join_party_description_guild">Give the username below to a friend or head to the %s to meet potential comrades!</string>
     <string name="join_party_title">Want to join a party?</string>
-    <string name="create_party_website">Open website to create party</string>
-    <string name="id_copied">ID copied to clipboard</string>
     <string name="insufficientSubscriberGems">You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!</string>
-    <string name="insufficientSubscriberGemsTitle">Monthly Gem Cap Reached</string>
-    <string name="chat_message">Chat Message</string>
     <string name="world_boss_description_title">What’s a World Boss?</string>
-    <string name="world_boss_description_description">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!\nComplete tasks to damage the Boss\nThe Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of the shopkeepers!\nYou can continue with normal Quest Bosses, damage will apply to both\nCheck the Tavern to see Boss progress and Rage attacks</string>
     <string name="world_boss_description_intro">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!</string>
     <string name="world_boss_description_1">Complete tasks to damage the Boss</string>
     <string name="world_boss_description_2">The Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of the shopkeepers!</string>
     <string name="world_boss_description_3">You can continue with normal Quest Bosses, damage will apply to both</string>
     <string name="world_boss_description_4">Check the Tavern to see Boss progress and Rage attacks</string>
-    <string name="world_boss_action_prompt" formatted="false">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
-    <string name="world_boss_description_subtitle">%s attacks!</string>
+    <string name="world_boss_action_prompt">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
     <string name="questShop_owner_long">Ian the Quest Guide</string>
     <string name="seasonalShop_owner_long">Seasonal Sorceress</string>
     <string name="rage_attack">Rage attack:</string>
     <string name="tavern_description_world_boss">Oh dear, pay no heed to the monster below — this is still a safe haven to chat on your breaks.</string>
     <string name="report">Report</string>
-    <string name="like">Like</string>
     <string name="reply">Reply</string>
     <string name="challenge_prize">Challenge Prize</string>
     <string name="challenge_categories">Challenge Categories</string>
@@ -820,16 +680,14 @@
     <string name="two_handed">Two-Handed</string>
     <string name="usernamePromptTitle">It’s time to set your username!</string>
     <string name="usernamePromptBody">Login names are now unique usernames that will be visible beside your display name and used for invitations, chat @mentions, and messaging.</string>
-    <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia.com/wiki/Player_Names">visit our wiki.</a></string>
-    <string name="confirmUsername">Confirm Username</string>
-    <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
+    <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia_com/wiki/Player_Names">visit our wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica_com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
     <string name="confirm_username_title">Are you sure you want to confirm your current username?</string>
     <string name="confirm_username_description">Confirming your username will make it public for invitations, @mentions and messaging. You can change your username from settings at any time.</string>
     <string name="cancel">Cancel</string>
     <string name="confirm_username">Confirm Username</string>
     <string name="username_not_confirmed">Username not confirmed</string>
     <string name="username_confirmed">Username Confirmed</string>
-    <string name="username_level">\@%s ・Lvl %d</string>
     <string name="enter_recipient_username">Enter a Recipient\'s @ username</string>
     <string name="username_copied">Username copied to clipboard</string>
     <string name="verification_pet">One of these Veteran Pets will be waiting for you after you’ve finished confirming!</string>
@@ -913,6 +771,7 @@
     <string name="report_violation">Report Violation</string>
     <string name="trillion_abbrev">t</string>
     <string name="leave_guild">Leave Guild</string>
+    <string name="leave_guild_confirmation">Do you want to leave the guild and keep or leave the challenges?</string>
     <string name="left_guild">You left the guild</string>
     <string name="joined_guild">You joined the guild</string>
     <string name="cost">Cost</string>
@@ -943,4 +802,46 @@
     <string name="create_task">Create %s</string>
     <string name="details">Details</string>
     <string name="share_challenge_with">Share Challenge with</string>
+    <string name="app_theme">App Theme</string>
+    <string name="sent_card">You sent a %s</string>
+    <string name="inbox_messages_title">You received %d messages from %s</string>
+    <string name="inbox_messages_title_nosender">You received %d messages</string>
+    <string name="remove">Remove</string>
+    <string name="transfer_ownership">Transfer Ownership</string>
+    <string name="remove_member">Remove Member</string>
+    <string name="send_message">Send Message</string>
+    <string name="transferred_ownership">Ownership transferred to %s</string>
+    <string name="transfer_ownership_confirm">Are you sure you want to transfer ownership to %s</string>
+    <string name="remove_member_confirm">Are you sure you want to remove %s from the group?</string>
+    <string name="transfer">Transfer</string>
+    <string name="removed_member">%s was removed from the group</string>
+    <string name="mystery_item_received">You open the box and receive a %s</string>
+    <string name="see_what_s_new">See what\'s new</string>
+    <string name="view_achievements">View Achievements</string>
+    <string name="achievement_title">You got an Achievement!</string>
+    <string name="partyUpTitle">Party Up</string>
+    <string name="partyUpDescription">You teamed up with a party member!</string>
+    <string name="partyOnTitle">Party On</string>
+    <string name="partyOnDescription">Your party grew to 4 members!</string>
+    <string name="beastMasterTitle">Beast Master</string>
+    <string name="beastMasterDescription">You have earned the “Beast Master” Achievement for collecting all the pets!</string>
+    <string name="mountMasterTitle">Mount Master</string>
+    <string name="mountMasterDescription">You have earned the “Mount Master” achievement for taming all the mounts!</string>
+    <string name="triadBingoTitle">Triad Bingo</string>
+    <string name="triadBingoDescription">You have earned the “Triad Bingo” achievement for finding all the pets, taming all the mounts, and finding all the pets again!</string>
+    <string name="joinedGuildTitle">Joined a Guild</string>
+    <string name="joinedGuildDescription">Ventured into the social side of Habitica by joining a Guild!</string>
+    <string name="joinedChallengeTitle">Joined a Challenge</string>
+    <string name="joinedChallengeDescription">You put themselves to the test by joining a Challenge!</string>
+    <string name="inviteFriendTitle">Invited a Friend</string>
+    <string name="inviteFriendDescription">You invited a friend (or friends) who joined you on your adventure!</string>
+    <string name="keep_challenges">Keep Challenges</string>
+    <string name="leave_challenges">Leave Challenges</string>
+    <string name="equip_automatically">Auto-equip new gear</string>
+    <string name="accept">Accept</string>
+    <string name="reject">Reject</string>
+    <string name="complete">Complete</string>
+    <string name="repeat_daily">Daily</string>
+    <string name="search">Search</string>
+    <string name="search_hint">Search tasks</string>
 </resources>
diff --git a/Habitica/res/values/styles.challenges.xml b/Habitica/res/values/styles.challenges.xml
index fe7d268a1..d4f01eadb 100644
--- a/Habitica/res/values/styles.challenges.xml
+++ b/Habitica/res/values/styles.challenges.xml
@@ -9,15 +9,6 @@
         <item name="android:textColor">#000</item>
     </style>
 
-    <style name="ChallengeByGroup">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_regular
-        </item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:height">20dp</item>
-        <item name="android:textColor">#8a000000</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
     <style name="ChallengeTaskDetails">
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_regular
         </item>
@@ -27,17 +18,4 @@
         <item name="android:maxLines">1</item>
     </style>
 
-    <style name="OfficialChallenge">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium
-        </item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#8a000000</item>
-    </style>
-
-    <style name="ParticipatingChallenge">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium
-        </item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#1ca372</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index 9db6ed00a..95326d2df 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- All possible font familys -->
-    <string name="font_family_light">sans-serif-light</string>
     <string name="font_family_medium">sans-serif-medium</string>
     <string name="font_family_regular">sans-serif</string>
     <string name="font_family_condensed">sans-serif-condensed</string>
-    <string name="font_family_black">sans-serif-black</string>
-    <string name="font_family_thin">sans-serif-thin</string>
 
     <!-- Titles -->
     <style name="Title1">
@@ -16,10 +13,6 @@
         <item name="android:textColor">?textColorPrimary</item>
     </style>
 
-    <style name="Title1_WideLetterSpacing"  parent="@style/Title1">
-        <item name="android:letterSpacing">0.133</item>
-    </style>
-
     <style name="Title2"  parent="@style/Title1">
         <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">28sp</item>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index a606e6b4b..cf59fc0c4 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -25,11 +25,13 @@
         <item name="colorPrimaryOffset">@color/brand_200</item>
         <item name="colorPrimaryDistinct">@color/brand_500</item>
         <item name="colorBadgeBackground">@color/brand_400</item>
+        <item name="taskFormTint">@color/brand_300</item>
 
         <item name="textColorPrimary">@color/gray_50</item>
         <item name="textColorSecondary">@color/gray_200</item>
         <item name="textColorPrimaryDark">#D5C8FF</item>
         <item name="textColorSecondaryDark">@color/brand_500</item>
+        <item name="barColor">@color/brand_100</item>
 
         <item name="colorContentBackground">@color/white</item>
         <item name="colorWindowBackground">@color/gray_700</item>
@@ -41,9 +43,133 @@
         <item name="android:textColorLink">@color/brand_400</item>
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:windowTranslucentStatus">false</item>
+
+        <item name="android:statusBarColor">@color/brand_50</item>
+        <item name="android:navigationBarColor">@color/brand_50</item>
+
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
     </style>
 
 
+    <style name="MainAppTheme.Red">
+        <item name="colorPrimary">@color/red_5</item>
+        <item name="colorPrimaryDark">@color/red_1</item>
+        <item name="colorAccent">@color/red_100</item>
+        <item name="android:colorPrimary">@color/red_5</item>
+        <item name="android:colorPrimaryDark">@color/red_1</item>
+        <item name="android:colorAccent">@color/red_100</item>
+        <item name="colorPrimaryOffset">@color/red_10</item>
+        <item name="colorPrimaryDistinct">@color/red_500</item>
+        <item name="colorBadgeBackground">@color/red_100</item>
+        <item name="textColorSecondaryDark">@color/red_500</item>
+        <item name="android:textColorLink">@color/red_100</item>
+        <item name="textColorPrimaryDark">@color/red_500</item>
+        <item name="barColor">@color/red_5</item>
+        <item name="taskFormTint">@color/red_100</item>
+    </style>
+
+    <style name="MainAppTheme.Maroon">
+        <item name="colorPrimary">@color/maroon_10</item>
+        <item name="colorPrimaryDark">@color/maroon_5</item>
+        <item name="colorAccent">@color/maroon_100</item>
+        <item name="android:colorPrimary">@color/maroon_10</item>
+        <item name="android:colorPrimaryDark">@color/maroon_5</item>
+        <item name="android:colorAccent">@color/maroon_100</item>
+        <item name="colorPrimaryOffset">@color/maroon_50</item>
+        <item name="colorPrimaryDistinct">@color/maroon_500</item>
+        <item name="colorBadgeBackground">@color/maroon_100</item>
+        <item name="textColorSecondaryDark">@color/maroon_500</item>
+        <item name="android:textColorLink">@color/maroon_100</item>
+        <item name="textColorPrimaryDark">@color/maroon_500</item>
+        <item name="barColor">@color/maroon_10</item>
+        <item name="taskFormTint">@color/maroon_100</item>
+    </style>
+
+    <style name="MainAppTheme.Orange">
+        <item name="colorPrimary">@color/orange_10</item>
+        <item name="colorPrimaryDark">@color/orange_5</item>
+        <item name="colorAccent">@color/orange_100</item>
+        <item name="android:colorPrimary">@color/orange_10</item>
+        <item name="android:colorPrimaryDark">@color/orange_5</item>
+        <item name="android:colorAccent">@color/orange_100</item>
+        <item name="colorPrimaryOffset">@color/orange_50</item>
+        <item name="colorPrimaryDistinct">@color/orange_500</item>
+        <item name="colorBadgeBackground">@color/orange_100</item>
+        <item name="textColorSecondaryDark">@color/orange_500</item>
+        <item name="android:textColorLink">@color/orange_100</item>
+        <item name="textColorPrimaryDark">@color/orange_500</item>
+        <item name="barColor">@color/orange_10</item>
+        <item name="taskFormTint">@color/orange_100</item>
+    </style>
+
+    <style name="MainAppTheme.Yellow">
+        <item name="colorPrimary">@color/yellow_10</item>
+        <item name="colorPrimaryDark">@color/yellow_5</item>
+        <item name="colorAccent">@color/yellow_100</item>
+        <item name="android:colorPrimary">@color/yellow_10</item>
+        <item name="android:colorPrimaryDark">@color/yellow_5</item>
+        <item name="android:colorAccent">@color/yellow_100</item>
+        <item name="colorPrimaryOffset">@color/yellow_50</item>
+        <item name="colorPrimaryDistinct">@color/yellow_500</item>
+        <item name="colorBadgeBackground">@color/yellow_100</item>
+        <item name="textColorSecondaryDark">@color/yellow_500</item>
+        <item name="android:textColorLink">@color/yellow_100</item>
+        <item name="textColorPrimaryDark">@color/yellow_500</item>
+        <item name="barColor">@color/yellow_10</item>
+        <item name="taskFormTint">@color/yellow_100</item>
+    </style>
+
+    <style name="MainAppTheme.Green">
+        <item name="colorPrimary">@color/green_10</item>
+        <item name="colorPrimaryDark">@color/green_5</item>
+        <item name="colorAccent">@color/green_100</item>
+        <item name="android:colorPrimary">@color/green_10</item>
+        <item name="android:colorPrimaryDark">@color/green_5</item>
+        <item name="android:colorAccent">@color/green_100</item>
+        <item name="colorPrimaryOffset">@color/green_50</item>
+        <item name="colorPrimaryDistinct">@color/green_500</item>
+        <item name="colorBadgeBackground">@color/green_100</item>
+        <item name="textColorSecondaryDark">@color/green_500</item>
+        <item name="android:textColorLink">@color/green_100</item>
+        <item name="textColorPrimaryDark">@color/green_500</item>
+        <item name="barColor">@color/green_10</item>
+        <item name="taskFormTint">@color/green_100</item>
+    </style>
+
+    <style name="MainAppTheme.Teal">
+        <item name="colorPrimary">@color/teal_10</item>
+        <item name="colorPrimaryDark">@color/teal_5</item>
+        <item name="colorAccent">@color/teal_100</item>
+        <item name="android:colorPrimary">@color/teal_10</item>
+        <item name="android:colorPrimaryDark">@color/teal_5</item>
+        <item name="android:colorAccent">@color/teal_100</item>
+        <item name="colorPrimaryOffset">@color/teal_50</item>
+        <item name="colorPrimaryDistinct">@color/teal_500</item>
+        <item name="colorBadgeBackground">@color/teal_100</item>
+        <item name="textColorSecondaryDark">@color/teal_500</item>
+        <item name="android:textColorLink">@color/teal_100</item>
+        <item name="textColorPrimaryDark">@color/teal_500</item>
+        <item name="barColor">@color/teal_10</item>
+        <item name="taskFormTint">@color/teal_100</item>
+    </style>
+
+    <style name="MainAppTheme.Blue">
+        <item name="colorPrimary">@color/blue_10</item>
+        <item name="colorPrimaryDark">@color/blue_5</item>
+        <item name="colorAccent">@color/blue_100</item>
+        <item name="android:colorPrimary">@color/blue_10</item>
+        <item name="android:colorPrimaryDark">@color/blue_5</item>
+        <item name="android:colorAccent">@color/blue_100</item>
+        <item name="colorPrimaryOffset">@color/blue_50</item>
+        <item name="colorPrimaryDistinct">@color/blue_500</item>
+        <item name="colorBadgeBackground">@color/blue_100</item>
+        <item name="textColorSecondaryDark">@color/blue_500</item>
+        <item name="android:textColorLink">@color/blue_100</item>
+        <item name="textColorPrimaryDark">@color/blue_500</item>
+        <item name="barColor">@color/blue_10</item>
+        <item name="taskFormTint">@color/blue_100</item>
+    </style>
+
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowIsTranslucent">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -55,74 +181,18 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="AppTheme.ActionBar" parent="AppTheme">
-        <item name="windowActionBar">true</item>
-        <item name="windowNoTitle">false</item>
-    </style>
-
-    <style name="AppTheme.ActionBar.Transparent" parent="AppTheme.ActionBar">
-        <item name="actionBarStyle">@style/ActionBarTransparent</item>
-        <item name="android:statusBarColor">@color/brand_50</item>
-        <item name="android:navigationBarColor">@color/brand_50</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBarOverlay">true</item>
-    </style>
-
-    <style name="ActionBarTransparent">
-        <item name="android:background">@color/transparent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:statusBarColor">@color/brand_50</item>
-        <item name="android:navigationBarColor">@color/brand_50</item>
-    </style>
-
-    <style name="MainAppTheme" parent="AppTheme.NoActionBar">
+    <style name="LaunchAppTheme" parent="AppTheme">
         <item name="android:windowBackground">@drawable/activity_launch_background</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:fitsSystemWindows">false</item>
     </style>
 
-    <style name="AppTheme.NoActionBar.Green">
-        <item name="colorPrimary">@color/green_10</item>
-        <item name="colorPrimaryDark">@color/green_5</item>
-        <item name="colorAccent">@color/green_100</item>
-        <item name="colorPrimaryOffset">@color/green_50</item>
-        <item name="colorPrimaryDistinct">@color/green_500</item>
-        <item name="colorBadgeBackground">@color/green_100</item>
-        <item name="textColorSecondaryDark">@color/green_500</item>
-        <item name="android:textColorLink">@color/green_100</item>
+    <style name="MainAppTheme" parent="AppTheme">
     </style>
 
-    <style name="AppTheme.NoActionBar.Blue">
-        <item name="colorPrimary">@color/blue_10</item>
-        <item name="colorPrimaryDark">@color/blue_5</item>
-        <item name="colorAccent">@color/blue_100</item>
-        <item name="colorPrimaryOffset">@color/blue_50</item>
-        <item name="colorPrimaryDistinct">@color/blue_500</item>
-        <item name="colorBadgeBackground">@color/blue_100</item>
-        <item name="textColorSecondaryDark">@color/blue_500</item>
-        <item name="android:textColorLink">@color/blue_100</item>
-    </style>
-
-    <style name="AppThemeWithActionBarBlackText" parent="AppTheme.ActionBar">
-        <item name="android:textColorPrimary">@android:color/black</item>
-    </style>
 
     <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
         <item name="android:popupBackground">@android:color/white</item>
     </style>
 
-    <style name="MyCustomTabLayout" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:singleLine">true</item>
-        <item name="android:lines">1</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
     <style name="CardText">
         <item name="android:textSize">@dimen/card_small_text</item>
         <item name="android:textColor">@color/card_text</item>
@@ -223,11 +293,6 @@
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
-    <style name="MenuSectionTitle">
-        <item name="android:background">@color/brand</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
     <style name="BottomMenu">
         <item name="android:divider">?android:listDivider</item>
         <item name="android:showDividers">middle</item>
@@ -253,12 +318,6 @@
         <item name="android:visibility">gone</item>
     </style>
 
-    <style name="LoginRow">
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
     <style name="GemPurchaseListItem">
         <item name="android:textColor">@color/brand_300</item>
         <item name="android:gravity">center_horizontal</item>
@@ -331,7 +390,7 @@
     </style>
 
     <style name="subscriptionBoxText">
-        <item name="android:textColor">@color/brand_100</item>
+        <item name="android:textColor">?colorPrimary</item>
     </style>
 
     <style name="subscriptionBoxText.Title">
@@ -346,10 +405,6 @@
         <item name="android:textColor">@color/gray_50</item>
     </style>
 
-    <style name="subscriptionBoxText.Title.Red">
-        <item name="android:textColor">@color/red_50</item>
-    </style>
-
     <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
         <item name="android:layout_marginBottom">24dp</item>
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
@@ -396,13 +451,6 @@
         <item name="android:paddingRight">32dp</item>
     </style>
 
-    <style name="welcome_floating_icon">
-        <item name="android:layout_width">50dp</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:background">@drawable/welcome_diamond_background</item>
-        <item name="android:padding">16dp</item>
-    </style>
-
     <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/diamond_button</item>
@@ -511,13 +559,6 @@
         <item name="android:background">@drawable/layout_rounded_bg_yellow</item>
     </style>
 
-    <style name="HabiticaButton.Yellow.Small" parent="HabiticaButton.Yellow">
-        <item name="android:paddingLeft">@dimen/button_padding_small</item>
-        <item name="android:paddingRight">@dimen/button_padding_small</item>
-        <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
-        <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
-    </style>
-
     <style name="CurrencyTextView">
         <item name="android:textSize">14sp</item>
         <item name="android:layout_marginLeft">16dp</item>
@@ -531,10 +572,6 @@
         <item name="android:maxHeight">12dip</item>
     </style>
 
-    <style name="TableHeader" parent="Title1">
-        <item name="android:layout_marginTop">@dimen/content_section_spacing</item>
-    </style>
-
     <style name="RedTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/red_10</item>
     </style>
@@ -548,48 +585,6 @@
         <item name="android:textColor">@color/brand_300</item>
     </style>
 
-    <style name="BB_BottomBarItem">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:layout_width">wrap_content</item>
-        <!-- layout_height is ignored since the height is set programmatically in BottomBar
-        .updateItems() -->
-        <item name="android:layout_height">@dimen/bb_height</item>
-    </style>
-
-    <style name="BB_BottomBarItem_TitleStyle">
-        <!-- Material spec: "Avoid long text labels as these labels do not truncate or wrap." -->
-        <item name="android:singleLine">true</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Fixed.TitleAppearance" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Shifting.TitleAppearance" parent="BB_BottomBarItem_Fixed.TitleAppearance">
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Tablet">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="BB_BottomBarBadge_Text" parent="TextAppearance.AppCompat.Body2">
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
-
-    <style name="ErrorText" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">@color/red_100</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="HintText" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <!-- reference our hint & error styles -->
         <item name="boxBackgroundColor">@color/white_75_alpha</item>
@@ -653,9 +648,11 @@
         <item name="android:actionMenuTextColor">@color/red_50</item>
     </style>
 
+    <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="android:textColorHint">@color/white_50_alpha</item>
+        <item name="searchHintIcon">@null</item>
+    </style>
+
     <color name="taskform_gray">#99edecee</color>
 
-    <style name="AlertDialogContainer">
-        <item name="android:layout_width">320dp</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index f506f3f0c..2572ea591 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="task_difficulties">
-        <item>@string/trivial</item>
-        <item>@string/easy</item>
-        <item>@string/medium</item>
-        <item>@string/hard</item>
-    </string-array>
-
-    <string-array name="task_attributes">
-        <item>@string/physical</item>
-        <item>@string/mental</item>
-        <item>@string/social</item>
-        <item>@string/other</item>
-    </string-array>
-
-    <string-array name="task_reset_frequencies">
-        <item>@string/repeatables_frequency_daily</item>
-        <item>@string/repeatables_frequency_weekly</item>
-        <item>@string/repeatables_frequency_monthly</item>
-    </string-array>
 
     <string-array name="repeatables_frequencies">
         <item>@string/repeatables_frequency_daily</item>
@@ -27,11 +8,6 @@
         <item>@string/repeatables_frequency_yearly</item>
     </string-array>
 
-    <string-array name="repeatables_on">
-        <item>@string/repeatables_frequency_day_of_month</item>
-        <item>@string/repeatables_frequency_day_of_week</item>
-    </string-array>
-
     <string-array name="weekdays">
         <item>@string/monday</item>
         <item>@string/tuesday</item>
@@ -126,6 +102,27 @@
         <item>airuTheme</item>
     </string-array>
 
+
+    <string-array name="AppThemes">
+        <item>Default</item>
+        <item>Maroon</item>
+        <item>Red</item>
+        <item>Orange</item>
+        <item>Green</item>
+        <item>Teal</item>
+        <item>Blue</item>
+    </string-array>
+
+    <string-array name="AppThemeValues">
+        <item>purple</item>
+        <item>maroon</item>
+        <item>red</item>
+        <item>orange</item>
+        <item>green</item>
+        <item>teal</item>
+        <item>blue</item>
+    </string-array>
+
     <string-array name="server_urls">
         <item>https://habitica.com</item>
         <item>https://habitrpg-staging.herokuapp.com</item>
@@ -134,5 +131,4 @@
         <item>https://habitrpg-delta.herokuapp.com</item>
     </string-array>
 
-    <string name="frequency_monthly">Monthly</string>
 </resources>
diff --git a/Habitica/res/xml/add_task_widget_info.xml b/Habitica/res/xml/add_task_widget_info.xml
deleted file mode 100644
index acf11d318..000000000
--- a/Habitica/res/xml/add_task_widget_info.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_add_task"
-    android:minHeight="40dp"
-    android:minWidth="40dp"
-    android:configure="com.habitrpg.android.habitica.ui.activities.AddTaskWidgetActivity">
-
-</appwidget-provider>
diff --git a/Habitica/res/xml/main_menu_tasks.xml b/Habitica/res/xml/main_menu_tasks.xml
deleted file mode 100644
index 1b58769d0..000000000
--- a/Habitica/res/xml/main_menu_tasks.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tabs>
-    <tab
-            id="@+id/tab_habits"
-            icon="@drawable/icon_habits_selected"
-            title="@string/habits" />
-    <tab
-            id="@+id/tab_dailies"
-            icon="@drawable/icon_dailies_selected"
-            title="@string/dailies" />
-    <tab
-            id="@+id/tab_todos"
-            icon="@drawable/icon_todos_selected"
-            title="@string/todos" />
-    <tab
-            id="@+id/tab_rewards"
-            icon="@drawable/icon_rewards_selected"
-            title="@string/rewards" />
-</tabs>
\ No newline at end of file
diff --git a/Habitica/res/xml/network_security_config.xml b/Habitica/res/xml/network_security_config.xml
index a11c6d527..f808081d4 100644
--- a/Habitica/res/xml/network_security_config.xml
+++ b/Habitica/res/xml/network_security_config.xml
@@ -6,6 +6,6 @@
         </trust-anchors>
     </debug-overrides>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">192.168.178.51</domain>
+        <domain includeSubdomains="true">192.168.178.52</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index f7533f7da..047c45882 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -132,6 +132,11 @@
             android:entryValues="@array/AudioValues"
             android:summary="@string/AudioTheme_summary"
             android:layout="@layout/preference_child_summary"/>
+        <ListPreference android:title="@string/app_theme"
+            android:key="theme_name"
+            android:entries="@array/AppThemes"
+            android:entryValues="@array/AppThemeValues"
+            android:layout="@layout/preference_child_summary"/>
         <CheckBoxPreference android:title="@string/dailyDueDefaultView"
             android:key="dailyDueDefaultView"
             android:summary="@string/dailyDueDefaultViewDescription"
diff --git a/Habitica/res/xml/searchable.xml b/Habitica/res/xml/searchable.xml
new file mode 100644
index 000000000..443afb501
--- /dev/null
+++ b/Habitica/res/xml/searchable.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/app_name"
+    android:hint="@string/search_hint" />
\ No newline at end of file
diff --git a/Habitica/src/main/assets/HelveticaNeue.ttc b/Habitica/src/main/assets/HelveticaNeue.ttc
deleted file mode 100644
index 5f7306b5f..000000000
Binary files a/Habitica/src/main/assets/HelveticaNeue.ttc and /dev/null differ
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index db8f8f7a7..1914e4be4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -8,11 +8,11 @@ import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.database.DatabaseErrorHandler
 import android.database.sqlite.SQLiteDatabase
-import android.preference.PreferenceManager
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import androidx.multidex.MultiDexApplication
+import androidx.preference.PreferenceManager
 import com.amplitude.api.Amplitude
 import com.amplitude.api.Identify
 import com.facebook.drawee.backends.pipeline.Fresco
@@ -191,10 +191,9 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
     private fun setupRemoteConfig() {
         val remoteConfig = FirebaseRemoteConfig.getInstance()
         val configSettings = FirebaseRemoteConfigSettings.Builder()
-                .setDeveloperModeEnabled(BuildConfig.DEBUG)
                 .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
                 .build()
-        remoteConfig.setConfigSettings(configSettings)
+        remoteConfig.setConfigSettingsAsync(configSettings)
         remoteConfig.setDefaults(R.xml.remote_config_defaults)
         remoteConfig.fetchAndActivate()
     }
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 9436a81eb..6cc9d868f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -2,7 +2,9 @@ package com.habitrpg.android.habitica;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
 
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent;
@@ -13,8 +15,6 @@ import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
 import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
 import com.habitrpg.android.habitica.models.Transaction;
 import com.habitrpg.android.habitica.models.responses.ErrorResponse;
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
-import com.playseeds.android.sdk.Seeds;
 
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
@@ -31,7 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.NonNull;
 import retrofit2.HttpException;
 
 /**
@@ -69,8 +68,8 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
                     validationRequest.setSku(purchase.sku);
                     validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().receipt = purchase.data;
-                    validationRequest.getTransaction().signature = purchase.signature;
+                    validationRequest.getTransaction().setReceipt(purchase.data);
+                    validationRequest.getTransaction().setSignature(purchase.signature);
                     if (pendingGifts.containsKey(purchase.sku)) {
                         validationRequest.setGift(new IAPGift());
                         validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
@@ -82,17 +81,6 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
 
                         requestListener.onSuccess(verifiedPurchases);
                         EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
-
-                        //TODO: find way to get $ price automatically.
-                        if (purchase.sku.equals(PurchaseTypes.Purchase4Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 0.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase21Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 4.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase42Gems)) {
-                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 9.99);
-                        } else if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
-                            Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
-                        }
                     }, throwable -> {
                         if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) {
                             HttpException error = (HttpException) throwable;
@@ -113,8 +101,8 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
                     validationRequest.setSku(purchase.sku);
                     validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().receipt = purchase.data;
-                    validationRequest.getTransaction().signature = purchase.signature;
+                    validationRequest.getTransaction().setReceipt(purchase.data);
+                    validationRequest.getTransaction().setSignature(purchase.signature);
                     if (pendingGifts.containsKey(purchase.sku)) {
                         validationRequest.setGift(new IAPGift());
                         validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
@@ -146,8 +134,8 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                     SubscriptionValidationRequest validationRequest = new SubscriptionValidationRequest();
                     validationRequest.setSku(purchase.sku);
                     validationRequest.setTransaction(new Transaction());
-                    validationRequest.getTransaction().receipt = purchase.data;
-                    validationRequest.getTransaction().signature = purchase.signature;
+                    validationRequest.getTransaction().setReceipt(purchase.data);
+                    validationRequest.getTransaction().setSignature(purchase.signature);
                     apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
                         purchasedOrderList.add(purchase.orderId);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
deleted file mode 100644
index 70f8e0b76..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
+++ /dev/null
@@ -1,395 +0,0 @@
-package com.habitrpg.android.habitica.api;
-
-import com.habitrpg.android.habitica.models.Achievement;
-import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.WorldState;
-import com.habitrpg.android.habitica.models.auth.UserAuth;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.members.Member;
-import com.habitrpg.android.habitica.models.responses.BuyResponse;
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-import com.habitrpg.android.habitica.models.responses.HabitResponse;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.responses.Status;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.shops.ShopItem;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.FindUsernameResult;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.user.User;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Flowable;
-import retrofit2.http.Body;
-import retrofit2.http.DELETE;
-import retrofit2.http.GET;
-import retrofit2.http.HTTP;
-import retrofit2.http.Header;
-import retrofit2.http.POST;
-import retrofit2.http.PUT;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-public interface ApiService {
-    @GET("status")
-    Flowable<HabitResponse<Status>> getStatus();
-
-    @GET("content")
-    Flowable<HabitResponse<ContentResult>> getContent(@Query("language") String language);
-
-    /* user API */
-
-    @GET("user/")
-    Flowable<HabitResponse<User>> getUser();
-
-    @PUT("user/")
-    Flowable<HabitResponse<User>> updateUser(@Body Map<String, Object> updateDictionary);
-
-    @PUT("user/")
-    Flowable<HabitResponse<User>> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
-
-
-    @GET("inbox/messages")
-    Flowable<HabitResponse<List<ChatMessage>>> getInboxMessages();
-
-    @GET("user/in-app-rewards")
-    Flowable<HabitResponse<List<ShopItem>>> retrieveInAppRewards();
-    @GET("user/inventory/buy")
-    Flowable<HabitResponse<List<ShopItem>>> retrieveOldGearRewards();
-
-    @POST("user/equip/{type}/{key}")
-    Flowable<HabitResponse<Items>> equipItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/buy/{key}")
-    Flowable<HabitResponse<BuyResponse>> buyItem(@Path("key") String itemKey);
-
-    @POST("user/purchase/{type}/{key}")
-    Flowable<HabitResponse<Void>> purchaseItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/purchase-hourglass/{type}/{key}")
-    Flowable<HabitResponse<Void>> purchaseHourglassItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/buy-mystery-set/{key}")
-    Flowable<HabitResponse<Void>> purchaseMysterySet(@Path("key") String itemKey);
-
-    @POST("user/buy-quest/{key}")
-    Flowable<HabitResponse<Void>> purchaseQuest(@Path("key") String key);
-
-    @POST("user/sell/{type}/{key}")
-    Flowable<HabitResponse<User>> sellItem(@Path("type") String itemType, @Path("key") String itemKey);
-
-    @POST("user/feed/{pet}/{food}")
-    Flowable<HabitResponse<FeedResponse>> feedPet(@Path("pet") String petKey, @Path("food") String foodKey);
-
-    @POST("user/hatch/{egg}/{hatchingPotion}")
-    Flowable<HabitResponse<Items>> hatchPet(@Path("egg") String eggKey, @Path("hatchingPotion") String hatchingPotionKey);
-
-
-    @GET("tasks/user")
-    Flowable<HabitResponse<TaskList>> getTasks();
-
-    @GET("tasks/user")
-    Flowable<HabitResponse<TaskList>> getTasks(@Query("type") String type);
-
-    @GET("tasks/user")
-    Flowable<HabitResponse<TaskList>> getTasks(@Query("type") String type, @Query("dueDate") String dueDate);
-
-
-    @POST("user/unlock")
-    Flowable<HabitResponse<UnlockResponse>> unlockPath(@Query("path") String path);
-
-    @GET("tasks/{id}")
-    Flowable<HabitResponse<Task>> getTask(@Path("id") String id);
-
-    @POST("tasks/{id}/score/{direction}")
-    Flowable<HabitResponse<TaskDirectionData>> postTaskDirection(@Path("id") String id, @Path("direction") String direction);
-
-    @POST("tasks/{id}/move/to/{position}")
-    Flowable<HabitResponse<List<String>>> postTaskNewPosition(@Path("id") String id, @Path("position") int position);
-
-    @POST("tasks/{taskId}/checklist/{itemId}/score")
-    Flowable<HabitResponse<Task>> scoreChecklistItem(@Path("taskId") String taskId, @Path("itemId") String itemId);
-
-    @POST("tasks/user")
-    Flowable<HabitResponse<Task>> createTask(@Body Task item);
-
-    @POST("tasks/user")
-    Flowable<HabitResponse<List<Task>>> createTasks(@Body List<Task> tasks);
-
-    @PUT("tasks/{id}")
-    Flowable<HabitResponse<Task>> updateTask(@Path("id") String id, @Body Task item);
-
-    @DELETE("tasks/{id}")
-    Flowable<HabitResponse<Void>> deleteTask(@Path("id") String id);
-
-
-    @POST("tags")
-    Flowable<HabitResponse<Tag>> createTag(@Body Tag tag);
-
-    @PUT("tags/{id}")
-    Flowable<HabitResponse<Tag>> updateTag(@Path("id") String id, @Body Tag tag);
-
-    @DELETE("tags/{id}")
-    Flowable<HabitResponse<Void>> deleteTag(@Path("id") String id);
-
-    @POST("user/auth/local/register")
-    Flowable<HabitResponse<UserAuthResponse>> registerUser(@Body UserAuth auth);
-
-    @POST("user/auth/local/login")
-    Flowable<HabitResponse<UserAuthResponse>> connectLocal(@Body UserAuth auth);
-
-    @POST("user/auth/social")
-    Flowable<HabitResponse<UserAuthResponse>> connectSocial(@Body UserAuthSocial auth);
-
-
-    @POST("user/sleep")
-    Flowable<HabitResponse<Boolean>> sleep();
-
-    @POST("user/revive")
-    Flowable<HabitResponse<User>> revive();
-
-    @POST("user/class/cast/{skill}")
-    Flowable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType, @Query("targetId") String targetId);
-
-    @POST("user/class/cast/{skill}")
-    Flowable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType);
-
-    @POST("user/change-class")
-    Flowable<HabitResponse<User>> changeClass();
-
-    @POST("user/change-class")
-    Flowable<HabitResponse<User>> changeClass(@Query("class") String className);
-
-    @POST("user/disable-classes")
-    Flowable<HabitResponse<User>> disableClasses();
-
-    @POST("user/mark-pms-read")
-    Flowable<Void> markPrivateMessagesRead();
-
-
-
-    /* Group API */
-
-    @GET("groups")
-    Flowable<HabitResponse<List<Group>>> listGroups(@Query("type") String type);
-
-    @GET("groups/{gid}")
-    Flowable<HabitResponse<Group>> getGroup(@Path("gid") String groupId);
-
-    @POST("groups")
-    Flowable<HabitResponse<Group>> createGroup(@Body Group item);
-
-    @PUT("groups/{id}")
-    Flowable<HabitResponse<Void>> updateGroup(@Path("id") String id, @Body Group item);
-
-    @GET("groups/{gid}/chat")
-    Flowable<HabitResponse<List<ChatMessage>>> listGroupChat(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/join")
-    Flowable<HabitResponse<Group>> joinGroup(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/leave")
-    Flowable<HabitResponse<Void>> leaveGroup(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/chat")
-    Flowable<HabitResponse<PostChatMessageResult>> postGroupChat(@Path("gid") String groupId, @Body Map<String, String> message);
-
-    @DELETE("groups/{gid}/chat/{messageId}")
-    Flowable<HabitResponse<Void>> deleteMessage(@Path("gid") String groupId, @Path("messageId") String messageId);
-
-    @DELETE("inbox/messages/{messageId}")
-    Flowable<HabitResponse<Void>> deleteInboxMessage(@Path("messageId") String messageId);
-
-    @GET("groups/{gid}/members")
-    Flowable<HabitResponse<List<Member>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields);
-
-    @GET("groups/{gid}/members")
-    Flowable<HabitResponse<List<Member>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields, @Query("lastId") String lastId);
-
-    // Like returns the full chat list
-    @POST("groups/{gid}/chat/{mid}/like")
-    Flowable<HabitResponse<ChatMessage>> likeMessage(@Path("gid") String groupId, @Path("mid") String mid);
-
-    @POST("groups/{gid}/chat/{mid}/flag")
-    Flowable<HabitResponse<Void>> flagMessage(@Path("gid") String groupId, @Path("mid") String mid, @Body Map<String, String> data);
-
-    @POST("groups/{gid}/chat/seen")
-    Flowable<HabitResponse<Void>> seenMessages(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/invite")
-    Flowable<HabitResponse<List<String>>> inviteToGroup(@Path("gid") String groupId, @Body Map<String, Object> inviteData);
-
-    @POST("groups/{gid}/reject-invite")
-    Flowable<HabitResponse<Void>> rejectGroupInvite(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/accept")
-    Flowable<HabitResponse<Void>> acceptQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/reject")
-    Flowable<HabitResponse<Void>> rejectQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/cancel")
-    Flowable<HabitResponse<Void>> cancelQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/force-start")
-    Flowable<HabitResponse<Quest>> forceStartQuest(@Path("gid") String groupId, @Body Group group);
-
-    @POST("groups/{gid}/quests/invite/{questKey}")
-    Flowable<HabitResponse<Quest>> inviteToQuest(@Path("gid") String groupId, @Path("questKey") String questKey);
-
-    @POST("groups/{gid}/quests/abort")
-    Flowable<HabitResponse<Quest>> abortQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/leave")
-    Flowable<HabitResponse<Void>> leaveQuest(@Path("gid") String groupId);
-
-    @POST("/iap/android/verify")
-    Flowable<HabitResponse<PurchaseValidationResult>> validatePurchase(@Body PurchaseValidationRequest request);
-
-    @POST("/iap/android/subscribe")
-    Flowable<HabitResponse<Void>> validateSubscription(@Body SubscriptionValidationRequest request);
-    @POST("/iap/android/norenew-subscribe")
-    Flowable<HabitResponse<Void>> validateNoRenewSubscription(@Body PurchaseValidationRequest request);
-
-    @POST("user/custom-day-start")
-    Flowable<HabitResponse<User>> changeCustomDayStart(@Body Map<String, Object> updateObject);
-
-    //Members URL
-    @GET("members/{mid}")
-    Flowable<HabitResponse<Member>> getMember(@Path("mid") String memberId);
-    @GET("members/username/{username}")
-    Flowable<HabitResponse<Member>> getMemberWithUsername(@Path("username") String username);
-
-    @GET("members/{mid}/achievements")
-    Flowable<HabitResponse<List<Achievement>>> getMemberAchievements(@Path("mid") String memberId);
-
-    @POST("members/send-private-message")
-    Flowable<HabitResponse<PostChatMessageResult>> postPrivateMessage(@Body Map<String, String> messageDetails);
-
-    @GET("members/find/{username}")
-    Flowable<HabitResponse<List<FindUsernameResult>>> findUsernames(@Path("username") String username, @Query("context") String context, @Query("id") String id);
-
-    @GET("shops/{identifier}")
-    Flowable<HabitResponse<Shop>> retrieveShopInventory(@Path("identifier") String identifier);
-    @GET("shops/market-gear")
-    Flowable<HabitResponse<Shop>> retrieveMarketGear();
-
-    //Push notifications
-    @POST("user/push-devices")
-    Flowable<HabitResponse<List<Void>>> addPushDevice(@Body Map<String, String> pushDeviceData);
-
-    @DELETE("user/push-devices/{regId}")
-    Flowable<HabitResponse<List<Void>>> deletePushDevice(@Path("regId") String regId);
-
-    /* challenges api */
-
-    @GET("challenges/user")
-    Flowable<HabitResponse<List<Challenge>>> getUserChallenges(@Query("page") Integer page, @Query("member") boolean memberOnly);
-    @GET("challenges/user")
-    Flowable<HabitResponse<List<Challenge>>> getUserChallenges(@Query("page") Integer page);
-
-    @GET("tasks/challenge/{challengeId}")
-    Flowable<HabitResponse<TaskList>> getChallengeTasks(@Path("challengeId") String challengeId);
-
-    @GET("challenges/{challengeId}")
-    Flowable<HabitResponse<Challenge>> getChallenge(@Path("challengeId") String challengeId);
-
-    @POST("challenges/{challengeId}/join")
-    Flowable<HabitResponse<Challenge>> joinChallenge(@Path("challengeId") String challengeId);
-
-    @POST("challenges/{challengeId}/leave")
-    Flowable<HabitResponse<Void>> leaveChallenge(@Path("challengeId") String challengeId, @Body LeaveChallengeBody body);
-
-    @POST("challenges")
-    Flowable<HabitResponse<Challenge>> createChallenge(@Body Challenge challenge);
-
-    @POST("tasks/challenge/{challengeId}")
-    Flowable<HabitResponse<List<Task>>> createChallengeTasks(@Path("challengeId") String challengeId, @Body List<Task> tasks);
-
-    @POST("tasks/challenge/{challengeId}")
-    Flowable<HabitResponse<Task>> createChallengeTask(@Path("challengeId") String challengeId, @Body Task task);
-
-    @PUT("challenges/{challengeId}")
-    Flowable<HabitResponse<Challenge>> updateChallenge(@Path("challengeId") String challengeId, @Body Challenge challenge);
-
-    @DELETE("challenges/{challengeId}")
-    Flowable<HabitResponse<Void>> deleteChallenge(@Path("challengeId") String challengeId);
-
-
-    //DEBUG: These calls only work on a local development server
-
-    @POST("debug/add-ten-gems")
-    Flowable<HabitResponse<Void>> debugAddTenGems();
-
-    // Notifications
-    @POST("notifications/{notificationId}/read")
-    Flowable<HabitResponse<List>> readNotification(@Path("notificationId") String notificationId);
-
-    @POST("notifications/read")
-    Flowable<HabitResponse<List>> readNotifications(@Body Map<String, List<String>> notificationIds);
-
-    @POST("notifications/see")
-    Flowable<HabitResponse<List>> seeNotifications(@Body Map<String, List<String>> notificationIds);
-
-    @POST("user/open-mystery-item")
-    Flowable<HabitResponse<Equipment>> openMysteryItem();
-
-    @POST("cron")
-    Flowable<HabitResponse<Void>> runCron();
-
-    @POST("user/reset")
-    Flowable<HabitResponse<Void>> resetAccount();
-
-    @HTTP(method = "DELETE", path = "user", hasBody = true)
-    Flowable<HabitResponse<Void>> deleteAccount(@Body Map<String, String> body);
-
-    @GET("user/toggle-pinned-item/{pinType}/{path}")
-    Flowable<HabitResponse<Void>> togglePinnedItem(@Path("pinType") String pinType,@Path("path") String path);
-
-    @POST("user/reset-password")
-    Flowable<HabitResponse<Void>> sendPasswordResetEmail(@Body Map<String, String> data);
-
-    @PUT("user/auth/update-username")
-    Flowable<HabitResponse<Void>> updateLoginName(@Body Map<String, String> data);
-
-    @POST("user/auth/verify-username")
-    Flowable<HabitResponse<VerifyUsernameResponse>> verifyUsername(@Body Map<String, String> data);
-
-    @PUT("user/auth/update-email")
-    Flowable<HabitResponse<Void>> updateEmail(@Body Map<String, String> data);
-
-    @PUT("user/auth/update-password")
-    Flowable<HabitResponse<Void>> updatePassword(@Body Map<String, String> data);
-
-    @POST("user/allocate")
-    Flowable<HabitResponse<Stats>> allocatePoint(@Query("stat") String stat);
-
-    @POST("user/allocate-bulk")
-    Flowable<HabitResponse<Stats>> bulkAllocatePoints(@Body Map<String, Map<String, Integer>> stats);
-
-    @GET("world-state")
-    Flowable<HabitResponse<WorldState>> getWorldState();
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
new file mode 100644
index 000000000..d5b8b45a0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -0,0 +1,374 @@
+package com.habitrpg.android.habitica.api
+
+import com.habitrpg.android.habitica.models.*
+import com.habitrpg.android.habitica.models.auth.UserAuth
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse
+import com.habitrpg.android.habitica.models.auth.UserAuthSocial
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.responses.*
+import com.habitrpg.android.habitica.models.shops.Shop
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.models.social.*
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.models.user.User
+import io.reactivex.Flowable
+import retrofit2.http.*
+
+@JvmSuppressWildcards
+interface ApiService {
+    @get:GET("status")
+    val status: Flowable<HabitResponse<Status>>
+
+    /* user API */
+
+    @get:GET("user/")
+    val user: Flowable<HabitResponse<User>>
+
+
+    @GET("inbox/messages")
+    fun getInboxMessages(@Query("conversation") uuid: String, @Query("page") page: Int): Flowable<HabitResponse<List<ChatMessage>>>
+    @GET("inbox/conversations")
+    fun getInboxConversations(): Flowable<HabitResponse<List<InboxConversation>>>
+
+
+    @get:GET("tasks/user")
+    val tasks: Flowable<HabitResponse<TaskList>>
+
+    @get:GET("world-state")
+    val worldState: Flowable<HabitResponse<WorldState>>
+
+    @GET("content")
+    fun getContent(@Query("language") language: String?): Flowable<HabitResponse<ContentResult>>
+
+    @PUT("user/")
+    fun updateUser(@Body updateDictionary: Map<String, Any>): Flowable<HabitResponse<User>>
+
+    @PUT("user/")
+    fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): Flowable<HabitResponse<User>>
+
+    @GET("user/in-app-rewards")
+    fun retrieveInAppRewards(): Flowable<HabitResponse<List<ShopItem>>>
+
+    @GET("user/inventory/buy")
+    fun retrieveOldGearRewards(): Flowable<HabitResponse<List<ShopItem>>>
+
+    @POST("user/equip/{type}/{key}")
+    fun equipItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Items>>
+
+    @POST("user/buy/{key}")
+    fun buyItem(@Path("key") itemKey: String): Flowable<HabitResponse<BuyResponse>>
+
+    @POST("user/purchase/{type}/{key}")
+    fun purchaseItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/purchase-hourglass/{type}/{key}")
+    fun purchaseHourglassItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/buy-mystery-set/{key}")
+    fun purchaseMysterySet(@Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/buy-quest/{key}")
+    fun purchaseQuest(@Path("key") key: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/sell/{type}/{key}")
+    fun sellItem(@Path("type") itemType: String, @Path("key") itemKey: String): Flowable<HabitResponse<User>>
+
+    @POST("user/feed/{pet}/{food}")
+    fun feedPet(@Path("pet") petKey: String, @Path("food") foodKey: String): Flowable<HabitResponse<FeedResponse>>
+
+    @POST("user/hatch/{egg}/{hatchingPotion}")
+    fun hatchPet(@Path("egg") eggKey: String, @Path("hatchingPotion") hatchingPotionKey: String): Flowable<HabitResponse<Items>>
+
+    @GET("tasks/user")
+    fun getTasks(@Query("type") type: String): Flowable<HabitResponse<TaskList>>
+
+    @GET("tasks/user")
+    fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): Flowable<HabitResponse<TaskList>>
+
+
+    @POST("user/unlock")
+    fun unlockPath(@Query("path") path: String): Flowable<HabitResponse<UnlockResponse>>
+
+    @GET("tasks/{id}")
+    fun getTask(@Path("id") id: String): Flowable<HabitResponse<Task>>
+
+    @POST("tasks/{id}/score/{direction}")
+    fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): Flowable<HabitResponse<TaskDirectionData>>
+
+    @POST("tasks/{id}/move/to/{position}")
+    fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Flowable<HabitResponse<List<String>>>
+
+    @POST("tasks/{taskId}/checklist/{itemId}/score")
+    fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): Flowable<HabitResponse<Task>>
+
+    @POST("tasks/user")
+    fun createTask(@Body item: Task): Flowable<HabitResponse<Task>>
+
+    @POST("tasks/user")
+    fun createTasks(@Body tasks: List<Task>): Flowable<HabitResponse<List<Task>>>
+
+    @PUT("tasks/{id}")
+    fun updateTask(@Path("id") id: String, @Body item: Task): Flowable<HabitResponse<Task>>
+
+    @DELETE("tasks/{id}")
+    fun deleteTask(@Path("id") id: String): Flowable<HabitResponse<Void>>
+
+
+    @POST("tags")
+    fun createTag(@Body tag: Tag): Flowable<HabitResponse<Tag>>
+
+    @PUT("tags/{id}")
+    fun updateTag(@Path("id") id: String, @Body tag: Tag): Flowable<HabitResponse<Tag>>
+
+    @DELETE("tags/{id}")
+    fun deleteTag(@Path("id") id: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/auth/local/register")
+    fun registerUser(@Body auth: UserAuth): Flowable<HabitResponse<UserAuthResponse>>
+
+    @POST("user/auth/local/login")
+    fun connectLocal(@Body auth: UserAuth): Flowable<HabitResponse<UserAuthResponse>>
+
+    @POST("user/auth/social")
+    fun connectSocial(@Body auth: UserAuthSocial): Flowable<HabitResponse<UserAuthResponse>>
+
+
+    @POST("user/sleep")
+    fun sleep(): Flowable<HabitResponse<Boolean>>
+
+    @POST("user/revive")
+    fun revive(): Flowable<HabitResponse<User>>
+
+    @POST("user/class/cast/{skill}")
+    fun useSkill(@Path("skill") skillName: String, @Query("targetType") targetType: String, @Query("targetId") targetId: String): Flowable<HabitResponse<SkillResponse>>
+
+    @POST("user/class/cast/{skill}")
+    fun useSkill(@Path("skill") skillName: String, @Query("targetType") targetType: String): Flowable<HabitResponse<SkillResponse>>
+
+    @POST("user/change-class")
+    fun changeClass(): Flowable<HabitResponse<User>>
+
+    @POST("user/change-class")
+    fun changeClass(@Query("class") className: String): Flowable<HabitResponse<User>>
+
+    @POST("user/disable-classes")
+    fun disableClasses(): Flowable<HabitResponse<User>>
+
+    @POST("user/mark-pms-read")
+    fun markPrivateMessagesRead(): Flowable<Void>
+
+
+    /* Group API */
+
+    @GET("groups")
+    fun listGroups(@Query("type") type: String): Flowable<HabitResponse<List<Group>>>
+
+    @GET("groups/{gid}")
+    fun getGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+
+    @POST("groups")
+    fun createGroup(@Body item: Group): Flowable<HabitResponse<Group>>
+
+    @PUT("groups/{id}")
+    fun updateGroup(@Path("id") id: String, @Body item: Group): Flowable<HabitResponse<Group>>
+
+    @POST("groups/{groupID}/removeMember/{userID}")
+    fun removeMemberFromGroup(@Path("groupID") groupID: String, @Path("userID") userID: String): Flowable<HabitResponse<Void>>
+
+    @GET("groups/{gid}/chat")
+    fun listGroupChat(@Path("gid") groupId: String): Flowable<HabitResponse<List<ChatMessage>>>
+
+    @POST("groups/{gid}/join")
+    fun joinGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+
+    @POST("groups/{gid}/leave")
+    fun leaveGroup(@Path("gid") groupId: String, @Query("keepChallenges") keepChallenges: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/chat")
+    fun postGroupChat(@Path("gid") groupId: String, @Body message: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
+
+    @DELETE("groups/{gid}/chat/{messageId}")
+    fun deleteMessage(@Path("gid") groupId: String, @Path("messageId") messageId: String): Flowable<HabitResponse<Void>>
+
+    @DELETE("inbox/messages/{messageId}")
+    fun deleteInboxMessage(@Path("messageId") messageId: String): Flowable<HabitResponse<Void>>
+
+    @GET("groups/{gid}/members")
+    fun getGroupMembers(@Path("gid") groupId: String, @Query("includeAllPublicFields") includeAllPublicFields: Boolean?): Flowable<HabitResponse<List<Member>>>
+
+    @GET("groups/{gid}/members")
+    fun getGroupMembers(@Path("gid") groupId: String, @Query("includeAllPublicFields") includeAllPublicFields: Boolean?, @Query("lastId") lastId: String): Flowable<HabitResponse<List<Member>>>
+
+    // Like returns the full chat list
+    @POST("groups/{gid}/chat/{mid}/like")
+    fun likeMessage(@Path("gid") groupId: String, @Path("mid") mid: String): Flowable<HabitResponse<ChatMessage>>
+
+    @POST("groups/{gid}/chat/{mid}/flag")
+    fun flagMessage(@Path("gid") groupId: String, @Path("mid") mid: String, @Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/chat/seen")
+    fun seenMessages(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/invite")
+    fun inviteToGroup(@Path("gid") groupId: String, @Body inviteData: Map<String, Any>): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/reject-invite")
+    fun rejectGroupInvite(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/quests/accept")
+    fun acceptQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/quests/reject")
+    fun rejectQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/quests/cancel")
+    fun cancelQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("groups/{gid}/quests/force-start")
+    fun forceStartQuest(@Path("gid") groupId: String, @Body group: Group): Flowable<HabitResponse<Quest>>
+
+    @POST("groups/{gid}/quests/invite/{questKey}")
+    fun inviteToQuest(@Path("gid") groupId: String, @Path("questKey") questKey: String): Flowable<HabitResponse<Quest>>
+
+    @POST("groups/{gid}/quests/abort")
+    fun abortQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Quest>>
+
+    @POST("groups/{gid}/quests/leave")
+    fun leaveQuest(@Path("gid") groupId: String): Flowable<HabitResponse<Void>>
+
+    @POST("/iap/android/verify")
+    fun validatePurchase(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<PurchaseValidationResult>>
+
+    @POST("/iap/android/subscribe")
+    fun validateSubscription(@Body request: SubscriptionValidationRequest): Flowable<HabitResponse<Void>>
+
+    @POST("/iap/android/norenew-subscribe")
+    fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
+
+    @POST("user/custom-day-start")
+    fun changeCustomDayStart(@Body updateObject: Map<String, Any>): Flowable<HabitResponse<User>>
+
+    //Members URL
+    @GET("members/{mid}")
+    fun getMember(@Path("mid") memberId: String): Flowable<HabitResponse<Member>>
+
+    @GET("members/username/{username}")
+    fun getMemberWithUsername(@Path("username") username: String): Flowable<HabitResponse<Member>>
+
+    @GET("members/{mid}/achievements")
+    fun getMemberAchievements(@Path("mid") memberId: String): Flowable<HabitResponse<List<Achievement>>>
+
+    @POST("members/send-private-message")
+    fun postPrivateMessage(@Body messageDetails: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
+
+    @GET("members/find/{username}")
+    fun findUsernames(@Path("username") username: String, @Query("context") context: String?, @Query("id") id: String?): Flowable<HabitResponse<List<FindUsernameResult>>>
+
+    @POST("members/flag-private-message/{mid}")
+    fun flagInboxMessage(@Path("mid") mid: String, @Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @GET("shops/{identifier}")
+    fun retrieveShopInventory(@Path("identifier") identifier: String): Flowable<HabitResponse<Shop>>
+
+    @GET("shops/market-gear")
+    fun retrieveMarketGear(): Flowable<HabitResponse<Shop>>
+
+    //Push notifications
+    @POST("user/push-devices")
+    fun addPushDevice(@Body pushDeviceData: Map<String, String>): Flowable<HabitResponse<List<Void>>>
+
+    @DELETE("user/push-devices/{regId}")
+    fun deletePushDevice(@Path("regId") regId: String): Flowable<HabitResponse<List<Void>>>
+
+    /* challenges api */
+
+    @GET("challenges/user")
+    fun getUserChallenges(@Query("page") page: Int?, @Query("member") memberOnly: Boolean): Flowable<HabitResponse<List<Challenge>>>
+
+    @GET("challenges/user")
+    fun getUserChallenges(@Query("page") page: Int?): Flowable<HabitResponse<List<Challenge>>>
+
+    @GET("tasks/challenge/{challengeId}")
+    fun getChallengeTasks(@Path("challengeId") challengeId: String): Flowable<HabitResponse<TaskList>>
+
+    @GET("challenges/{challengeId}")
+    fun getChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Challenge>>
+
+    @POST("challenges/{challengeId}/join")
+    fun joinChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Challenge>>
+
+    @POST("challenges/{challengeId}/leave")
+    fun leaveChallenge(@Path("challengeId") challengeId: String, @Body body: LeaveChallengeBody): Flowable<HabitResponse<Void>>
+
+    @POST("challenges")
+    fun createChallenge(@Body challenge: Challenge): Flowable<HabitResponse<Challenge>>
+
+    @POST("tasks/challenge/{challengeId}")
+    fun createChallengeTasks(@Path("challengeId") challengeId: String, @Body tasks: List<Task>): Flowable<HabitResponse<List<Task>>>
+
+    @POST("tasks/challenge/{challengeId}")
+    fun createChallengeTask(@Path("challengeId") challengeId: String, @Body task: Task): Flowable<HabitResponse<Task>>
+
+    @PUT("challenges/{challengeId}")
+    fun updateChallenge(@Path("challengeId") challengeId: String, @Body challenge: Challenge): Flowable<HabitResponse<Challenge>>
+
+    @DELETE("challenges/{challengeId}")
+    fun deleteChallenge(@Path("challengeId") challengeId: String): Flowable<HabitResponse<Void>>
+
+
+    //DEBUG: These calls only work on a local development server
+
+    @POST("debug/add-ten-gems")
+    fun debugAddTenGems(): Flowable<HabitResponse<Void>>
+
+    // Notifications
+    @POST("notifications/{notificationId}/read")
+    fun readNotification(@Path("notificationId") notificationId: String): Flowable<HabitResponse<List<Any>>>
+
+    @POST("notifications/read")
+    fun readNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
+
+    @POST("notifications/see")
+    fun seeNotifications(@Body notificationIds: Map<String, List<String>>): Flowable<HabitResponse<List<Any>>>
+
+    @POST("user/open-mystery-item")
+    fun openMysteryItem(): Flowable<HabitResponse<Equipment>>
+
+    @POST("cron")
+    fun runCron(): Flowable<HabitResponse<Void>>
+
+    @POST("user/reset")
+    fun resetAccount(): Flowable<HabitResponse<Void>>
+
+    @HTTP(method = "DELETE", path = "user", hasBody = true)
+    fun deleteAccount(@Body body: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @GET("user/toggle-pinned-item/{pinType}/{path}")
+    fun togglePinnedItem(@Path("pinType") pinType: String, @Path("path") path: String): Flowable<HabitResponse<Void>>
+
+    @POST("user/reset-password")
+    fun sendPasswordResetEmail(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @PUT("user/auth/update-username")
+    fun updateLoginName(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @POST("user/auth/verify-username")
+    fun verifyUsername(@Body data: Map<String, String>): Flowable<HabitResponse<VerifyUsernameResponse>>
+
+    @PUT("user/auth/update-email")
+    fun updateEmail(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @PUT("user/auth/update-password")
+    fun updatePassword(@Body data: Map<String, String>): Flowable<HabitResponse<Void>>
+
+    @POST("user/allocate")
+    fun allocatePoint(@Query("stat") stat: String): Flowable<HabitResponse<Stats>>
+
+    @POST("user/allocate-bulk")
+    fun bulkAllocatePoints(@Body stats: Map<String, Map<String, Int>>): Flowable<HabitResponse<Stats>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 06bcb813d..051065f41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -2,13 +2,12 @@ package com.habitrpg.android.habitica.components;
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.UserScope;
 import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseMessagingService;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-import com.habitrpg.android.habitica.modules.UserRepositoryModule;
 import com.habitrpg.android.habitica.modules.UserModule;
+import com.habitrpg.android.habitica.modules.UserRepositoryModule;
 import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
 import com.habitrpg.android.habitica.receivers.NotificationPublisher;
 import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
@@ -78,7 +77,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragmen
 import com.habitrpg.android.habitica.ui.fragments.social.GuildDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.InboxFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment;
 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.QuestDetailFragment;
@@ -90,10 +89,10 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOv
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyMemberListFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel;
+import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel;
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel;
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog;
 import com.habitrpg.android.habitica.ui.views.social.ChatBarView;
@@ -180,8 +179,6 @@ public interface UserComponent {
 
     void inject(PartyInviteFragment partyInviteFragment);
 
-    void inject(PartyMemberListFragment partyMemberListFragment);
-
     void inject(ChatListFragment chatListFragment);
 
     void inject(GroupInformationFragment groupInformationFragment);
@@ -204,7 +201,7 @@ public interface UserComponent {
 
     void inject(PreferencesFragment preferencesFragment);
 
-    void inject(InboxFragment inboxFragment);
+    void inject(InboxOverviewFragment inboxFragment);
 
     void inject(InboxMessageListFragment inboxMessageListFragment);
 
@@ -238,8 +235,6 @@ public interface UserComponent {
 
     void inject(TaskListWidgetProvider taskListWidgetProvider);
 
-    void inject(RemindersManager remindersManager);
-
     void inject(DailiesRecyclerViewHolder dailiesRecyclerViewHolder);
 
     void inject(HabitsRecyclerViewAdapter habitsRecyclerViewAdapter);
@@ -319,4 +314,6 @@ public interface UserComponent {
     void inject(@NotNull GuildDetailFragment guildDetailFragment);
 
     void inject(@NotNull AchievementsFragment achievementsFragment);
+
+    void inject(@NotNull InboxViewModel inboxViewModel);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 6b5c2bc04..ad6d5104b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -9,10 +9,7 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.*
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
@@ -129,13 +126,14 @@ interface ApiClient {
     fun getGroup(groupId: String): Flowable<Group>
 
     fun createGroup(group: Group): Flowable<Group>
-    fun updateGroup(id: String, item: Group): Flowable<Void>
+    fun updateGroup(id: String, item: Group): Flowable<Group>
+    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void>
 
     fun listGroupChat(groupId: String): Flowable<List<ChatMessage>>
 
     fun joinGroup(groupId: String): Flowable<Group>
 
-    fun leaveGroup(groupId: String): Flowable<Void>
+    fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void>
 
     fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult>
 
@@ -150,10 +148,11 @@ interface ApiClient {
     fun likeMessage(groupId: String, mid: String): Flowable<ChatMessage>
 
     fun flagMessage(groupId: String, mid: String, data: MutableMap<String, String>): Flowable<Void>
+    fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Flowable<Void>
 
     fun seenMessages(groupId: String): Flowable<Void>
 
-    fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<String>>
+    fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<Void>
 
     fun rejectGroupInvite(groupId: String): Flowable<Void>
 
@@ -222,7 +221,8 @@ interface ApiClient {
     fun hasAuthenticationKeys(): Boolean
 
     fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveInboxMessages(): Flowable<List<ChatMessage>>
+    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
+    fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
 
     fun <T> configureApiCallObserver(): FlowableTransformer<HabitResponse<T>, T>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 9729b1f0e..5b940f098 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -4,10 +4,7 @@ import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Single
@@ -35,28 +32,29 @@ interface SocialRepository : BaseRepository {
     fun retrieveGroup(id: String): Flowable<Group>
     fun getGroup(id: String?): Flowable<Group>
 
-    fun leaveGroup(id: String?): Flowable<Group>
+    fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group>
 
     fun joinGroup(id: String?): Flowable<Group>
 
     fun createGroup(name: String?, description: String?, leader: String?, type: String?, privacy: String?, leaderCreateChallenge: Boolean?): Flowable<Group>
-    fun updateGroup(group: Group?, name: String?, description: String?, leader: String?, leaderCreateChallenge: Boolean?): Flowable<Void>
+    fun updateGroup(group: Group?, name: String?, description: String?, leader: String?, leaderCreateChallenge: Boolean?): Flowable<Group>
 
     fun retrieveGroups(type: String): Flowable<List<Group>>
     fun getGroups(type: String): Flowable<RealmResults<Group>>
 
 
     fun getInboxMessages(replyToUserID: String?): Flowable<RealmResults<ChatMessage>>
-    fun retrieveInboxMessages(): Flowable<List<ChatMessage>>
-    fun getInboxOverviewList(): Flowable<RealmResults<ChatMessage>>
-    fun postPrivateMessage(messageObject: HashMap<String, String>): Flowable<List<ChatMessage>>
+    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
+    fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
+    fun getInboxConversations(): Flowable<RealmResults<InboxConversation>>
+    fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): Flowable<List<ChatMessage>>
     fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>>
 
 
     fun getGroupMembers(id: String): Flowable<RealmResults<Member>>
     fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>>
 
-    fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<String>>
+    fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<Void>
 
     fun getMember(userId: String?): Flowable<Member>
     fun getMemberWithUsername(username: String?): Flowable<Member>
@@ -65,8 +63,12 @@ interface SocialRepository : BaseRepository {
 
     fun markPrivateMessagesRead(user: User?): Flowable<Void>
 
-    fun acceptQuest(user: User?, partyId: String): Flowable<Void>
-    fun rejectQuest(user: User?, partyId: String): Flowable<Void>
+
+    fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group>
+    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>>
+
+    fun acceptQuest(user: User?, partyId: String = "party"): Flowable<Void>
+    fun rejectQuest(user: User?, partyId: String = "party"): Flowable<Void>
 
     fun leaveQuest(partyId: String): Flowable<Void>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
index 6e98dacd2..01026d5ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
@@ -16,6 +16,7 @@ import java.util.*
 interface TaskRepository : BaseRepository {
     fun getTasks(taskType: String, userID: String): Flowable<RealmResults<Task>>
     fun getTasks(userId: String): Flowable<RealmResults<Task>>
+    fun getCurrentUserTasks(taskType: String): Flowable<RealmResults<Task>>
     fun getTasksOfType(taskType: String): Flowable<RealmResults<Task>>
     fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList)
 
@@ -55,7 +56,7 @@ interface TaskRepository : BaseRepository {
 
     fun getTaskCopies(tasks: List<Task>): Flowable<List<Task>>
 
-    fun updateDailiesIsDue(date: Date): Flowable<TaskList>
+    fun retrieveDailiesFromDate(date: Date): Flowable<TaskList>
     fun retrieveCompletedTodos(userId: String): Flowable<TaskList>
     fun syncErroredTasks(): Single<List<Task>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 00953c4a3..de0d4f27b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -1,8 +1,6 @@
 package com.habitrpg.android.habitica.data.implementation
 
 import android.content.Context
-import android.util.Log
-import androidx.appcompat.app.AlertDialog
 import com.amplitude.api.Amplitude
 import com.google.gson.JsonSyntaxException
 import com.habitrpg.android.habitica.BuildConfig
@@ -26,10 +24,7 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.*
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
@@ -82,7 +77,6 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
                 .observeOn(AndroidSchedulers.mainThread())
                 .doOnError(this)
     }
-    private val displayedAlert: AlertDialog? = null
     private var languageCode: String? = null
     private var lastAPICallURL: String? = null
 
@@ -96,7 +90,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         buildRetrofit()
     }
 
-    fun buildRetrofit() {
+    private fun buildRetrofit() {
         val logging = HttpLoggingInterceptor()
         if (BuildConfig.DEBUG) {
             logging.level = HttpLoggingInterceptor.Level.BODY
@@ -123,13 +117,12 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
                     if (userAgent != null) {
                         builder = builder.header("user-agent", userAgent)
                     }
-                    if (!BuildConfig.STAGING_KEY.isEmpty()) {
+                    if (BuildConfig.STAGING_KEY.isNotEmpty()) {
                         builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
                     }
                     val request = builder.method(original.method(), original.body())
                             .build()
                     lastAPICallURL = original.url().toString()
-                    Log.d("NETWORK", lastAPICallURL)
                     chain.proceed(request)
                 }
                 .readTimeout(2400, TimeUnit.SECONDS)
@@ -196,15 +189,11 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
             val res = getErrorResponse(error)
             val status = error.code()
 
-            if (error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
+            if (status == 404 || error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
                 //workaround for an error that sometimes displays that the user already has this push device
                 return
             }
 
-            if (status == 404) {
-                return
-            }
-
             if (status in 400..499) {
                 if (res.displayMessage.isNotEmpty()) {
                     showConnectionProblemDialog("", res.displayMessage)
@@ -251,8 +240,12 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return userObservable
     }
 
-    override fun retrieveInboxMessages(): Flowable<List<ChatMessage>> {
-        return apiService.inboxMessages.compose(configureApiCallObserver())
+    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
+        return apiService.getInboxMessages(uuid, page).compose(configureApiCallObserver())
+    }
+
+    override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
+        return apiService.getInboxConversations().compose(configureApiCallObserver())
     }
 
     override fun hasAuthenticationKeys(): Boolean {
@@ -482,10 +475,14 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.createGroup(group).compose(configureApiCallObserver())
     }
 
-    override fun updateGroup(id: String, item: Group): Flowable<Void> {
+    override fun updateGroup(id: String, item: Group): Flowable<Group> {
         return apiService.updateGroup(id, item).compose(configureApiCallObserver())
     }
 
+    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void> {
+        return apiService.removeMemberFromGroup(groupID, userID).compose(configureApiCallObserver())
+    }
+
     override fun listGroupChat(groupId: String): Flowable<List<ChatMessage>> {
         return apiService.listGroupChat(groupId).compose(configureApiCallObserver())
     }
@@ -494,8 +491,8 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.joinGroup(groupId).compose(configureApiCallObserver())
     }
 
-    override fun leaveGroup(groupId: String): Flowable<Void> {
-        return apiService.leaveGroup(groupId).compose(configureApiCallObserver())
+    override fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void> {
+        return apiService.leaveGroup(groupId, keepChallenges).compose(configureApiCallObserver())
     }
 
     override fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult> {
@@ -525,11 +522,15 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.flagMessage(groupId, mid, data).compose(configureApiCallObserver())
     }
 
+    override fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Flowable<Void> {
+        return apiService.flagInboxMessage(mid, data).compose(configureApiCallObserver())
+    }
+
     override fun seenMessages(groupId: String): Flowable<Void> {
         return apiService.seenMessages(groupId).compose(configureApiCallObserver())
     }
 
-    override fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<List<String>> {
+    override fun inviteToGroup(groupId: String, inviteData: Map<String, Any>): Flowable<Void> {
         return apiService.inviteToGroup(groupId, inviteData).compose(configureApiCallObserver())
     }
 
@@ -648,7 +649,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
     }
 
     override fun updateChallenge(challenge: Challenge): Flowable<Challenge> {
-        return apiService.updateChallenge(challenge.id, challenge).compose(configureApiCallObserver())
+        return apiService.updateChallenge(challenge.id ?: "", challenge).compose(configureApiCallObserver())
     }
 
     override fun deleteChallenge(challengeId: String): Flowable<Void> {
@@ -759,8 +760,6 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         get() = apiService.worldState.compose(configureApiCallObserver())
 
     companion object {
-        private const val TAG = "ApiClientImpl"
-
         fun createGsonFactory(): GsonConverterFactory {
             return GSonFactoryCreator.create()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
index 8601455f6..1257faaf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
@@ -13,65 +13,22 @@ class SetupCustomizationRepositoryImpl @Inject
 constructor(private val context: Context) : SetupCustomizationRepository {
 
     private val wheelchairs: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createWheelchair("none", 0),
-                SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black),
-                SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue),
-                SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green),
-                SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink),
-                SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red),
-                SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow)
-        )
+        get() = listOf(SetupCustomization.createWheelchair("none", 0), SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black), SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue), SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green), SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink), SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red), SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow))
 
     private val glasses: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createGlasses("", R.drawable.creator_blank_face),
-                SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
-                SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
-                SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
-                SetupCustomization.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe),
-                SetupCustomization.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe),
-                SetupCustomization.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe),
-                SetupCustomization.createGlasses("eyewear_special_whiteTopFrame", R.drawable.creator_eyewear_special_whitetopframe)
-        )
+        get() = listOf(SetupCustomization.createGlasses("", R.drawable.creator_blank_face), SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe), SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe), SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe), SetupCustomization.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe), SetupCustomization.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe), SetupCustomization.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe), SetupCustomization.createGlasses("eyewear_special_whiteTopFrame", R.drawable.creator_eyewear_special_whitetopframe))
 
     private val flowers: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createFlower("0", R.drawable.creator_blank_face),
-                SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1),
-                SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2),
-                SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3),
-                SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4),
-                SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5),
-                SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6)
-        )
+        get() = listOf(SetupCustomization.createFlower("0", R.drawable.creator_blank_face), SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1), SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2), SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3), SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4), SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5), SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6))
 
     private val hairColors: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createHairColor("white", R.color.hair_white),
-                SetupCustomization.createHairColor("brown", R.color.hair_brown),
-                SetupCustomization.createHairColor("blond", R.color.hair_blond),
-                SetupCustomization.createHairColor("red", R.color.hair_red),
-                SetupCustomization.createHairColor("black", R.color.hair_black)
-        )
+        get() = listOf(SetupCustomization.createHairColor("white", R.color.hair_white), SetupCustomization.createHairColor("brown", R.color.hair_brown), SetupCustomization.createHairColor("blond", R.color.hair_blond), SetupCustomization.createHairColor("red", R.color.hair_red), SetupCustomization.createHairColor("black", R.color.hair_black))
 
     private val sizes: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)),
-                SetupCustomization.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad))
-        )
+        get() = listOf(SetupCustomization.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)), SetupCustomization.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad)))
 
     private val skins: List<SetupCustomization>
-        get() = Arrays.asList(
-                SetupCustomization.createSkin("ddc994", R.color.skin_ddc994),
-                SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e),
-                SetupCustomization.createSkin("ea8349", R.color.skin_ea8349),
-                SetupCustomization.createSkin("c06534", R.color.skin_c06534),
-                SetupCustomization.createSkin("98461a", R.color.skin_98461a),
-                SetupCustomization.createSkin("915533", R.color.skin_915533),
-                SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc),
-                SetupCustomization.createSkin("6bd049", R.color.skin_6bd049)
-        )
+        get() = listOf(SetupCustomization.createSkin("ddc994", R.color.skin_ddc994), SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e), SetupCustomization.createSkin("ea8349", R.color.skin_ea8349), SetupCustomization.createSkin("c06534", R.color.skin_c06534), SetupCustomization.createSkin("98461a", R.color.skin_98461a), SetupCustomization.createSkin("915533", R.color.skin_915533), SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc), SetupCustomization.createSkin("6bd049", R.color.skin_6bd049))
 
     override fun getCustomizations(type: String, user: User): List<SetupCustomization> {
         return getCustomizations(type, null, user)
@@ -108,41 +65,18 @@ constructor(private val context: Context) : SetupCustomizationRepository {
     }
 
     private fun getHairBases(color: String): List<SetupCustomization> {
-        return Arrays.asList(
-                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_$color")),
-                SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_$color"))
-        )
+        return listOf(SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face), SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_$color")), SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_$color")))
     }
 
     private fun getBangs(color: String): List<SetupCustomization> {
-        return Arrays.asList(
-                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_$color")),
-                SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_$color")),
-                SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_$color"))
-        )
+        return listOf(SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face), SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_$color")), SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_$color")), SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_$color")))
     }
 
     private fun getShirts(size: String): List<SetupCustomization> {
         return if (size == "broad") {
-            Arrays.asList(
-                    SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black),
-                    SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue),
-                    SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green),
-                    SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink),
-                    SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white),
-                    SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow)
-            )
+            listOf(SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black), SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue), SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green), SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink), SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white), SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow))
         } else {
-            Arrays.asList(
-                    SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black),
-                    SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue),
-                    SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green),
-                    SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink),
-                    SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white),
-                    SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow)
-            )
+            listOf(SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black), SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue), SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green), SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink), SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white), SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow))
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index b5ff7386e..3ee0ea7d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.data.implementation
 
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository
@@ -8,10 +9,7 @@ import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.*
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Single
@@ -20,6 +18,25 @@ import io.reactivex.functions.Consumer
 import io.realm.RealmResults
 
 class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, userID), SocialRepository {
+    override fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group> {
+        return localRepository.getGroup(groupID)
+                .map {
+                    val group = localRepository.getUnmanagedCopy(it)
+                    group.leaderID = userID
+                    group
+                }
+                .flatMap {
+                    apiClient.updateGroup(it.id, it)
+                }
+    }
+
+    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>> {
+        return apiClient.removeMemberFromGroup(groupID, userID)
+                .flatMap {
+                    retrieveGroupMembers(groupID, true)
+                }
+    }
+
     override fun getChatmessage(messageID: String): Flowable<ChatMessage> {
         return localRepository.getChatMessage(messageID)
     }
@@ -52,12 +69,18 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     }
 
     override fun flagMessage(chatMessage: ChatMessage, additionalInfo: String): Flowable<Void> {
-        return if (chatMessage.id == "") {
-            Flowable.empty()
-        } else {
-            val data = mutableMapOf<String, String>()
-            data["comment"] = additionalInfo
-            apiClient.flagMessage(chatMessage.groupId ?: "", chatMessage.id, data)
+        return when {
+            chatMessage.id == "" -> Flowable.empty()
+            userID == BuildConfig.ANDROID_TESTING_UUID -> Flowable.empty()
+            else -> {
+                val data = mutableMapOf<String, String>()
+                data["comment"] = additionalInfo
+                if (chatMessage.isInboxMessage) {
+                    apiClient.flagInboxMessage(chatMessage.id, data)
+                } else {
+                    apiClient.flagMessage(chatMessage.groupId ?: "", chatMessage.id, data)
+                }
+            }
         }
     }
 
@@ -120,11 +143,11 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         return localRepository.getGroup(id)
     }
 
-    override fun leaveGroup(id: String?): Flowable<Group> {
+    override fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group> {
         if (id == null) {
             return Flowable.empty()
         }
-        return apiClient.leaveGroup(id)
+        return apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
                 .doOnNext { localRepository.updateMembership(userID, id, false) }
                 .flatMapMaybe { localRepository.getGroup(id).firstElement() }
     }
@@ -152,7 +175,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         }
     }
 
-    override fun updateGroup(group: Group?, name: String?, description: String?, leader: String?, leaderCreateChallenge: Boolean?): Flowable<Void> {
+    override fun updateGroup(group: Group?, name: String?, description: String?, leader: String?, leaderCreateChallenge: Boolean?): Flowable<Group> {
         if (group == null) {
             return Flowable.empty()
         }
@@ -182,28 +205,34 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
 
     override fun getPublicGuilds(): Flowable<RealmResults<Group>> = localRepository.getPublicGuilds()
 
-    override fun getInboxOverviewList(): Flowable<RealmResults<ChatMessage>> = localRepository.getInboxOverviewList(userID)
+    override fun getInboxConversations(): Flowable<RealmResults<InboxConversation>> = localRepository.getInboxConversation(userID)
 
     override fun getInboxMessages(replyToUserID: String?): Flowable<RealmResults<ChatMessage>> = localRepository.getInboxMessages(userID, replyToUserID)
 
-    override fun retrieveInboxMessages(): Flowable<List<ChatMessage>> {
-        return apiClient.retrieveInboxMessages().doOnNext { messages ->
+    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
+        return apiClient.retrieveInboxMessages(uuid, page).doOnNext { messages ->
             messages.forEach {
                 it.isInboxMessage = true
             }
-            localRepository.saveInboxMessages(userID, messages)
+            localRepository.saveInboxMessages(userID, uuid, messages, page)
         }
     }
 
-    override fun postPrivateMessage(messageObject: HashMap<String, String>): Flowable<List<ChatMessage>> {
-        return apiClient.postPrivateMessage(messageObject).flatMap { retrieveInboxMessages() }
+    override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
+        return apiClient.retrieveInboxConversations().doOnNext { conversations ->
+            localRepository.saveInboxConversations(userID, conversations)
+        }
+    }
+
+    override fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): Flowable<List<ChatMessage>> {
+        return apiClient.postPrivateMessage(messageObject).flatMap { retrieveInboxMessages(recipientId, 0) }
     }
 
     override fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>> {
         val messageObject = HashMap<String, String>()
         messageObject["message"] = message
         messageObject["toUserId"] = recipientId
-        return postPrivateMessage(messageObject)
+        return postPrivateMessage(recipientId, messageObject)
     }
 
     override fun getGroupMembers(id: String): Flowable<RealmResults<Member>> = localRepository.getGroupMembers(id)
@@ -213,7 +242,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
                 .doOnNext { members -> localRepository.saveGroupMembers(id, members) }
     }
 
-    override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<String>> = apiClient.inviteToGroup(id, inviteData)
+    override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<Void> = apiClient.inviteToGroup(id, inviteData)
 
     override fun getMember(userId: String?): Flowable<Member> {
         return if (userId == null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 524bcae90..7aa6cdd62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -32,6 +32,9 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
     override fun getTasks(userId: String): Flowable<RealmResults<Task>> =
             this.localRepository.getTasks(userId)
 
+    override fun getCurrentUserTasks(taskType: String): Flowable<RealmResults<Task>> =
+            this.localRepository.getTasks(taskType, userID)
+
     override fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList) {
         localRepository.saveTasks(userId, order, tasks)
     }
@@ -82,61 +85,67 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
         if (lastTaskAction > now - 500 && !force || id == null) {
             return Flowable.empty()
         }
+
         lastTaskAction = now
         return this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text)
-                .map { res ->
+                .flatMapMaybe {
+                    // There are cases where the user object is not set correctly. So the app refetches it as a fallback
+                    if (user == null) {
+                        localRepository.getUser(userID).firstElement()
+                    } else {
+                        Maybe.just(user)
+                    }.map { user -> Pair(it, user) }
+                }
+                .map { (res, user): Pair<TaskDirectionData, User> ->
                     // save local task changes
                     val result = TaskScoringResult()
-                    if (user != null) {
-                        val stats = user.stats
+                    val stats = user.stats
 
-                        result.healthDelta = res.hp - (stats?.hp ?: 0.0)
-                        result.experienceDelta = res.exp - (stats?.exp ?: 0.0)
-                        result.manaDelta = res.mp - (stats?.mp ?: 0.0)
-                        result.goldDelta = res.gp - (stats?.gp ?: 0.0)
-                        result.hasLeveledUp = res.lvl > stats?.lvl ?: 0
-                        result.questDamage = res._tmp?.quest?.progressDelta
-                        result.drop = res._tmp?.drop
-                        if (localData == null) {
-                            notifyFunc?.invoke(result)
-                        }
+                    result.healthDelta = res.hp - (stats?.hp ?: 0.0)
+                    result.experienceDelta = res.exp - (stats?.exp ?: 0.0)
+                    result.manaDelta = res.mp - (stats?.mp ?: 0.0)
+                    result.goldDelta = res.gp - (stats?.gp ?: 0.0)
+                    result.hasLeveledUp = res.lvl > stats?.lvl ?: 0
+                    result.questDamage = res._tmp?.quest?.progressDelta
+                    result.drop = res._tmp?.drop
+                    if (localData == null) {
+                        notifyFunc?.invoke(result)
                     }
                     handleTaskResponse(user, res, task, up, localData?.delta ?: 0f)
                     result
                 }
     }
 
-    private fun handleTaskResponse(user: User?, res: TaskDirectionData, task: Task, up: Boolean, localDelta: Float) {
-        if (user != null) {
-            val stats = user.stats
-            this.localRepository.executeTransaction {
-                if (!task.isValid) {
-                    return@executeTransaction
-                }
-                if (task.type != "reward" && (task.value - localDelta) + res.delta != task.value) {
-                    task.value = (task.value - localDelta) + res.delta
-                    if (Task.TYPE_DAILY == task.type || Task.TYPE_TODO == task.type) {
-                        task.completed = up
-                        if (Task.TYPE_DAILY == task.type && up) {
-                            task.streak = (task.streak ?: 0) + 1
-                        }
-                    } else if (Task.TYPE_HABIT == task.type) {
-                        if (up) {
-                            task.counterUp = (task.counterUp ?: 0) + 1
-                        } else {
-                            task.counterDown = (task.counterDown ?: 0) + 1
-                        }
+    private fun handleTaskResponse(user: User, res: TaskDirectionData, task: Task, up: Boolean, localDelta: Float) {
+        val userID = user.id
+        val taskID = task.id
+        this.localRepository.executeTransactionAsync {
+            val bgTask = it.where(Task::class.java).equalTo("id", taskID).findFirst() ?: return@executeTransactionAsync
+            val bgUser = it.where(User::class.java).equalTo("id", userID).findFirst() ?: return@executeTransactionAsync
+            if (bgTask.type != "reward" && (bgTask.value - localDelta) + res.delta != bgTask.value) {
+                bgTask.value = (bgTask.value - localDelta) + res.delta
+                if (Task.TYPE_DAILY == bgTask.type || Task.TYPE_TODO == bgTask.type) {
+                    bgTask.completed = up
+                    if (Task.TYPE_DAILY == bgTask.type && up) {
+                        bgTask.streak = (bgTask.streak ?: 0) + 1
+                    }
+                } else if (Task.TYPE_HABIT == bgTask.type) {
+                    if (up) {
+                        bgTask.counterUp = (bgTask.counterUp ?: 0) + 1
+                    } else {
+                        bgTask.counterDown = (bgTask.counterDown ?: 0) + 1
                     }
                 }
-                stats?.hp = res.hp
-                stats?.exp = res.exp
-                stats?.mp = res.mp
-                stats?.gp = res.gp
-                stats?.lvl = res.lvl
-                user.party?.quest?.progress?.up = (user.party?.quest?.progress?.up
-                        ?: 0F) + (res._tmp?.quest?.progressDelta?.toFloat() ?: 0F)
-                user.stats = stats
             }
+            val stats = bgUser.stats
+            stats?.hp = res.hp
+            stats?.exp = res.exp
+            stats?.mp = res.mp
+            stats?.gp = res.gp
+            stats?.lvl = res.lvl.toInt()
+            bgUser.party?.quest?.progress?.up = (bgUser.party?.quest?.progress?.up
+                    ?: 0F) + (res._tmp?.quest?.progressDelta?.toFloat() ?: 0F)
+            bgUser.stats = stats
         }
     }
 
@@ -263,10 +272,9 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
     override fun getTaskCopies(tasks: List<Task>): Flowable<List<Task>> =
             Flowable.just(localRepository.getUnmanagedCopy(tasks))
 
-    override fun updateDailiesIsDue(date: Date): Flowable<TaskList> {
+    override fun retrieveDailiesFromDate(date: Date): Flowable<TaskList> {
         val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
         return apiClient.getTasks("dailys", formatter.format(date))
-                .flatMapMaybe { localRepository.updateIsdue(it) }
     }
 
     override fun syncErroredTasks(): Single<List<Task>> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index 13c779ac5..a453b1aae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -352,8 +352,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (newUser.profile != null) {
             copiedUser.profile = newUser.profile
         }
+        copiedUser.versionNumber = newUser.versionNumber
 
         localRepository.saveUser(copiedUser)
-        return oldUser
+        return copiedUser
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
index 19d5da096..daab2d4ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
@@ -11,6 +11,8 @@ interface BaseLocalRepository {
 
     fun executeTransaction(transaction: (Realm) -> Unit)
     fun executeTransaction(transaction: Realm.Transaction)
+    fun executeTransactionAsync(transaction: (Realm) -> Unit)
+    fun executeTransactionAsync(transaction: Realm.Transaction)
 
     fun <T : RealmObject> getUnmanagedCopy(managedObject: T): T
     fun <T : RealmObject> getUnmanagedCopy(list: List<T>): List<T>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index 0d45ad128..542428130 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.realm.RealmResults
@@ -42,8 +43,9 @@ interface SocialLocalRepository : BaseLocalRepository {
 
     fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>>
 
-    fun getInboxOverviewList(userId: String): Flowable<RealmResults<ChatMessage>>
+    fun getInboxConversation(userId: String): Flowable<RealmResults<InboxConversation>>
     fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>)
-    fun saveInboxMessages(userID: String, messages: List<ChatMessage>)
+    fun saveInboxMessages(userID: String, recipientID: String, messages: List<ChatMessage>, page: Int)
+    fun saveInboxConversations(userID: String, conversations: List<InboxConversation>)
     fun getChatMessage(messageID: String): Flowable<ChatMessage>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
index 733862d80..eab649202 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
+import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.realm.RealmResults
@@ -33,4 +34,5 @@ interface TaskLocalRepository : BaseLocalRepository {
     fun updateTaskPositions(taskOrder: List<String>)
     fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>)
     fun getErroredTasks(userID: String): Flowable<RealmResults<Task>>
+    fun getUser(userID: String): Flowable<User>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
index 1707d4c62..665d94f9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
@@ -15,15 +15,29 @@ abstract class RealmBaseLocalRepository internal constructor(protected var realm
     }
 
     override fun executeTransaction(transaction: (Realm) -> Unit) {
+        if (isClosed) { return }
         realm.executeTransaction {
             transaction(it)
         }
     }
 
     override fun executeTransaction(transaction: Realm.Transaction) {
+        if (isClosed) { return }
         realm.executeTransaction(transaction)
     }
 
+    override fun executeTransactionAsync(transaction: (Realm) -> Unit) {
+        if (isClosed) { return }
+        realm.executeTransactionAsync {
+            transaction(it)
+        }
+    }
+
+    override fun executeTransactionAsync(transaction: Realm.Transaction) {
+        if (isClosed) { return }
+        realm.executeTransactionAsync(transaction)
+    }
+
     override fun <T : RealmObject> getUnmanagedCopy(managedObject: T): T {
         return if (managedObject.isManaged && managedObject.isValid) {
             realm.copyFromRealm(managedObject)
@@ -33,18 +47,22 @@ abstract class RealmBaseLocalRepository internal constructor(protected var realm
     }
 
     override fun <T : RealmObject> getUnmanagedCopy(list: List<T>): List<T> {
+        if (isClosed) { return emptyList() }
         return realm.copyFromRealm(list)
     }
 
     override fun <T : RealmObject> save(`object`: T) {
+        if (isClosed) { return }
         realm.executeTransactionAsync { realm1 -> realm1.insertOrUpdate(`object`) }
     }
 
     override fun <T : RealmObject> save(objects: List<T>) {
+        if (isClosed) { return }
         realm.executeTransactionAsync { realm1 -> realm1.insertOrUpdate(objects) }
     }
 
     override fun <T : RealmObject> saveSyncronous(`object`: T) {
+        if (isClosed) { return }
         realm.executeTransaction { realm1 -> realm1.insertOrUpdate(`object`) }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
index f93866746..f7e676126 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
@@ -81,13 +81,11 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
 
     override fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean) {
         if (isParticipating) {
-            realm.executeTransaction {
-                realm.insertOrUpdate(ChallengeMembership(userID, challengeID))
-            }
+            save(ChallengeMembership(userID, challengeID))
         } else {
             val membership = realm.where(ChallengeMembership::class.java).equalTo("userID", userID).equalTo("challengeID", challengeID).findFirst()
             if (membership != null) {
-                realm.executeTransaction {
+                executeTransaction {
                     membership.deleteFromRealm()
                 }
             }
@@ -103,12 +101,12 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                     challengesToDelete.add(localTask)
                 }
             }
-            realm.executeTransaction {
+            executeTransaction {
                 for (localTask in challengesToDelete) {
                     localTask.deleteFromRealm()
                 }
             }
         }
-        realm.executeTransaction { realm1 -> realm1.insertOrUpdate(challenges) }
+        executeTransaction { realm1 -> realm1.insertOrUpdate(challenges) }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
index 39cbdf721..53b1065b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
@@ -13,9 +13,9 @@ open class RealmContentLocalRepository(realm: Realm) : RealmBaseLocalRepository(
 
     override fun saveContent(contentResult: ContentResult) {
         realm.executeTransactionAsync { realm1 ->
-            realm1.insertOrUpdate(contentResult.potion)
-            realm1.insertOrUpdate(contentResult.armoire)
-            realm1.insertOrUpdate(contentResult.gear.flat)
+            contentResult.potion?.let { realm1.insertOrUpdate(it) }
+            contentResult.armoire?.let { realm1.insertOrUpdate(it) }
+            contentResult.gear?.flat?.let { realm1.insertOrUpdate(it) }
 
             realm1.insertOrUpdate(contentResult.quests)
             realm1.insertOrUpdate(contentResult.eggs)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index 6d53a8aa9..fb2190765 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -82,7 +82,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
     }
 
     override fun getItems(itemClass: Class<out Item>, keys: Array<String>, user: User?): Flowable<out RealmResults<out Item>> {
-        return realm.where(itemClass).`in`("key", keys).findAllAsync().asFlowable()
+        return realm.where(itemClass).`in`("key", keys).findAll().asFlowable()
                 .filter { it.isLoaded }
     }
 
@@ -175,7 +175,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
 
     override fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?) {
         amountToAdd?.let { amount ->
-            realm.executeTransaction { item.numberOwned = item.numberOwned + amount }
+            executeTransaction { item.numberOwned = item.numberOwned + amount }
         }
     }
 
@@ -208,7 +208,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
             return
         }
         val item = realm.where(OwnedItem::class.java).equalTo("combinedKey", "${user.id}specialinventory_present").findFirst()
-        realm.executeTransaction {
+        executeTransaction {
             if (item != null && item.isValid) {
                 item.numberOwned = item.numberOwned - 1
             }
@@ -220,14 +220,14 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
 
     override fun getInAppRewards(): Flowable<RealmResults<ShopItem>> {
         return realm.where(ShopItem::class.java)
-                .findAllAsync()
+                .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
     }
 
     override fun saveInAppRewards(onlineItems: List<ShopItem>) {
         val localItems = realm.where(ShopItem::class.java).findAll().createSnapshot()
-        realm.executeTransaction {
+        executeTransaction {
             for (localItem in localItems) {
                 if (!onlineItems.contains(localItem)) {
                     localItem.deleteFromRealm()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index ffa20a5d3..6e76f8c7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -36,22 +36,22 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
 
     override fun updateMembership(userId: String, id: String, isMember: Boolean) {
         if (isMember) {
-            realm.executeTransaction {
-                realm.insertOrUpdate(GroupMembership(userId, id))
-            }
+            save(GroupMembership(userId, id))
         } else {
             val membership = realm.where(GroupMembership::class.java).equalTo("userID", userId).equalTo("groupID", id).findFirst()
             if (membership != null) {
-                realm.executeTransaction {
+                executeTransaction {
                     membership.deleteFromRealm()
                 }
             }
         }
     }
 
-    override fun saveInboxMessages(userID: String, messages: List<ChatMessage>) {
-        realm.executeTransaction { realm.insertOrUpdate(messages) }
-        val existingMessages = realm.where(ChatMessage::class.java).equalTo("isInboxMessage", true).findAll()
+    override fun saveInboxMessages(userID: String, recipientID: String, messages: List<ChatMessage>, page: Int) {
+        messages.forEach { it.userID = userID }
+        save(messages)
+        if (page != 0) return
+        val existingMessages = realm.where(ChatMessage::class.java).equalTo("isInboxMessage", true).equalTo("uuid", recipientID).findAll()
         val messagesToRemove = ArrayList<ChatMessage>()
         for (existingMessage in existingMessages) {
             val isStillMember = messages.any { existingMessage.id == it.id }
@@ -59,13 +59,29 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                 messagesToRemove.add(existingMessage)
             }
         }
-        realm.executeTransaction {
+        executeTransaction {
             messagesToRemove.forEach { it.deleteFromRealm() }
         }
     }
 
+    override fun saveInboxConversations(userID: String, conversations: List<InboxConversation>) {
+        conversations.forEach { it.userID = userID }
+        save(conversations)
+        val existingConversations = realm.where(InboxConversation::class.java).findAll()
+        val conversationsToRemove = ArrayList<InboxConversation>()
+        for (existingMessage in existingConversations) {
+            val isStillMember = conversations.any { existingMessage.uuid == it.uuid }
+            if (!isStillMember) {
+                conversationsToRemove.add(existingMessage)
+            }
+        }
+        executeTransaction {
+            conversationsToRemove.forEach { it.deleteFromRealm() }
+        }
+    }
+
     override fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>) {
-        realm.executeTransaction { realm.insertOrUpdate(memberships) }
+        save(memberships)
         if (userID != null) {
             val existingMemberships = realm.where(GroupMembership::class.java).equalTo("userID", userID).findAll()
             val membersToRemove = ArrayList<GroupMembership>()
@@ -75,7 +91,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                     membersToRemove.add(existingMembership)
                 }
             }
-            realm.executeTransaction {
+            executeTransaction {
                 membersToRemove.forEach { it.deleteFromRealm() }
             }
         }
@@ -113,7 +129,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     override fun getGroups(type: String): Flowable<RealmResults<Group>> {
         return realm.where(Group::class.java)
                 .equalTo("type", type)
-                .findAllAsync()
+                .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
     }
@@ -137,19 +153,19 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     }
 
     override fun deleteMessage(id: String) {
-        getMessage(id).firstElement().subscribe { chatMessage -> realm.executeTransaction { chatMessage.deleteFromRealm() } }
+        getMessage(id).firstElement().subscribe { chatMessage -> executeTransaction { chatMessage.deleteFromRealm() } }
     }
 
     override fun getGroupMembers(partyId: String): Flowable<RealmResults<Member>> {
         return realm.where(Member::class.java)
                 .equalTo("party.id", partyId)
-                .findAllAsync()
+                .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
     }
 
     override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
-        realm.executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
+        executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
     }
 
     override fun likeMessage(chatMessage: ChatMessage, userId: String, liked: Boolean) {
@@ -157,14 +173,14 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             return
         }
         if (liked) {
-            realm.executeTransaction { chatMessage.likes?.add(ChatMessageLike(userId, chatMessage.id)) }
+            executeTransaction { chatMessage.likes?.add(ChatMessageLike(userId, chatMessage.id)) }
         } else {
-            chatMessage.likes?.filter { userId == it.id }?.forEach { like -> realm.executeTransaction { like.deleteFromRealm() } }
+            chatMessage.likes?.filter { userId == it.id }?.forEach { like -> executeTransaction { like.deleteFromRealm() } }
         }
     }
 
     override fun saveGroupMembers(groupId: String?, members: List<Member>) {
-        realm.executeTransaction { realm.insertOrUpdate(members) }
+        save(members)
         if (groupId != null) {
             val existingMembers = realm.where(Member::class.java).equalTo("party.id", groupId).findAll()
             val membersToRemove = ArrayList<Member>()
@@ -174,7 +190,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                     membersToRemove.add(existingMember)
                 }
             }
-            realm.executeTransaction {
+            executeTransaction {
                 membersToRemove.forEach { it.deleteFromRealm() }
             }
         }
@@ -182,7 +198,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
 
     override fun rejectGroupInvitation(userID: String, groupID: String) {
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst()
-        realm.executeTransaction {
+        executeTransaction {
             user?.invitations?.removeInvitation(groupID)
         }
     }
@@ -190,18 +206,18 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     override fun removeQuest(partyId: String) {
         val party = realm.where(Group::class.java).equalTo("id", partyId).findFirst()
         if (party != null) {
-            realm.executeTransaction { party.quest = null }
+            executeTransaction { party.quest = null }
         }
     }
 
     override fun setQuestActivity(party: Group?, active: Boolean) {
-        realm.executeTransaction {
+        executeTransaction {
             party?.quest?.active = active
         }
     }
 
     override fun saveChatMessages(groupId: String?, chatMessages: List<ChatMessage>) {
-        realm.executeTransaction { realm.insertOrUpdate(chatMessages) }
+        save(chatMessages)
         if (groupId != null) {
             val existingMessages = realm.where(ChatMessage::class.java).equalTo("groupId", groupId).findAll()
             val messagesToRemove = ArrayList<ChatMessage>()
@@ -214,7 +230,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             val idsToRemove = messagesToRemove.map { it.id }
             val userStylestoRemove = realm.where(UserStyles::class.java).`in`("id", idsToRemove.toTypedArray()).findAll()
             val contributorToRemove = realm.where(ContributorInfo::class.java).`in`("userId", idsToRemove.toTypedArray()).findAll()
-            realm.executeTransaction {
+            executeTransaction {
                 for (member in messagesToRemove) {
                     member.deleteFromRealm()
                 }
@@ -227,7 +243,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
 
     private fun getMessage(id: String): Flowable<ChatMessage> {
         return realm.where(ChatMessage::class.java).equalTo("id", id)
-                .findAllAsync()
+                .findAll()
                 .asFlowable()
                 .filter { messages -> messages.isLoaded && messages.isValid && !messages.isEmpty() }
                 .map { messages -> messages.first() }
@@ -238,21 +254,21 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
+    override fun getInboxMessages(userID: String, replyToUserID: String?): Flowable<RealmResults<ChatMessage>> {
         return realm.where(ChatMessage::class.java)
                 .equalTo("isInboxMessage", true)
                 .equalTo("uuid", replyToUserID)
+                .equalTo("userID", userID)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
     }
 
-    override fun getInboxOverviewList(userId: String): Flowable<RealmResults<ChatMessage>> {
-        return realm.where(ChatMessage::class.java)
-                .equalTo("isInboxMessage", true)
+    override fun getInboxConversation(userID: String): Flowable<RealmResults<InboxConversation>> {
+        return realm.where(InboxConversation::class.java)
+                .equalTo("userID", userID)
                 .sort("timestamp", Sort.DESCENDING)
-                .distinct("uuid")
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
index fe95afe68..f0da06d7b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.kt
@@ -10,7 +10,7 @@ import io.realm.RealmResults
 class RealmTagLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TagLocalRepository {
     override fun deleteTag(tagID: String) {
         val tag = realm.where(Tag::class.java).equalTo("id", tagID).findFirst()
-        realm.executeTransaction { tag?.deleteFromRealm() }
+        executeTransaction { tag?.deleteFromRealm() }
     }
 
     override fun getTags(userId: String): Flowable<RealmResults<Tag>> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 12af5e247..b68bc336a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository
 import com.habitrpg.android.habitica.models.tasks.*
+import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.realm.Realm
@@ -12,6 +13,9 @@ import io.realm.Sort
 class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TaskLocalRepository {
 
     override fun getTasks(taskType: String, userID: String): Flowable<RealmResults<Task>> {
+        if (realm.isClosed) {
+            return Flowable.empty()
+        }
         return realm.where(Task::class.java)
                 .equalTo("type", taskType)
                 .equalTo("userId", userID)
@@ -23,6 +27,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getTasks(userId: String): Flowable<RealmResults<Task>> {
+        if (realm.isClosed) {
+            return Flowable.empty()
+        }
         return realm.where(Task::class.java).equalTo("userId", userId)
                 .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
                 .findAll()
@@ -66,10 +73,16 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 taskMap.remove(taskId)
             }
         }
+        for (task in taskMap.values) {
+            task.position = position
+            taskList.add(task)
+            position++
+        }
         return taskList
     }
 
     private fun removeOldTasks(userID: String, onlineTaskList: List<Task>) {
+        if (realm.isClosed) return
         val localTasks = realm.where(Task::class.java)
                 .equalTo("userId", userID)
                 .beginGroup()
@@ -83,7 +96,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 .findAll()
                 .createSnapshot()
         val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             for (localTask in tasksToDelete) {
                 localTask.checklist?.deleteAllFromRealm()
                 localTask.reminders?.deleteAllFromRealm()
@@ -100,7 +113,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 .findAll()
                 .createSnapshot()
         val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             for (localTask in tasksToDelete) {
                 localTask.checklist?.deleteAllFromRealm()
                 localTask.reminders?.deleteAllFromRealm()
@@ -112,7 +125,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     private fun removeOldChecklists(onlineItems: List<ChecklistItem>) {
         val localItems = realm.where(ChecklistItem::class.java).findAll().createSnapshot()
         val itemsToDelete = localItems.filterNot { onlineItems.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             for (item in itemsToDelete) {
                 item.deleteFromRealm()
             }
@@ -122,7 +135,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     private fun removeOldReminders(onlineReminders: List<RemindersItem>) {
         val localReminders = realm.where(RemindersItem::class.java).findAll().createSnapshot()
         val itemsToDelete = localReminders.filterNot { onlineReminders.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             for (item in itemsToDelete) {
                 item.deleteFromRealm()
             }
@@ -131,7 +144,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
 
     override fun deleteTask(taskID: String) {
         val task = realm.where(Task::class.java).equalTo("id", taskID).findFirstAsync()
-        realm.executeTransaction {
+        executeTransaction {
             if (task.isManaged) {
                 task.deleteFromRealm()
             }
@@ -139,6 +152,9 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun getTask(taskId: String): Flowable<Task> {
+        if (realm.isClosed) {
+            return Flowable.empty()
+        }
         return realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync().asFlowable<RealmObject>()
                 .filter { realmObject -> realmObject.isLoaded }
                 .cast(Task::class.java)
@@ -157,18 +173,18 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
 
     override fun markTaskCompleted(taskId: String, isCompleted: Boolean) {
         val task = realm.where(Task::class.java).equalTo("id", taskId).findFirstAsync()
-        realm.executeTransaction { task.completed = true }
+        executeTransaction { task.completed = true }
     }
 
     override fun saveReminder(remindersItem: RemindersItem) {
-        realm.executeTransaction { it.insertOrUpdate(remindersItem) }
+        executeTransaction { it.insertOrUpdate(remindersItem) }
     }
 
     override fun swapTaskPosition(firstPosition: Int, secondPosition: Int) {
         val firstTask = realm.where(Task::class.java).equalTo("position", firstPosition).findFirst()
         val secondTask = realm.where(Task::class.java).equalTo("position", secondPosition).findFirst()
         if (firstTask != null && secondTask != null && firstTask.isValid && secondTask.isValid) {
-            realm.executeTransaction {
+            executeTransaction {
                 firstTask.position = secondPosition
                 secondTask.position = firstPosition
             }
@@ -195,7 +211,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     override fun updateTaskPositions(taskOrder: List<String>) {
         if (taskOrder.isNotEmpty()) {
             val tasks = realm.where(Task::class.java).`in`("id", taskOrder.toTypedArray()).findAll()
-            realm.executeTransaction { _ ->
+            executeTransaction { _ ->
                 tasks.filter { taskOrder.contains(it.id) }.forEach { it.position = taskOrder.indexOf(it.id) }
             }
         }
@@ -210,4 +226,13 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 .asFlowable()
                 .filter { it.isLoaded }
                 .retry(1)    }
+
+    override fun getUser(userID: String): Flowable<User> {
+        return realm.where(User::class.java)
+                .equalTo("id", userID)
+                .findAll()
+                .asFlowable()
+                .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+                .map { users -> users.first() }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
index 842dd31dd..e7a1f2883 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
@@ -10,8 +10,9 @@ import io.realm.RealmResults
 class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TutorialLocalRepository {
 
     override fun getTutorialStep(key: String): Flowable<TutorialStep> {
+        if (realm.isClosed) return Flowable.empty()
         return realm.where(TutorialStep::class.java).equalTo("identifier", key)
-                .findAllAsync()
+                .findAll()
                 .asFlowable()
                 .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && realmObject.isNotEmpty() }
                 .map { steps ->
@@ -30,6 +31,7 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
     }
 
     override fun getTutorialSteps(keys: List<String>): Flowable<RealmResults<TutorialStep>> {
+        if (realm.isClosed) return Flowable.empty()
         return realm.where(TutorialStep::class.java)
                 .`in`("identifier", keys.toTypedArray())
                 .findAll()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index dc7364497..648f0e195 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -5,6 +5,8 @@ import com.habitrpg.android.habitica.models.*
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.realm.Realm
@@ -46,6 +48,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 .filter { it.isLoaded }
 
     override fun getUser(userID: String): Flowable<User> {
+        if (realm.isClosed) return Flowable.empty()
         return realm.where(User::class.java)
                 .equalTo("id", userID)
                 .findAll()
@@ -55,6 +58,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     }
 
     override fun saveUser(user: User) {
+        if (realm.isClosed) return
         val oldUser = realm.where(User::class.java)
                 .equalTo("id", user.id)
                 .findFirst()
@@ -63,17 +67,23 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
                 if (user.lastCron?.before(oldUser.lastCron) == true) {
                     user.needsCron = false
                 }
+            } else {
+                if (oldUser.versionNumber >= user.versionNumber) {
+                    return
+                }
             }
         }
-        realm.executeTransaction { realm1 -> realm1.insertOrUpdate(user) }
+        executeTransaction { realm1 -> realm1.insertOrUpdate(user) }
         removeOldTags(user.id ?: "", user.tags)
         if (user.challenges != null) {
             removeOldChallenges(user.id ?: "", user.challenges ?: emptyList())
         }
+        removeOldPets(user.id ?: "", user.items?.pets ?: emptyList())
+        removeOldMounts(user.id ?: "", user.items?.mounts ?: emptyList())
     }
 
     override fun saveMessages(messages: List<ChatMessage>) {
-        realm.executeTransaction {
+        executeTransaction {
             it.insertOrUpdate(messages)
         }
     }
@@ -81,7 +91,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     private fun removeOldTags(userId: String, onlineTags: List<Tag>) {
         val tags = realm.where(Tag::class.java).equalTo("userId", userId).findAll().createSnapshot()
         val tagsToDelete = tags.filterNot { onlineTags.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             for (tag in tagsToDelete) {
                 tag.deleteFromRealm()
             }
@@ -91,13 +101,33 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
     private fun removeOldChallenges(userID: String, onlineChallenges: List<ChallengeMembership>) {
         val memberships = realm.where(ChallengeMembership::class.java).equalTo("userID", userID).findAll().createSnapshot()
         val membershipsToDelete = memberships.filterNot { onlineChallenges.contains(it) }
-        realm.executeTransaction {
+        executeTransaction {
             membershipsToDelete.forEach {
                 it.deleteFromRealm()
             }
         }
     }
 
+    private fun removeOldPets(userID: String, onlinePets: List<OwnedPet>) {
+        val pets = realm.where(OwnedPet::class.java).equalTo("userID", userID).findAll().createSnapshot()
+        val petsToDelete = pets.filterNot { onlinePets.contains(it) }
+        executeTransaction {
+            petsToDelete.forEach {
+                it.deleteFromRealm()
+            }
+        }
+    }
+
+    private fun removeOldMounts(userID: String, onlineMounts: List<OwnedMount>) {
+        val mount = realm.where(OwnedMount::class.java).equalTo("userID", userID).findAll().createSnapshot()
+        val mountsToDelete = mount.filterNot { onlineMounts.contains(it) }
+        executeTransaction {
+            mountsToDelete.forEach {
+                it.deleteFromRealm()
+            }
+        }
+    }
+
     override fun getSkills(user: User): Flowable<RealmResults<Skill>> {
         val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
         return realm.where(Skill::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
new file mode 100644
index 000000000..96edb9c26
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
@@ -0,0 +1,3 @@
+package com.habitrpg.android.habitica.events
+
+class ShowAchievementDialog(var type: String, val id: String)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.java
deleted file mode 100644
index 41e5d43e7..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.Notification;
-
-public class ShowCheckinDialog {
-    public Notification notification;
-    public String nextUnlockText;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.kt
new file mode 100644
index 000000000..733f3dfa5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowCheckinDialog.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.events
+
+import com.habitrpg.android.habitica.models.Notification
+
+class ShowCheckinDialog(var notification: Notification, var nextUnlockText: String, var nextUnlockCount: Int)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
index b23f6ccf4..63f4f4cad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
@@ -1,9 +1,13 @@
 package com.habitrpg.android.habitica.extensions
 
+import android.content.res.Resources
+import com.habitrpg.android.habitica.R
+import java.util.*
+
 class DateUtils {
 
     companion object {
-        fun minutesInMs(minutes: Int): Int {
+        private fun minutesInMs(minutes: Int): Int {
             return minutes * 60 * 1000
         }
 
@@ -13,5 +17,25 @@ class DateUtils {
     }
 }
 
+fun Date.getAgoString(res: Resources): String {
+    return this.time.getAgoString(res)
+}
 
+fun Long.getAgoString(res: Resources): String {
+    val diff = Date().time - this
 
+    val diffMinutes = diff / (60 * 1000) % 60
+    val diffHours = diff / (60 * 60 * 1000) % 24
+    val diffDays = diff / (24 * 60 * 60 * 1000)
+
+    return when {
+        diffDays != 0L -> if (diffDays == 1L) {
+            res.getString(R.string.ago_1day)
+        } else res.getString(R.string.ago_days, diffDays)
+        diffHours != 0L -> if (diffHours == 1L) {
+            res.getString(R.string.ago_1hour)
+        } else res.getString(R.string.ago_hours, diffHours)
+        diffMinutes == 1L -> res.getString(R.string.ago_1Minute)
+        else -> res.getString(R.string.ago_minutes, diffMinutes)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Double-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Double-Extensions.kt
new file mode 100644
index 000000000..de38f4c52
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Double-Extensions.kt
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.extensions
+
+import kotlin.math.pow
+import kotlin.math.roundToInt
+
+fun Double.round(decimals: Int): Double {
+    return (this * 10.0.pow(decimals.toDouble())).roundToInt() / 10.0.pow(decimals.toDouble())
+}
\ No newline at end of file
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
deleted file mode 100644
index b2ea103ed..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/FirstDayOfTheWeekHelper.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import java.util.Calendar;
-
-/**
- * Created by DanielKaparunakis on 9/10/16.
- */
-public class FirstDayOfTheWeekHelper {
-
-    private int firstDayOfTheWeek;
-    public int dailyTaskFormOffset;
-
-    private FirstDayOfTheWeekHelper(int dailyTaskFormOffset, int firstDayOfTheWeek) {
-        this.dailyTaskFormOffset = dailyTaskFormOffset;
-        this.firstDayOfTheWeek = firstDayOfTheWeek;
-    }
-
-    public static FirstDayOfTheWeekHelper newInstance(int firstDayOfTheWeekSharedPref) {
-        switch (firstDayOfTheWeekSharedPref) {
-            case Calendar.SUNDAY:
-                return new FirstDayOfTheWeekHelper(1, Calendar.SUNDAY);
-            case Calendar.MONDAY:
-                return new FirstDayOfTheWeekHelper(0, Calendar.MONDAY);
-            case Calendar.TUESDAY:
-                return new FirstDayOfTheWeekHelper(6, Calendar.TUESDAY);
-            case Calendar.WEDNESDAY:
-                return new FirstDayOfTheWeekHelper(5, Calendar.WEDNESDAY);
-            case Calendar.THURSDAY:
-                return new FirstDayOfTheWeekHelper(4, Calendar.THURSDAY);
-            case Calendar.FRIDAY:
-                return new FirstDayOfTheWeekHelper(3, Calendar.FRIDAY);
-            case Calendar.SATURDAY:
-                return new FirstDayOfTheWeekHelper(2, Calendar.SATURDAY);
-            default:
-                return new FirstDayOfTheWeekHelper(1, Calendar.SUNDAY);
-        }
-    }
-
-    public int getFirstDayOfTheWeek() {
-        return firstDayOfTheWeek;
-    }
-
-    public int getDailyTaskFormOffset() {
-        return dailyTaskFormOffset;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/HealthFormatter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/HealthFormatter.kt
index aedc01067..ade590520 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/HealthFormatter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/HealthFormatter.kt
@@ -3,6 +3,8 @@ package com.habitrpg.android.habitica.helpers
 import android.os.Build
 import java.text.NumberFormat
 import java.util.*
+import kotlin.math.ceil
+import kotlin.math.floor
 
 object HealthFormatter {
     fun format(input: Int) = format(input.toDouble())
@@ -10,9 +12,9 @@ object HealthFormatter {
     @JvmStatic
     fun format(input: Double) =
             if (input < 1 && input > 0) {
-                Math.ceil(input * 10) / 10
+                ceil(input * 10) / 10
             } else {
-                Math.floor(input)
+                floor(input)
             }
 
     fun formatToString(input: Int, locale: Locale = getDefaultLocale()) = formatToString(input.toDouble(), locale)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Keyhelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Keyhelper.kt
index b0a970157..52fec9c52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Keyhelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Keyhelper.kt
@@ -202,7 +202,7 @@ constructor(ctx: Context, var sharedPreferences: SharedPreferences, var keyStore
                 putString(PUBLIC_IV, publicIV)
             }
         }
-        return publicIV
+        return publicIV ?: ""
     }
 
     companion object {
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
deleted file mode 100644
index b78feac9e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import java.util.Locale;
-
-/**
- * Created by DanielKaparunakis on 9/2/16.
- */
-public class LanguageHelper {
-
-    private Locale locale = null;
-    private String languageCode = null;
-
-    public LanguageHelper(String languageSharedPref) {
-
-        switch (languageSharedPref) {
-            case "iw":
-                locale = new Locale("iw");
-                languageCode = "he";
-                break;
-            case "hr":
-                locale = new Locale("hr", "HR");
-                languageCode = "hr";
-                break;
-            case "in":
-                locale = new Locale("in");
-                languageCode = "id";
-                break;
-            case "pt":
-                locale = new Locale("pt", "PT");
-                languageCode = "pt";
-                break;
-            default:
-                if (languageSharedPref.contains("_")) {
-                    String[] languageCodeParts = languageSharedPref.split("_");
-                    locale = new Locale(languageCodeParts[0], languageCodeParts[1]);
-                } else {
-                    locale = new Locale(languageSharedPref);
-                }
-                languageCode = languageSharedPref;
-                break;
-        }
-    }
-
-    public String getLanguageCode() {
-        return languageCode;
-    }
-
-    public Locale getLocale() {
-        return locale;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt
new file mode 100644
index 000000000..eb734a4c6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.kt
@@ -0,0 +1,43 @@
+package com.habitrpg.android.habitica.helpers
+
+import java.util.*
+
+class LanguageHelper(languageSharedPref: String?) {
+
+    var locale: Locale? = null
+        private set
+    var languageCode: String? = null
+        private set
+
+    init {
+        when (languageSharedPref) {
+            "iw" -> {
+                locale = Locale("iw")
+                languageCode = "he"
+            }
+            "hr" -> {
+                locale = Locale("hr", "HR")
+                languageCode = "hr"
+            }
+            "in" -> {
+                locale = Locale("in")
+                languageCode = "id"
+            }
+            "pt" -> {
+                locale = Locale("pt", "PT")
+                languageCode = "pt"
+            }
+            else -> {
+                languageSharedPref?.let { pref ->
+                    locale = if (pref.contains("_")) {
+                        val languageCodeParts = pref.split("_".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                        Locale(languageCodeParts[0], languageCodeParts[1])
+                    } else {
+                        Locale(languageSharedPref)
+                    }
+                }
+                languageCode = languageSharedPref
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
index d0a592274..f90bb8e51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
@@ -3,9 +3,9 @@ package com.habitrpg.android.habitica.helpers
 import android.os.Bundle
 import androidx.navigation.NavController
 import androidx.navigation.NavDirections
-import java.lang.IllegalArgumentException
 import java.lang.ref.WeakReference
 import java.util.*
+import kotlin.math.abs
 
 object MainNavigationController {
     var lastNavigation: Date? = null
@@ -17,7 +17,7 @@ object MainNavigationController {
     }
 
     fun navigate(transactionId: Int, args: Bundle? = null) {
-        if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
+        if (abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
             lastNavigation = Date()
             try {
                 navController?.get()?.navigate(transactionId, args)
@@ -26,7 +26,7 @@ object MainNavigationController {
     }
 
     fun navigate(directions: NavDirections) {
-        if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
+        if (abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
             lastNavigation = Date()
             try {
             navController?.get()?.navigate(directions)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java
deleted file mode 100644
index b7160c9b1..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MathHelper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-public class MathHelper {
-    static public Double round(Double value, int n) {
-        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
index ed95c4f7f..a08f67219 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
@@ -21,7 +21,8 @@ class NotificationOpenHandler {
                 PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY -> openPrivateMessageScreen(intent.getStringExtra("replyTo"))
                 PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY -> openSettingsScreen()
                 PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY -> openSubscriptionScreen()
-                PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMention(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
+                PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
+                PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
             }
         }
 
@@ -60,7 +61,7 @@ class NotificationOpenHandler {
             MainNavigationController.navigate(R.id.prefsActivity)
         }
 
-        private fun handleChatMention(type: String, groupID: String) {
+        private fun handleChatMessage(type: String, groupID: String) {
             when (type) {
                 "party" -> MainNavigationController.navigate(R.id.partyFragment)
                 "tavern" -> MainNavigationController.navigate(R.id.tavernFragment)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index 863e86f94..337e8ebad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.helpers
 import android.content.Context
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.events.ShowAchievementDialog
 import com.habitrpg.android.habitica.events.ShowCheckinDialog
 import com.habitrpg.android.habitica.events.ShowSnackbarEvent
 import com.habitrpg.android.habitica.models.Notification
@@ -15,18 +16,14 @@ import io.reactivex.subjects.BehaviorSubject
 import org.greenrobot.eventbus.EventBus
 import java.util.*
 
-/**
- * Created by krh12 on 12/9/2016.
- */
-
 class NotificationsManager (private val context: Context) {
-    // @TODO: A queue for displaying alert dialogues
-
     private val seenNotifications: MutableMap<String, Boolean>
     private var apiClient: ApiClient? = null
 
     private val notifications: BehaviorSubject<List<Notification>>
 
+    private var lastNotificationHandling: Date? = null
+
     init {
         this.seenNotifications = HashMap()
         this.notifications = BehaviorSubject.create()
@@ -53,17 +50,31 @@ class NotificationsManager (private val context: Context) {
     }
 
     fun handlePopupNotifications(notifications: List<Notification>): Boolean? {
+        val now = Date()
+        if (now.time - (lastNotificationHandling?.time ?: 0) < 500) {
+            return true
+        }
+        lastNotificationHandling = now
         notifications
                 .filter { !this.seenNotifications.containsKey(it.id) }
                 .map {
                     val notificationDisplayed = when (it.type) {
                         Notification.Type.LOGIN_INCENTIVE.type -> displayLoginIncentiveNotification(it)
+                        Notification.Type.ACHIEVEMENT_PARTY_UP.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_PARTY_ON.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> displayAchievementNotification(it)
+                        Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> displayAchievementNotification(it)
                         else -> false
                     }
 
                     if (notificationDisplayed == true) {
                         this.seenNotifications[it.id] = true
                     }
+
                 }
 
         return true
@@ -73,9 +84,7 @@ class NotificationsManager (private val context: Context) {
         val notificationData = notification.data as? LoginIncentiveData
         val nextUnlockText = context.getString(R.string.nextPrizeUnlocks, notificationData?.nextRewardAt)
         if (notificationData?.rewardKey != null) {
-            val event = ShowCheckinDialog()
-            event.notification = notification
-            event.nextUnlockText = nextUnlockText
+            val event = ShowCheckinDialog(notification, nextUnlockText, notificationData.nextRewardAt ?: 0)
             EventBus.getDefault().post(event)
         } else {
             val event = ShowSnackbarEvent()
@@ -84,11 +93,15 @@ class NotificationsManager (private val context: Context) {
             event.type = HabiticaSnackbar.SnackbarDisplayType.BLUE
             EventBus.getDefault().post(event)
             if (apiClient != null) {
-                // @TODO: This should be handled somewhere else? MAybe we notifiy via event
                 apiClient?.readNotification(notification.id)
                         ?.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
             }
         }
         return true
     }
+
+    private fun displayAchievementNotification(notification: Notification): Boolean {
+        EventBus.getDefault().post(ShowAchievementDialog(notification.type ?: "", notification.id))
+        return true
+    }
 }
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
deleted file mode 100644
index 20c25044f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import android.app.Dialog;
-import android.app.TimePickerDialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.widget.Button;
-import android.widget.DatePicker;
-import android.widget.TimePicker;
-
-import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.inject.Inject;
-
-public class RemindersManager {
-
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    private DateFormat dateFormater;
-
-    public RemindersManager(String taskType) {
-        Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        if (taskType.equals("todo")) {
-            dateFormater = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-        } else {
-            dateFormater = DateFormat.getTimeInstance(DateFormat.SHORT);
-        }
-    }
-
-    @Nullable
-    private RemindersItem createReminderFromDateString(String dateString) {
-        try {
-            Date date = dateFormater.parse(dateString);
-            RemindersItem item = new RemindersItem();
-            UUID randomUUID = UUID.randomUUID();
-            item.setId(randomUUID.toString());
-            item.setStartDate(date);
-            item.setTime(date);
-            return item;
-        } catch (ParseException e) {
-            e.printStackTrace();
-            crashlyticsProxy.logException(e);
-            return null;
-        }
-    }
-
-    public String reminderTimeToString(Date time) {
-        return dateFormater.format(time);
-    }
-
-    public void createReminderTimeDialog(@Nullable ReminderTimeSelectedCallback callback, String taskType,
-                                         Context context, @Nullable RemindersItem reminder) {
-        Calendar currentTime = Calendar.getInstance();
-        int hour = currentTime.get(Calendar.HOUR_OF_DAY);
-        int minute = currentTime.get(Calendar.MINUTE);
-
-        if (taskType.equals("todo")) {
-            Dialog dialog = new Dialog(context);
-            dialog.setContentView(R.layout.custom_date_time_dialogue);
-            dialog.setTitle("Select Date and Time");
-
-            Button dialogConfirmButton = dialog.findViewById(R.id.customDialogConfirmButton);
-            TimePicker dialogTimePicker = dialog.findViewById(R.id.timePicker);
-            DatePicker dialogDatePicker = dialog.findViewById(R.id.datePicker);
-
-            dialogTimePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context));
-
-            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-            FirstDayOfTheWeekHelper firstDayOfTheWeekHelper =
-                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
-                dialogDatePicker.getCalendarView().setFirstDayOfWeek(
-                        firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
-            } else {
-                dialogDatePicker.setFirstDayOfWeek(firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
-            }
-
-            dialogConfirmButton.setOnClickListener(view -> {
-                int day = dialogDatePicker.getDayOfMonth();
-                int month = dialogDatePicker.getMonth();
-                int year = dialogDatePicker.getYear();
-                int hour1 = 0;
-                int minute1 = 0;
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                    hour1 = dialogTimePicker.getHour();
-                    minute1 = dialogTimePicker.getMinute();
-                } else {
-                    hour1 = dialogTimePicker.getCurrentHour();
-                    minute1 = dialogTimePicker.getCurrentMinute();
-                }
-
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(year, month, day, hour1, minute1, 0);
-
-                onReminderTimeSelected(callback, reminder, calendar);
-                dialog.hide();
-            });
-            dialog.show();
-        } else {
-            TimePickerDialog timePickerDialog;
-            timePickerDialog = new TimePickerDialog(context, (timePicker, selectedHour, selectedMinute) -> {
-                Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
-                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), selectedHour, selectedMinute, 0);
-
-                onReminderTimeSelected(callback, reminder, calendar);
-            }, hour, minute, android.text.format.DateFormat.is24HourFormat(context));
-            timePickerDialog.setTitle("Select Time");
-            timePickerDialog.show();
-        }
-    }
-
-    private void onReminderTimeSelected(@Nullable ReminderTimeSelectedCallback callback, @Nullable RemindersItem reminder, Calendar calendar) {
-        RemindersItem remindersItem = reminder;
-        if (remindersItem == null) {
-            remindersItem = createReminderFromDateString(dateFormater.format(calendar.getTime()));
-        } else {
-            remindersItem.setTime(calendar.getTime());
-        }
-        if (callback != null) {
-            callback.onReminderTimeSelected(remindersItem);
-        }
-    }
-
-    public interface ReminderTimeSelectedCallback {
-        void onReminderTimeSelected(@Nullable RemindersItem remindersItem);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index f1da145a4..c4e9a51ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -174,9 +174,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
                 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) {
+            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/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index 401bc17d8..288f4e78f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -1,14 +1,13 @@
 package com.habitrpg.android.habitica.helpers
 
 import com.habitrpg.android.habitica.models.tasks.Task
-
-import java.util.ArrayList
-import java.util.HashMap
-
+import io.realm.Case
 import io.realm.OrderedRealmCollection
 import io.realm.RealmQuery
+import java.util.*
 
 class TaskFilterHelper {
+    var searchQuery: String? = null
     private var tagsId: MutableList<String> = ArrayList()
     private val activeFilters = HashMap<String, String>()
 
@@ -86,31 +85,35 @@ class TaskFilterHelper {
         return activeFilters[type]
     }
 
-    fun createQuery(unfilteredData: OrderedRealmCollection<Task>): RealmQuery<Task> {
+    fun createQuery(unfilteredData: OrderedRealmCollection<Task>): RealmQuery<Task>? {
+        if (!unfilteredData.isValid) {
+            return null
+        }
         var query = unfilteredData.where()
 
-        if (unfilteredData.size == 0) {
-            return query
-        }
+        if (unfilteredData.size != 0) {
+            val taskType = unfilteredData[0].type
+            val activeFilter = getActiveFilter(taskType)
 
-        val taskType = unfilteredData[0].type
-        val activeFilter = getActiveFilter(taskType)
-
-        if (tagsId.size > 0) {
-            query = query.`in`("tags.id", tagsId.toTypedArray())
-        }
-        if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
-            when (activeFilter) {
-                Task.FILTER_ACTIVE -> query = if (Task.TYPE_DAILY == taskType) {
-                    query.equalTo("completed", false).equalTo("isDue", true)
-                } else {
-                    query.equalTo("completed", false)
+            if (tagsId.size > 0) {
+                query = query.`in`("tags.id", tagsId.toTypedArray())
+            }
+            if (searchQuery?.isNotEmpty() == true) {
+                query = query.beginsWith("text", searchQuery ?: "", Case.INSENSITIVE)
+            }
+            if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
+                when (activeFilter) {
+                    Task.FILTER_ACTIVE -> query = if (Task.TYPE_DAILY == taskType) {
+                        query.equalTo("completed", false).equalTo("isDue", true)
+                    } else {
+                        query.equalTo("completed", false)
+                    }
+                    Task.FILTER_GRAY -> query = query.equalTo("completed", true).or().equalTo("isDue", false)
+                    Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
+                    Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
+                    Task.FILTER_DATED -> query = query.isNotNull("dueDate").equalTo("completed", false)
+                    Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
                 }
-                Task.FILTER_GRAY -> query = query.equalTo("completed", true).or().equalTo("isDue", false)
-                Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
-                Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
-                Task.FILTER_DATED -> query = query.isNotNull("dueDate").equalTo("completed", false)
-                Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
             }
         }
         return query
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
deleted file mode 100644
index d83ff1fda..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.Avatar;
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-import com.habitrpg.android.habitica.models.user.Stats;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class UserStatComputer {
-
-    // @TODO: Not really sure if this is correct
-    public interface StatsRow {
-
-    }
-
-    public class AttributeRow implements StatsRow {
-        public int labelId;
-        public float strVal;
-        public float intVal;
-        public float conVal;
-        public float perVal;
-        public boolean roundDown;
-        public boolean isSummary;
-    }
-
-    public class EquipmentRow implements StatsRow {
-        public String gearKey;
-        public String text;
-        public String stats;
-    }
-
-    public List<StatsRow> computeClassBonus (List<Equipment> equipmentList, Avatar user) {
-        List<StatsRow> skillRows = new ArrayList<>();
-
-        float strAttributes = 0;
-        float intAttributes = 0;
-        float conAttributes = 0;
-        float perAttributes = 0;
-
-        float strClassBonus = 0;
-        float intClassBonus = 0;
-        float conClassBonus = 0;
-        float perClassBonus = 0;
-
-        // Summarize stats and fill equipment table
-        for (Equipment i : equipmentList) {
-            int str_ = i.getStr();
-            int int_ = i.get_int();
-            int con_ = i.getCon();
-            int per_ = i.getPer();
-
-            strAttributes += str_;
-            intAttributes += int_;
-            conAttributes += con_;
-            perAttributes += per_;
-
-            StringBuilder sb = new StringBuilder();
-
-            if (str_ != 0) {
-                sb.append("STR ").append(str_).append(", ");
-            }
-            if (int_ != 0) {
-                sb.append("INT ").append(int_).append(", ");
-            }
-            if (con_ != 0) {
-                sb.append("CON ").append(con_).append(", ");
-            }
-            if (per_ != 0) {
-                sb.append("PER ").append(per_).append(", ");
-            }
-
-            // remove the last comma
-            if (sb.length() > 2) {
-                sb.delete(sb.length() - 2, sb.length());
-            }
-
-            EquipmentRow equipmentRow = new EquipmentRow();
-            equipmentRow.gearKey = i.getKey();
-            equipmentRow.text = i.getText();
-            equipmentRow.stats = sb.toString();
-            skillRows.add(equipmentRow);
-
-            // Calculate class bonus
-            String itemClass = i.getKlass();
-            String itemSpecialClass = i.getSpecialClass();
-
-            Boolean classDoesNotExist = itemClass == null || itemClass.isEmpty();
-            Boolean specialClassDoesNotExist = itemSpecialClass == null || itemSpecialClass.isEmpty();
-
-            if (classDoesNotExist && specialClassDoesNotExist) {
-                continue;
-            }
-
-            float classBonus = 0.5f;
-            Boolean userClassMatchesGearClass = !classDoesNotExist && itemClass.equals(user.getStats().getHabitClass());
-            Boolean userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass.equals(user.getStats().getHabitClass());
-
-            if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0;
-
-            if (itemClass == null || itemClass.isEmpty() || itemClass.equals("special")) {
-                itemClass = itemSpecialClass;
-            }
-
-            if (itemClass != null) {
-                switch (itemClass) {
-                    case Stats.ROGUE:
-                        strClassBonus += str_ * classBonus;
-                        perClassBonus += per_ * classBonus;
-                        break;
-                    case Stats.HEALER:
-                        conClassBonus += con_ * classBonus;
-                        intClassBonus += int_ * classBonus;
-                        break;
-                    case Stats.WARRIOR:
-                        strClassBonus += str_ * classBonus;
-                        conClassBonus += con_ * classBonus;
-                        break;
-                    case Stats.MAGE:
-                        intClassBonus += int_ * classBonus;
-                        perClassBonus += per_ * classBonus;
-                        break;
-                }
-            }
-        }
-
-        AttributeRow attributeRow = new AttributeRow();
-        attributeRow.labelId = R.string.battle_gear;
-        attributeRow.strVal = strAttributes;
-        attributeRow.intVal = intAttributes;
-        attributeRow.conVal = conAttributes;
-        attributeRow.perVal = perAttributes;
-        attributeRow.roundDown = true;
-        attributeRow.isSummary = false;
-        skillRows.add(attributeRow);
-
-
-        AttributeRow attributeRow2 = new AttributeRow();
-        attributeRow2.labelId = R.string.profile_class_bonus;
-        attributeRow2.strVal = strClassBonus;
-        attributeRow2.intVal = intClassBonus;
-        attributeRow2.conVal = conClassBonus;
-        attributeRow2.perVal = perClassBonus;
-        attributeRow2.roundDown = false;
-        attributeRow2.isSummary = false;
-        skillRows.add(attributeRow2);
-
-        return skillRows;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
new file mode 100644
index 000000000..1700dd4f9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
@@ -0,0 +1,144 @@
+package com.habitrpg.android.habitica.helpers
+
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.Avatar
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.user.Stats
+import java.util.*
+
+class UserStatComputer {
+
+    interface StatsRow
+
+    inner class AttributeRow : StatsRow {
+        var labelId: Int = 0
+        var strVal: Float = 0.toFloat()
+        var intVal: Float = 0.toFloat()
+        var conVal: Float = 0.toFloat()
+        var perVal: Float = 0.toFloat()
+        var roundDown: Boolean = false
+        var isSummary: Boolean = false
+    }
+
+    inner class EquipmentRow : StatsRow {
+        var gearKey: String? = null
+        var text: String? = null
+        var stats: String? = null
+    }
+
+    fun computeClassBonus(equipmentList: List<Equipment>, user: Avatar): List<StatsRow> {
+        val skillRows = ArrayList<StatsRow>()
+
+        var strAttributes = 0f
+        var intAttributes = 0f
+        var conAttributes = 0f
+        var perAttributes = 0f
+
+        var strClassBonus = 0f
+        var intClassBonus = 0f
+        var conClassBonus = 0f
+        var perClassBonus = 0f
+
+        // Summarize stats and fill equipment table
+        for (i in equipmentList) {
+            val strength = i.str
+            val intelligence = i._int
+            val constitution = i.con
+            val perception = i.per
+
+            strAttributes += strength.toFloat()
+            intAttributes += intelligence.toFloat()
+            conAttributes += constitution.toFloat()
+            perAttributes += perception.toFloat()
+
+            val sb = StringBuilder()
+
+            if (strength != 0) {
+                sb.append("STR ").append(strength).append(", ")
+            }
+            if (intelligence != 0) {
+                sb.append("INT ").append(intelligence).append(", ")
+            }
+            if (constitution != 0) {
+                sb.append("CON ").append(constitution).append(", ")
+            }
+            if (perception != 0) {
+                sb.append("PER ").append(perception).append(", ")
+            }
+
+            // remove the last comma
+            if (sb.length > 2) {
+                sb.delete(sb.length - 2, sb.length)
+            }
+
+            val equipmentRow = EquipmentRow()
+            equipmentRow.gearKey = i.key
+            equipmentRow.text = i.text
+            equipmentRow.stats = sb.toString()
+            skillRows.add(equipmentRow)
+
+            // Calculate class bonus
+            var itemClass: String? = i.klass
+            val itemSpecialClass = i.specialClass
+
+            val classDoesNotExist = itemClass == null || itemClass.isEmpty()
+            val specialClassDoesNotExist = itemSpecialClass.isEmpty()
+
+            if (classDoesNotExist && specialClassDoesNotExist) {
+                continue
+            }
+
+            var classBonus = 0.5f
+            val userClassMatchesGearClass = !classDoesNotExist && itemClass == user.stats?.habitClass
+            val userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass == user.stats?.habitClass
+
+            if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0f
+
+            if (itemClass == null || itemClass.isEmpty() || itemClass == "special") {
+                itemClass = itemSpecialClass
+            }
+
+            when (itemClass) {
+                Stats.ROGUE -> {
+                    strClassBonus += strength * classBonus
+                    perClassBonus += perception * classBonus
+                }
+                Stats.HEALER -> {
+                    conClassBonus += constitution * classBonus
+                    intClassBonus += intelligence * classBonus
+                }
+                Stats.WARRIOR -> {
+                    strClassBonus += strength * classBonus
+                    conClassBonus += constitution * classBonus
+                }
+                Stats.MAGE -> {
+                    intClassBonus += intelligence * classBonus
+                    perClassBonus += perception * classBonus
+                }
+            }
+        }
+
+        val attributeRow = AttributeRow()
+        attributeRow.labelId = R.string.battle_gear
+        attributeRow.strVal = strAttributes
+        attributeRow.intVal = intAttributes
+        attributeRow.conVal = conAttributes
+        attributeRow.perVal = perAttributes
+        attributeRow.roundDown = true
+        attributeRow.isSummary = false
+        skillRows.add(attributeRow)
+
+
+        val attributeRow2 = AttributeRow()
+        attributeRow2.labelId = R.string.profile_class_bonus
+        attributeRow2.strVal = strClassBonus
+        attributeRow2.intVal = intClassBonus
+        attributeRow2.conVal = conClassBonus
+        attributeRow2.perVal = perClassBonus
+        attributeRow2.roundDown = false
+        attributeRow2.isSummary = false
+        skillRows.add(attributeRow2)
+
+        return skillRows
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
new file mode 100644
index 000000000..a0b1062d8
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
@@ -0,0 +1,89 @@
+package com.habitrpg.android.habitica.helpers.notifications
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.Person
+import androidx.core.app.RemoteInput
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
+import net.pherth.android.emoji_library.EmojiParser
+import java.text.SimpleDateFormat
+import java.util.*
+
+class GroupActivityNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
+
+    override fun getNotificationID(data: MutableMap<String, String>): Int {
+        return data["groupID"].hashCode()
+    }
+
+    override fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
+        val user = Person.Builder().setName("You").build()
+        val message = makeMessageFromData(data)
+        var style = NotificationCompat.MessagingStyle(user)
+                .setGroupConversation(true)
+                .setConversationTitle(data["groupName"])
+
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        val existingNotifications = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
+        } else null
+        val oldMessages = existingNotifications?.firstOrNull()?.notification?.extras?.getBundle("messages")?.get("messages") as? ArrayList<Map<String, String>> ?: arrayListOf()
+        for (oldMessage in oldMessages) {
+            style = style.addMessage(makeMessageFromData(oldMessage))
+        }
+        style = style.addMessage(message)
+        oldMessages.add(data)
+        return super.configureNotificationBuilder(data)
+                .setStyle(style)
+                .setExtras(bundleOf(Pair("messages", bundleOf(Pair("messages", oldMessages)))))
+    }
+
+    private fun makeMessageFromData(data: Map<String, String>): NotificationCompat.MessagingStyle.Message {
+        val sender = Person.Builder().setName(data["senderName"]).build()
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
+        val timestamp = dateFormat.parse(data["timestamp"]) ?: Date()
+        val messageText = EmojiParser.parseEmojis(data["message"]?.trim { it <= ' ' })
+        return NotificationCompat.MessagingStyle.Message(
+                messageText,
+                timestamp.time,
+                sender
+        )
+    }
+
+    override fun setNotificationActions(data: Map<String, String>) {
+        super.setNotificationActions(data)
+        val groupID = data["groupID"] ?: return
+
+        val actionName = context.getString(R.string.group_message_reply)
+        val replyLabel: String = context.getString(R.string.reply)
+        val remoteInput: RemoteInput = RemoteInput.Builder(actionName).run {
+            setLabel(replyLabel)
+            build()
+        }
+        val intent = Intent(context, LocalNotificationActionReceiver::class.java)
+        intent.action = actionName
+        intent.putExtra("groupID", groupID)
+        val replyPendingIntent: PendingIntent =
+                PendingIntent.getBroadcast(context, groupID.hashCode(),
+                        intent,
+                        PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val action: NotificationCompat.Action =
+                NotificationCompat.Action.Builder(R.drawable.ic_send_grey_600_24dp,
+                        context.getString(R.string.reply), replyPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        .build()
+        notificationBuilder.addAction(action)
+    }
+
+    override fun configureMainIntent(intent: Intent) {
+        super.configureMainIntent(intent)
+        intent.putExtra("type", data?.get("type"))
+        intent.putExtra("groupID", data?.get("groupID"))
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
index 86c9b959c..f87b48d26 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
@@ -17,8 +17,8 @@ class GuildInviteLocalNotification(context: Context, identifier: String) : Habit
         intent.putExtra("groupID", data?.get("groupID"))
     }
 
-    override fun setNotificationActions() {
-        super.setNotificationActions()
+    override fun setNotificationActions(data: Map<String, String>) {
+        super.setNotificationActions(data)
         val res = context.resources
 
         val acceptInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
index b43909aac..846c6596c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
@@ -1,18 +1,15 @@
 package com.habitrpg.android.habitica.helpers.notifications
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.media.RingtoneManager
-import android.os.Build
 import androidx.annotation.CallSuper
-import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
-
+import androidx.core.app.NotificationManagerCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.activities.MainActivity
+import java.util.*
 
 /**
  * Created by keithholliday on 6/28/16.
@@ -24,40 +21,40 @@ abstract class HabiticaLocalNotification(protected var context: Context, protect
     protected var message: String? = null
 
     protected var notificationBuilder = NotificationCompat.Builder(context, "default")
+            .setSmallIcon(R.drawable.ic_gryphon_white)
+            .setAutoCancel(true)
+
+    open fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
+        val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+        return notificationBuilder
+                .setSound(path)
+    }
 
     @CallSuper
-    open fun notifyLocally(title: String?, message: String?) {
+    open fun notifyLocally(title: String?, message: String?, data: MutableMap<String, String>) {
         this.title = title
         this.message = message
 
-        val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+        var notificationBuilder = configureNotificationBuilder(data)
 
-        this.notificationBuilder = notificationBuilder
-                .setSmallIcon(R.drawable.ic_gryphon_white)
-                .setAutoCancel(true)
-                .setSound(path)
-
-        if (title != null) {
+        if (this.title != null) {
             notificationBuilder = notificationBuilder.setContentTitle(title)
         }
-        if (message != null) {
-            notificationBuilder = notificationBuilder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
+        if (this.message != null) {
+            notificationBuilder = notificationBuilder.setContentText(message)
         }
 
-        this.setNotificationActions()
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        this.setNotificationActions(data)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            notificationManager?.createOrUpdateHabiticaChannel()
-        }
-        notificationManager?.notify(getNotificationID(), notificationBuilder.build())
+        val notificationManager = NotificationManagerCompat.from(context)
+        notificationManager.notify(getNotificationID(data), notificationBuilder.build())
     }
 
     fun setExtras(data: Map<String, String>) {
         this.data = data
     }
 
-    protected open fun setNotificationActions()  {
+    protected open fun setNotificationActions(data: Map<String, String>)  {
         val intent = Intent(context, MainActivity::class.java)
         intent.putExtra("notificationIdentifier", identifier)
         configureMainIntent(intent)
@@ -73,20 +70,7 @@ abstract class HabiticaLocalNotification(protected var context: Context, protect
     protected open fun configureMainIntent(intent: Intent) {
     }
 
-    protected open fun getNotificationID(): Int = 10
-}
-
-@RequiresApi(Build.VERSION_CODES.O)
-fun NotificationManager.createOrUpdateHabiticaChannel() {
-    var hasChannel = false
-    for (channel in notificationChannels) {
-        if (channel.id == "default") {
-            hasChannel = true
-            break
-        }
-    }
-    if (!hasChannel) {
-        val channel = NotificationChannel("default", "Habitica Notifications", NotificationManager.IMPORTANCE_DEFAULT)
-        createNotificationChannel(channel)
+    protected open fun getNotificationID(data: MutableMap<String, String>): Int {
+        return Date().time.toInt()
     }
 }
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 cd75bdbe9..10ec4deb5 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
@@ -31,6 +31,8 @@ public class HabiticaLocalNotificationFactory {
             return new GiftOneGetOneLocalNotification(context, notificationType);
         } else if (notificationType.contains(PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY)) {
             return new ChatMentionNotification(context, notificationType);
+        } else if (notificationType.contains(PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY)) {
+            return new GroupActivityNotification(context, notificationType);
         } else {
             return new GenericLocalNotification(context, notificationType);
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
index 15473077c..ee5fb9d55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
@@ -12,28 +12,30 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
  */
 class PartyInviteLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
 
-    override fun setNotificationActions() {
-        super.setNotificationActions()
+    override fun setNotificationActions(data: Map<String, String>) {
+        super.setNotificationActions(data)
         val res = context.resources
 
         val acceptInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         acceptInviteIntent.action = res.getString(R.string.accept_party_invite)
+        acceptInviteIntent.putExtra("groupID", this.data?.get("groupID"))
         val pendingIntentAccept = PendingIntent.getBroadcast(
                 context,
                 3000,
                 acceptInviteIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT
         )
-        notificationBuilder.addAction(0, "Accept", pendingIntentAccept)
+        notificationBuilder.addAction(0, context.getString(R.string.accept), pendingIntentAccept)
 
         val rejectInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         rejectInviteIntent.action = res.getString(R.string.reject_party_invite)
+        rejectInviteIntent.putExtra("groupID", this.data?.get("groupID"))
         val pendingIntentReject = PendingIntent.getBroadcast(
                 context,
                 2000,
                 rejectInviteIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT
         )
-        notificationBuilder.addAction(0, "Reject", pendingIntentReject)
+        notificationBuilder.addAction(0, context.getString(R.string.reject), pendingIntentReject)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
index f253ad7e9..45b777371 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
@@ -78,7 +78,7 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
             additionalData["identifier"] = remoteMessageIdentifier ?: ""
             AmplitudeManager.sendEvent("receive notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
             notification.setExtras(remoteMessage.data)
-            notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"])
+            notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
         }
     }
 
@@ -110,7 +110,6 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
     }
 
     companion object {
-
         const val PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty"
         const val RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM"
         const val RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems"
@@ -122,6 +121,7 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
         const val CHANGE_USERNAME_PUSH_NOTIFICATION_KEY = "changeUsername"
         const val GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY = "gift1get1"
         const val CHAT_MENTION_NOTIFICATION_KEY = "chatMention"
+        const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
         private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
index 742934387..039426262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
@@ -5,6 +5,4 @@ import android.content.Context
 /**
  * Created by keithholliday on 7/1/16.
  */
-class QuestBegunLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
-    override fun getNotificationID(): Int = 1000
-}
+class QuestBegunLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
index 9a5672fc8..fa01ded68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
@@ -11,10 +11,12 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
  */
 class QuestInviteLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
 
-    override fun getNotificationID(): Int = 1000
+    override fun getNotificationID(data: MutableMap<String, String>): Int {
+        return 1000
+    }
 
-    override fun setNotificationActions() {
-        super.setNotificationActions()
+    override fun setNotificationActions(data: Map<String, String>) {
+        super.setNotificationActions(data)
         val res = context.resources
 
         val acceptInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
index 2ff08c903..f62447497 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
@@ -1,8 +1,75 @@
 package com.habitrpg.android.habitica.helpers.notifications
 
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.RemoteInput
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
+import net.pherth.android.emoji_library.EmojiParser
 
-/**
- * Created by keithholliday on 7/1/16.
- */
-class ReceivedPrivateMessageLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier)
+
+class ReceivedPrivateMessageLocalNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) {
+    override fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        val existingNotifications = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
+        } else null
+        val messageText = EmojiParser.parseEmojis(data["message"]?.trim { it <= ' ' })
+        val oldMessages = existingNotifications?.firstOrNull()?.notification?.extras?.getStringArrayList("messages") ?: arrayListOf()
+        var style = NotificationCompat.InboxStyle()
+        for (oldMessage in oldMessages) {
+            style = style.addLine(oldMessage)
+        }
+        style = style.addLine(messageText)
+        oldMessages.add(messageText)
+        var notification = super.configureNotificationBuilder(data)
+                .setExtras(bundleOf(Pair("messages", oldMessages)))
+        if (oldMessages.size > 1) {
+            val notificationTitle = if (data["senderName"] != null) {
+                context.getString(R.string.inbox_messages_title, oldMessages.size, data["senderName"])
+            } else {
+                context.getString(R.string.inbox_messages_title_nosender, oldMessages.size)
+            }
+            notification = notification
+                    .setContentTitle(notificationTitle)
+                    .setStyle(style)
+            title = null
+        }
+        return notification
+    }
+
+    override fun getNotificationID(data: MutableMap<String, String>): Int {
+        return data["senderName"].hashCode()
+    }
+
+    override fun setNotificationActions(data: Map<String, String>) {
+        super.setNotificationActions(data)
+        val senderID = data["replyTo"] ?: return
+
+        val actionName = context.getString(R.string.inbox_message_reply)
+        val replyLabel: String = context.getString(R.string.reply)
+        val remoteInput: RemoteInput = RemoteInput.Builder(actionName).run {
+            setLabel(replyLabel)
+            build()
+        }
+        val intent = Intent(context, LocalNotificationActionReceiver::class.java)
+        intent.action = actionName
+        intent.putExtra("senderID", senderID)
+        val replyPendingIntent: PendingIntent =
+                PendingIntent.getBroadcast(context, senderID.hashCode(),
+                        intent,
+                        PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val action: NotificationCompat.Action =
+                NotificationCompat.Action.Builder(R.drawable.ic_send_grey_600_24dp,
+                        context.getString(R.string.reply), replyPendingIntent)
+                        .addRemoteInput(remoteInput)
+                        .build()
+        notificationBuilder.addAction(action)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
deleted file mode 100644
index 4da13850c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.habitrpg.android.habitica.interactors;
-
-import android.os.Handler;
-import androidx.appcompat.app.AppCompatActivity;
-import android.view.ViewGroup;
-
-import com.habitrpg.android.habitica.executors.PostExecutionThread;
-import com.habitrpg.android.habitica.executors.ThreadExecutor;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar;
-
-import javax.inject.Inject;
-
-import io.reactivex.Flowable;
-
-public class DisplayItemDropUseCase extends UseCase<DisplayItemDropUseCase.RequestValues, Void> {
-
-    private SoundManager soundManager;
-
-    @Inject
-    public DisplayItemDropUseCase(SoundManager soundManager, ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
-        super(threadExecutor, postExecutionThread);
-        this.soundManager = soundManager;
-    }
-
-    @Override
-    protected Flowable<Void> buildUseCaseObservable(RequestValues requestValues) {
-        return Flowable.defer(() -> {
-            TaskScoringResult data = requestValues.data;
-
-            if (data != null) {
-                if (data.getDrop() != null) {
-                    new Handler().postDelayed(() -> {
-                        HabiticaSnackbar.Companion.showSnackbar(requestValues.snackbarTargetView,
-                                data.getDrop().getDialog(), HabiticaSnackbar.SnackbarDisplayType.DROP);
-                        soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
-                    }, 3000L);
-                }
-            }
-
-            return Flowable.empty();
-        });
-    }
-
-    public static final class RequestValues implements UseCase.RequestValues {
-
-        private TaskScoringResult data;
-        private AppCompatActivity context;
-        private ViewGroup snackbarTargetView;
-
-        public RequestValues(TaskScoringResult data, AppCompatActivity context, ViewGroup snackbarTargetView) {
-            this.data = data;
-            this.context = context;
-            this.snackbarTargetView = snackbarTargetView;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
new file mode 100644
index 000000000..5776d9cb9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
@@ -0,0 +1,34 @@
+package com.habitrpg.android.habitica.interactors
+
+import android.os.Handler
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.habitrpg.android.habitica.executors.PostExecutionThread
+import com.habitrpg.android.habitica.executors.ThreadExecutor
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class DisplayItemDropUseCase @Inject
+constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread) : UseCase<DisplayItemDropUseCase.RequestValues, Void>(threadExecutor, postExecutionThread) {
+
+    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<Void> {
+        return Flowable.defer {
+            val data = requestValues.data
+
+            if (data?.drop != null) {
+                Handler().postDelayed({
+                    HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView,
+                            data.drop?.dialog, HabiticaSnackbar.SnackbarDisplayType.DROP)
+                    soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)
+                }, 3000L)
+            }
+
+            Flowable.empty<Void>()
+        }
+    }
+
+    class RequestValues(val data: TaskScoringResult?, val context: AppCompatActivity, val snackbarTargetView: ViewGroup) : UseCase.RequestValues
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index d5c942446..7d1bcd007 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.interactors
 
-import android.graphics.Bitmap
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import com.habitrpg.android.habitica.R
@@ -12,8 +11,8 @@ import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.Flowable
 import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.EventBus
@@ -51,7 +50,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 alert.addButton(R.string.not_now, false)
 
                 if (!requestValues.activity.isFinishing) {
-                    alert.show()
+                    alert.enqueue()
                 }
             } else {
                 val customView = requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup, null)
@@ -62,13 +61,9 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
 
                 val event = ShareEvent()
                 event.sharedMessage = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel) + " https://habitica.com/social/level-UP"
-                val avatarView = AvatarView(requestValues.activity, true, true, true)
+                val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
                 avatarView.setAvatar(requestValues.user)
-                avatarView.onAvatarImageReady(object : AvatarView.Consumer<Bitmap?> {
-                    override fun accept(t: Bitmap?) {
-                        event.shareImage = t
-                    }
-                })
+                avatarView.onAvatarImageReady(Consumer { t -> event.shareImage = t })
 
                 val alert = HabiticaAlertDialog(requestValues.activity)
                 alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
@@ -81,7 +76,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 }
 
                 if (!requestValues.activity.isFinishing) {
-                    alert.show()
+                    alert.enqueue()
                 }
             }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index 97dfc5660..e076e92ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -3,20 +3,20 @@ package com.habitrpg.android.habitica.interactors
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
-import androidx.core.content.ContextCompat
-import androidx.core.util.Pair
-import androidx.appcompat.app.AppCompatActivity
 import android.text.SpannableStringBuilder
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.util.Pair
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.executors.ThreadExecutor
-import com.habitrpg.android.habitica.helpers.MathHelper.round
+import com.habitrpg.android.habitica.extensions.round
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -24,6 +24,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import io.reactivex.Flowable
 import javax.inject.Inject
+import kotlin.math.abs
 
 class NotifyUserUseCase @Inject
 constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionThread,
@@ -96,9 +97,9 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
             val iconDrawable = BitmapDrawable(context.resources, icon)
             textView.setCompoundDrawablesWithIntrinsicBounds(iconDrawable, null, null, null)
             val text: String = if (value > 0) {
-                " + " + Math.abs(round(value, 2)).toString()
+                " + " + abs(value.round(2)).toString()
             } else {
-                " - " + Math.abs(round(value, 2)).toString()
+                " - " + abs(value.round(2)).toString()
             }
             textView.text = text
             textView.gravity = Gravity.CENTER_VERTICAL
@@ -111,26 +112,26 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
             var displayType = SnackbarDisplayType.NORMAL
 
             if (xp > 0) {
-                builder.append(" + ").append(round(xp, 2).toString()).append(" Exp")
+                builder.append(" + ").append(xp.round(2).toString()).append(" Exp")
             }
             if (hp != 0.0) {
                 displayType = SnackbarDisplayType.FAILURE
-                builder.append(" - ").append(Math.abs(round(hp, 2)).toString()).append(" Health")
+                builder.append(" - ").append(abs(hp.round(2)).toString()).append(" Health")
             }
             if (gold != 0.0) {
                 if (gold > 0) {
-                    builder.append(" + ").append(round(gold, 2).toString())
+                    builder.append(" + ").append(gold.round(2).toString())
                 } else if (gold < 0) {
                     displayType = SnackbarDisplayType.FAILURE
-                    builder.append(" - ").append(Math.abs(round(gold, 2)).toString())
+                    builder.append(" - ").append(abs(gold.round(2)).toString())
                 }
                 builder.append(" Gold")
             }
             if (mp > 0) {
-                builder.append(" + ").append(round(mp, 2).toString()).append(" Mana")
+                builder.append(" + ").append(mp.round(2).toString()).append(" Mana")
             }
 
             return Pair(builder, displayType)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
index 226aeacf5..ee1853576 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
@@ -6,6 +6,9 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import java.util.*
+import kotlin.math.min
+import kotlin.math.pow
+import kotlin.math.roundToLong
 
 class ScoreTaskLocallyInteractor {
     companion object {
@@ -20,7 +23,7 @@ class ScoreTaskLocallyInteractor {
                 else -> task.value
             }
 
-            var nextDelta = Math.pow(0.9747, currentValue) * if (direction == TaskDirection.DOWN) -1 else 1
+            var nextDelta = 0.9747.pow(currentValue) * if (direction == TaskDirection.DOWN) -1 else 1
 
             if (task.checklist?.size ?: 0 > 0) {
                 if (task.type == Task.TYPE_TODO) {
@@ -72,10 +75,10 @@ class ScoreTaskLocallyInteractor {
                 }
                 if (result.exp >= stats.toNextLevel?.toDouble() ?: 0.0) {
                     result.exp = result.exp - (stats.toNextLevel?.toDouble() ?: 0.0)
-                    result.lvl = user.stats?.lvl ?: 0 + 1
+                    result.lvl = (user.stats?.lvl ?: 0 + 1).toLong()
                     result.hp = 50.0
                 } else {
-                    result.lvl = user.stats?.lvl ?: 0
+                    result.lvl = (user.stats?.lvl ?: 0).toLong()
                 }
 
                 result
@@ -90,13 +93,13 @@ class ScoreTaskLocallyInteractor {
                 conBonus = 0.1f
             }
             val hpMod = delta * conBonus * task.priority * 2
-            result.hp = (stats.hp ?: 0.0) + Math.round(hpMod * 10) / 10.0
+            result.hp = (stats.hp ?: 0.0) + (hpMod * 10).roundToLong() / 10.0
         }
 
         private fun addPoints(result: TaskDirectionData, delta: Double, stats: Stats, computedStats: Stats, task: Task, direction: TaskDirection) {
             val intBonus = 1f + ((computedStats.intelligence?.toFloat() ?: 0f) * 0.025f)
             result.exp = (stats.exp
-                    ?: 0.0) + Math.round(delta * intBonus * task.priority * 6).toDouble()
+                    ?: 0.0) + (delta * intBonus * task.priority * 6).roundToLong().toDouble()
 
             val perBonus = 1f + ((computedStats.per?.toFloat() ?: 0f) * 0.02f)
             val goldMod = delta * task.priority * perBonus
@@ -113,7 +116,7 @@ class ScoreTaskLocallyInteractor {
         }
 
         private fun computeStats(user: User): Stats {
-            val levelStat = Math.min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
+            val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
 
             var totalStrength = levelStat
             var totalIntelligence = levelStat
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
deleted file mode 100644
index f07d72f0e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import java.util.HashMap;
-
-public class AchievementGroup {
-    public String label;
-    public HashMap<String, Achievement> achievements;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.kt
new file mode 100644
index 000000000..953e9ed3a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.kt
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.models
+
+import java.util.*
+
+class AchievementGroup {
+    var label: String? = null
+    var achievements: HashMap<String, Achievement>? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
deleted file mode 100644
index ba12b0a31..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-public class AchievementResult {
-    public AchievementGroup basic;
-    public AchievementGroup seasonal;
-    public AchievementGroup special;
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.kt
new file mode 100644
index 000000000..5b692dbb4
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.kt
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.models
+
+class AchievementResult {
+    var basic: AchievementGroup? = null
+    var seasonal: AchievementGroup? = null
+    var special: AchievementGroup? = null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
deleted file mode 100644
index ffab0fb45..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-
-import io.realm.RealmList;
-
-public class ContentGear {
-
-    public RealmList<Equipment> flat;
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.kt
new file mode 100644
index 000000000..cdceec6c7
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.kt
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.android.habitica.models.inventory.Equipment
+
+import io.realm.RealmList
+
+class ContentGear {
+
+    var flat: RealmList<Equipment>? = null
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
deleted file mode 100644
index 50ee283ac..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.inventory.SpecialItem;
-
-import java.util.List;
-
-import io.realm.RealmList;
-
-/**
- * Created by Negue on 15.07.2015.
- */
-public class ContentResult {
-
-    public Equipment potion;
-
-    public Equipment armoire;
-
-    public ContentGear gear;
-
-    public RealmList<QuestContent> quests;
-    public RealmList<Egg> eggs;
-    public RealmList<Food> food;
-    public RealmList<HatchingPotion> hatchingPotions;
-
-    public RealmList<Pet> pets;
-
-    public RealmList<Mount> mounts;
-
-    public List<Skill> spells;
-
-    public RealmList<Customization> appearances;
-    public RealmList<Customization> backgrounds;
-
-    public RealmList<FAQArticle> faq;
-    public RealmList<SpecialItem> special;
-}
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.kt
new file mode 100644
index 000000000..3c890d842
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.kt
@@ -0,0 +1,34 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.android.habitica.models.inventory.*
+import io.realm.RealmList
+
+/**
+ * Created by Negue on 15.07.2015.
+ */
+class ContentResult {
+
+    var potion: Equipment? = null
+
+    var armoire: Equipment? = null
+
+    var gear: ContentGear? = null
+
+    var quests = RealmList<QuestContent>()
+    var eggs = RealmList<Egg>()
+    var food = RealmList<Food>()
+    var hatchingPotions = RealmList<HatchingPotion>()
+
+    var pets = RealmList<Pet>()
+
+    var mounts = RealmList<Mount>()
+
+    var spells = RealmList<Skill>()
+
+    var appearances = RealmList<Customization>()
+    var backgrounds = RealmList<Customization>()
+
+    var faq = RealmList<FAQArticle>()
+    var special = RealmList<SpecialItem>()
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
deleted file mode 100644
index 87616e359..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class FAQArticle extends RealmObject {
-
-    @PrimaryKey
-    private Integer position;
-
-    private String question, answer;
-
-    public Integer getPosition() {
-        return position;
-    }
-
-    public void setPosition(Integer position) {
-        this.position = position;
-    }
-
-    public String getQuestion() {
-        return question;
-    }
-
-    public void setQuestion(String question) {
-        this.question = question;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt
new file mode 100644
index 000000000..a911ce735
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class FAQArticle : RealmObject() {
+
+    @PrimaryKey
+    var position: Int? = null
+
+    var question: String? = null
+    var answer: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
deleted file mode 100644
index 5d2504240..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-public class LeaveChallengeBody {
-
-    public String keep;
-
-    public LeaveChallengeBody(String keep) {
-        this.keep = keep;
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.kt
new file mode 100644
index 000000000..fd24ef524
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.kt
@@ -0,0 +1,3 @@
+package com.habitrpg.android.habitica.models
+
+class LeaveChallengeBody(var keep: String)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
index a56c323df..b4c16138f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
@@ -14,10 +14,20 @@ class Notification {
         GROUP_TASK_REQUIRES_APPROVAL("GROUP_TASK_REQUIRES_APPROVAL"),
         UNALLOCATED_STATS_POINTS("UNALLOCATED_STATS_POINTS"),
 
+        //Achievements
+        ACHIEVEMENT_PARTY_UP("ACHIEVEMENT_PARTY_UP"),
+        ACHIEVEMENT_PARTY_ON("ACHIEVEMENT_PARTY_ON"),
+        ACHIEVEMENT_BEAST_MASTER("ACHIEVEMENT_BEAST_MASTER"),
+        ACHIEVEMENT_MOUNT_MASTER("ACHIEVEMENT_MOUNT_MASTER"),
+        ACHIEVEMENT_TRIAD_BINGO("ACHIEVEMENT_TRIAD_BINGO"),
+        ACHIEVEMENT_GUILD_JOINED("GUILD_JOINED_ACHIEVEMENT"),
+        ACHIEVEMENT_CHALLENGE_JOINED("CHALLENGE_JOINED_ACHIEVEMENT"),
+        ACHIEVEMENT_INVITED_FRIEND("INVITED_FRIEND_ACHIEVEMENT"),
+
         // Custom notification types (created by this app)
         GUILD_INVITATION("GUILD_INVITATION"),
         PARTY_INVITATION("PARTY_INVITATION"),
-        QUEST_INVITATION("QUEST_INVITATION");
+        QUEST_INVITATION("QUEST_INVITATION"),
     }
 
     var id: String = ""
@@ -42,4 +52,17 @@ class Notification {
             else -> null
         }
     }
+
+    val priority: Int
+    get() {
+        return when (type) {
+            Type.NEW_STUFF.type -> 1
+            Type.GUILD_INVITATION.type -> 2
+            Type.PARTY_INVITATION.type -> 3
+            Type.UNALLOCATED_STATS_POINTS.type -> 4
+            Type.NEW_MYSTERY_ITEMS.type -> 5
+            Type.NEW_CHAT_MESSAGE.type -> 6
+            else -> 100
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
deleted file mode 100644
index a69cbb1ec..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.List;
-
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-/**
- * Description of a Tag in HabitRPG
- * Created by MagicMicky on 16/03/14.
- */
-
-public class Tag extends RealmObject {
-
-    @PrimaryKey
-    public String id;
-
-    public String userId;
-    public RealmList<Task> tasks;
-    String name;
-    boolean challenge;
-
-    public List<Task> getTasks() {
-        return tasks;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (Tag.class.isAssignableFrom(o.getClass())) {
-            Tag otherTag = (Tag) o;
-            return this.getId().equals(otherTag.getId());
-        }
-        return super.equals(o);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
new file mode 100644
index 000000000..ad9d24285
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.models
+
+import com.habitrpg.android.habitica.models.tasks.Task
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Tag : RealmObject() {
+
+    @PrimaryKey
+    var id: String = ""
+
+    var userId: String? = null
+    var tasks: RealmList<Task>? = null
+    var name: String = ""
+    internal var challenge: Boolean = false
+
+    fun getTasks(): List<Task>? {
+        return tasks
+    }
+
+
+    override fun equals(o: Any?): Boolean {
+        if (Tag::class.java.isAssignableFrom(o!!.javaClass)) {
+            val otherTag = o as Tag?
+            return this.id == otherTag!!.id
+        }
+        return super.equals(o)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
deleted file mode 100644
index aef45d7aa..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-public class Transaction {
-    public String receipt;
-
-    public String signature;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
new file mode 100644
index 000000000..5829d6e93
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.models
+
+class Transaction {
+    var receipt: String? = null
+
+    var signature: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt
new file mode 100644
index 000000000..e154a65e1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/VersionedObject.kt
@@ -0,0 +1,6 @@
+package com.habitrpg.android.habitica.models
+
+interface VersionedObject {
+
+    var versionNumber: Int
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
index 81277cee1..6116e2158 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
@@ -16,29 +16,33 @@ open class Member : RealmObject(), Avatar {
     var id: String? = null
         set(id) {
             field = id
+            val subID = "m$id" // Do this to prevent the member object from overwriting the user ones
             if (stats != null && stats?.isManaged != true) {
-                stats?.userId = id
+                stats?.userId = subID
+            }
+            if (items != null && items?.isManaged != true) {
+                items?.userId = subID
             }
             if (this.inbox != null && this.inbox?.isManaged != true) {
-                this.inbox?.userId = id
+                this.inbox?.userId = subID
             }
             if (preferences != null && preferences?.isManaged != true) {
-                preferences?.setUserId(id ?: "")
+                preferences?.setUserId(subID)
             }
             if (this.profile != null && this.profile?.isManaged != true) {
-                this.profile?.userId = id
+                this.profile?.userId = subID
             }
             if (this.contributor != null && this.contributor?.isManaged != true) {
-                this.contributor?.userId = id
+                this.contributor?.userId = subID
             }
             if (costume != null && costume?.isManaged != true) {
-                costume?.userId = id + "costume"
+                costume?.userId = subID + "costume"
             }
             if (equipped != null && equipped?.isManaged != true) {
-                equipped?.userId = id + "equipped"
+                equipped?.userId = subID + "equipped"
             }
             if (this.authentication != null && this.authentication?.isManaged != true) {
-                this.authentication?.userId = id
+                this.authentication?.userId = subID
             }
         }
     private var stats: Stats? = null
@@ -101,9 +105,9 @@ open class Member : RealmObject(), Avatar {
 
     val petsFoundCount: Int
         get() = this.items?.pets?.size ?: 0
-
     val mountsTamedCount: Int
         get() = this.items?.mounts?.size ?: 0
+
     val username: String?
     get() = authentication?.localAuthentication?.username
     val formattedUsername: String?
@@ -146,7 +150,7 @@ open class Member : RealmObject(), Avatar {
     fun setCostume(costume: Outfit?) {
         this.costume = costume
         if (costume != null && this.id != null) {
-            costume.userId = this.id!! + "costume"
+            costume.userId = this.id + "costume"
         }
     }
 
@@ -161,7 +165,7 @@ open class Member : RealmObject(), Avatar {
     fun setEquipped(equipped: Outfit?) {
         this.equipped = equipped
         if (equipped != null && this.id != null) {
-            equipped.userId = this.id!! + "equipped"
+            equipped.userId = this.id + "equipped"
         }
     }
 
@@ -182,6 +186,6 @@ open class Member : RealmObject(), Avatar {
     }
 
     override fun getSleep(): Boolean {
-        return getPreferences() != null && getPreferences()!!.sleep
+        return getPreferences()?.sleep ?: false
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
deleted file mode 100644
index c63a76879..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.habitrpg.android.habitica.models.responses;
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-public class Status {
-    private String status;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.kt
new file mode 100644
index 000000000..76c5da871
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.models.responses
+
+class Status {
+    var status: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
index 4cd586f44..31fde57f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
@@ -13,5 +13,5 @@ class TaskDirectionData {
     var hp: Double = 0.0
     var gp: Double = 0.0
     var mp: Double = 0.0
-    var lvl: Int = 0
+    var lvl: Long = 0
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
index e7fbb0318..8a43057db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
@@ -5,7 +5,9 @@ class ShopCategory {
     var identifier: String = ""
     var text: String = ""
     var notes: String = ""
+    var path: String = ""
     var purchaseAll: Boolean? = null
+    var pinType: String = ""
 
     var items: MutableList<ShopItem> = ArrayList()
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
deleted file mode 100644
index 8caac9a46..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.models.social;
-
-import io.realm.RealmObject;
-
-public class Backer extends RealmObject {
-    public int level;
-    public String npc;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.kt
new file mode 100644
index 000000000..9155f8a90
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.kt
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.models.social
+
+import io.realm.RealmObject
+
+open class Backer : RealmObject() {
+    var level: Int = 0
+    var npc: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
index 009d0812b..5e3887fa2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
@@ -1,12 +1,6 @@
 package com.habitrpg.android.habitica.models.social
 
-import android.content.res.Resources
-
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.user.ContributorInfo
-
-import java.util.Date
-
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
@@ -35,6 +29,7 @@ open class ChatMessage : RealmObject() {
     var flagCount: Int = 0
 
     var uuid: String? = null
+    var userID: String? = null
 
     var contributor: ContributorInfo? = null
 
@@ -60,25 +55,6 @@ open class ChatMessage : RealmObject() {
     val formattedUsername: String?
         get() = if (username != null) "@$username" else null
 
-    fun getAgoString(res: Resources): String {
-        val diff = Date().time - (timestamp ?: 0)
-
-        val diffMinutes = diff / (60 * 1000) % 60
-        val diffHours = diff / (60 * 60 * 1000) % 24
-        val diffDays = diff / (24 * 60 * 60 * 1000)
-
-        return when {
-            diffDays != 0L -> if (diffDays == 1L) {
-                res.getString(R.string.ago_1day)
-            } else res.getString(R.string.ago_days, diffDays)
-            diffHours != 0L -> if (diffHours == 1L) {
-                res.getString(R.string.ago_1hour)
-            } else res.getString(R.string.ago_hours, diffHours)
-            diffMinutes == 1L -> res.getString(R.string.ago_1Minute)
-            else -> res.getString(R.string.ago_minutes, diffMinutes)
-        }
-    }
-
     fun userLikesMessage(userId: String?): Boolean {
         return likes?.any { userId == it.id } ?: false
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt
new file mode 100644
index 000000000..f44eb4306
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt
@@ -0,0 +1,36 @@
+package com.habitrpg.android.habitica.models.social
+
+import com.habitrpg.android.habitica.models.user.ContributorInfo
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.util.*
+
+open class InboxConversation : RealmObject() {
+
+    @PrimaryKey
+    var combinedID: String = ""
+    set(value) {
+        field = value
+        userStyles?.id = value
+        contributor?.userId = value
+    }
+    var uuid: String = ""
+    set(value) {
+        field = value
+        combinedID = userID + value
+    }
+    var userID: String = ""
+        set(value) {
+            field = value
+            combinedID = value + uuid
+        }
+    var username: String? = null
+    var user: String? = null
+    var timestamp: Date? = null
+    var contributor: ContributorInfo? = null
+    var userStyles: UserStyles? = null
+    var text: String? = null
+
+    val formattedUsername: String?
+        get() = if (username?.isNotEmpty() == true) "@$username" else null
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
index 5e0ce6b99..cd6b32c81 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
@@ -2,7 +2,10 @@ package com.habitrpg.android.habitica.models.social
 
 import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.AvatarPreferences
-import com.habitrpg.android.habitica.models.user.*
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Preferences
+import com.habitrpg.android.habitica.models.user.Stats
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/HabitResetOption.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/HabitResetOption.kt
index 4b309476a..fec7d807b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/HabitResetOption.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/HabitResetOption.kt
@@ -4,7 +4,7 @@ import androidx.annotation.StringRes
 import com.habitrpg.android.habitica.R
 
 enum class HabitResetOption(val value: String, @StringRes val nameRes: Int) {
-    DAILY("daily", R.string.daily),
+    DAILY("daily", R.string.repeat_daily),
     WEEKLY("weekly", R.string.weekly),
     MONTHLY("monthly", R.string.monthly)
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 66be11f93..01c21fd66 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -157,7 +157,7 @@ open class Task : RealmObject, Parcelable {
     @Retention(AnnotationRetention.SOURCE)
     annotation class TaskTypes
 
-    fun containsAllTagIds(tagIdList: List<String>): Boolean = tags?.mapTo(ArrayList()) { it.getId() }?.containsAll(tagIdList) ?: false
+    fun containsAllTagIds(tagIdList: List<String>): Boolean = tags?.mapTo(ArrayList()) { it.id }?.containsAll(tagIdList) ?: false
 
     fun checkIfDue(): Boolean? = isDue == true
 
@@ -236,7 +236,10 @@ open class Task : RealmObject, Parcelable {
         }
         return if (Task::class.java.isAssignableFrom(other.javaClass)) {
             val otherTask = other as? Task
-            this.id == otherTask?.id
+            if (!this.isValid || otherTask?.isValid != true) {
+                return false
+            }
+            this.id == otherTask.id
         } else {
             super.equals(other)
         }
@@ -256,14 +259,14 @@ open class Task : RealmObject, Parcelable {
         dest.writeString(this.attribute)
         dest.writeString(this.type)
         dest.writeDouble(this.value)
-        dest.writeList(this.tags)
+        dest.writeList(this.tags as List<*>?)
         dest.writeLong(this.dateCreated?.time ?: -1)
         dest.writeInt(this.position)
         dest.writeValue(this.up)
         dest.writeValue(this.down)
         dest.writeByte(if (this.completed) 1.toByte() else 0.toByte())
-        dest.writeList(this.checklist)
-        dest.writeList(this.reminders)
+        dest.writeList(this.checklist as List<*>?)
+        dest.writeList(this.reminders as List<*>?)
         dest.writeString(this.frequency)
         dest.writeValue(this.everyX)
         dest.writeValue(this.streak)
@@ -287,7 +290,7 @@ open class Task : RealmObject, Parcelable {
         this.type = `in`.readString() ?: ""
         this.value = `in`.readDouble()
         this.tags = RealmList()
-        `in`.readList(this.tags, TaskTag::class.java.classLoader)
+        `in`.readList(this.tags as List<*>, TaskTag::class.java.classLoader)
         val tmpDateCreated = `in`.readLong()
         this.dateCreated = if (tmpDateCreated == -1L) null else Date(tmpDateCreated)
         this.position = `in`.readInt()
@@ -295,9 +298,9 @@ open class Task : RealmObject, Parcelable {
         this.down = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
         this.completed = `in`.readByte().toInt() != 0
         this.checklist = RealmList()
-        `in`.readList(this.checklist, ChecklistItem::class.java.classLoader)
+        `in`.readList(this.checklist as List<*>, ChecklistItem::class.java.classLoader)
         this.reminders = RealmList()
-        `in`.readList(this.reminders, RemindersItem::class.java.classLoader)
+        `in`.readList(this.reminders as List<*>, RemindersItem::class.java.classLoader)
         this.frequency = `in`.readString()
         this.everyX = `in`.readValue(Int::class.java.classLoader) as? Int ?: 1
         this.streak = `in`.readValue(Int::class.java.classLoader) as? Int ?: 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
index 993aa841c..979cda714 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
@@ -33,7 +33,7 @@ public class TaskTag extends RealmObject {
 
     public void setTag(Tag tag) {
         this.tag = tag;
-        tagId = tag.id;
+        tagId = tag.getId();
         updatePrimaryKey();
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
deleted file mode 100644
index 09478d356..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Hair extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    public Preferences preferences;
-    private int mustache, beard, bangs, base, flower;
-    private String color;
-
-    public Hair() {
-    }
-
-    public Hair(int mustache, int beard, int bangs, int base, String color, int flower) {
-        this.mustache = mustache;
-        this.beard = beard;
-        this.bangs = bangs;
-        this.base = base;
-        this.color = color;
-        this.flower = flower;
-    }
-
-    public int getMustache() {
-        return mustache;
-    }
-
-    public void setMustache(int mustache) {
-        this.mustache = mustache;
-    }
-
-    public int getBeard() {
-        return beard;
-    }
-
-    public void setBeard(int beard) {
-        this.beard = beard;
-    }
-
-    public int getBangs() {
-        return bangs;
-    }
-
-    public void setBangs(int bangs) {
-        this.bangs = bangs;
-    }
-
-    public int getBase() {
-        return base;
-    }
-
-    public void setBase(int base) {
-        this.base = base;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public int getFlower() {
-        return flower;
-    }
-
-    public void setFlower(int flower) {
-        this.flower = flower;
-    }
-
-    public boolean isAvailable(int hairId) {
-        return hairId > 0;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
new file mode 100644
index 000000000..781799570
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
@@ -0,0 +1,33 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Hair : RealmObject {
+
+    @PrimaryKey
+    var userId: String? = null
+
+    var preferences: Preferences? = null
+    var mustache: Int = 0
+    var beard: Int = 0
+    var bangs: Int = 0
+    var base: Int = 0
+    var flower: Int = 0
+    var color: String? = null
+
+    constructor()
+
+    constructor(mustache: Int, beard: Int, bangs: Int, base: Int, color: String, flower: Int) {
+        this.mustache = mustache
+        this.beard = beard
+        this.bangs = bangs
+        this.base = base
+        this.color = color
+        this.flower = flower
+    }
+
+    fun isAvailable(hairId: Int): Boolean {
+        return hairId > 0
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
deleted file mode 100644
index 79ce08e88..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Inbox extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    User user;
-    private boolean optOut;
-    @Ignore
-    private List<Object> blocks = new ArrayList<>();
-    private int newMessages;
-
-    /**
-     * @return The optOut
-     */
-    public boolean getOptOut() {
-        return optOut;
-    }
-
-    /**
-     * @param optOut The optOut
-     */
-    public void setOptOut(boolean optOut) {
-        this.optOut = optOut;
-    }
-
-    /**
-     * @return The blocks
-     */
-    public List<Object> getBlocks() {
-        return blocks;
-    }
-
-    /**
-     * @param blocks The blocks
-     */
-    public void setBlocks(List<Object> blocks) {
-        this.blocks = blocks;
-    }
-
-    /**
-     * @return The newMessages
-     */
-    public int getNewMessages() {
-        return newMessages;
-    }
-
-    /**
-     * @param newMessages The newMessages
-     */
-    public void setNewMessages(int newMessages) {
-        this.newMessages = newMessages;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt
new file mode 100644
index 000000000..7184c1645
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt
@@ -0,0 +1,36 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+import java.util.*
+
+open class Inbox : RealmObject() {
+
+    @PrimaryKey
+    var userId: String? = null
+
+    internal var user: User? = null
+    /**
+     * @return The optOut
+     */
+    /**
+     * @param optOut The optOut
+     */
+    var optOut: Boolean = false
+    /**
+     * @return The blocks
+     */
+    /**
+     * @param blocks The blocks
+     */
+    @Ignore
+    var blocks: List<Any> = ArrayList()
+    /**
+     * @return The newMessages
+     */
+    /**
+     * @param newMessages The newMessages
+     */
+    var newMessages: Int = 0
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
index 081af7af0..b5908010c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.models.user
 
-import io.realm.RealmMigration
-import io.realm.RealmModel
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
@@ -21,4 +19,17 @@ open class OwnedMount : RealmObject(), OwnedObject {
         }
 
     var owned = false
+
+    override fun equals(other: Any?): Boolean {
+        return if (other?.javaClass == OwnedMount::class.java) {
+            this.combinedKey == (other as OwnedMount).combinedKey
+        } else super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        var result = combinedKey.hashCode()
+        result = 31 * result + userID.hashCode()
+        result = 31 * result + key.hashCode()
+        return result
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt
index abd5a0ec5..5fa663ada 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedPet.kt
@@ -20,4 +20,17 @@ open class OwnedPet : RealmObject(), OwnedObject {
         }
 
     var trained = 0
+
+    override fun equals(other: Any?): Boolean {
+        return if (other?.javaClass == OwnedPet::class.java) {
+            this.combinedKey == (other as OwnedPet).combinedKey
+        } else super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        var result = combinedKey.hashCode()
+        result = 31 * result + userID.hashCode()
+        result = 31 * result + key.hashCode()
+        return result
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index b34335203..968232525 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -31,7 +31,9 @@ open class Preferences : RealmObject(), AvatarPreferences {
     var sound: String? = null
     var dayStart: Int = 0
     var timezoneOffset: Int = 0
+    var timezoneOffsetAtLastCron: Int = 0
     var pushNotifications: PushNotificationsPreference? = null
+    var autoEquip: Boolean = true
 
     override fun getBackground(): String? {
         return background
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
deleted file mode 100644
index c8a4d3b99..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Profile extends RealmObject {
-
-    @PrimaryKey
-    private String userId;
-
-    User user;
-    private String name;
-    private String blurb, imageUrl;
-
-    public Profile(String name) {
-        this(name, "", "");
-    }
-
-    public Profile(String name, String blurb, String imageUrl) {
-        this.name = name;
-        this.blurb = blurb;
-        this.imageUrl = imageUrl;
-    }
-
-    public Profile() {
-
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getBlurb() {
-        return blurb;
-    }
-
-    public void setBlurb(String blurb) {
-        this.blurb = blurb;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt
new file mode 100644
index 000000000..e4cded1d0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.kt
@@ -0,0 +1,24 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Profile : RealmObject {
+
+    @PrimaryKey
+    var userId: String? = null
+
+    internal var user: User? = null
+    var name: String? = null
+    var blurb: String? = null
+    var imageUrl: String? = null
+
+    @JvmOverloads
+    constructor(name: String, blurb: String = "", imageUrl: String = "") {
+        this.name = name
+        this.blurb = blurb
+        this.imageUrl = imageUrl
+    }
+
+    constructor()
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
index 7deec9cae..ebdf3213e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
@@ -1,10 +1,7 @@
 package com.habitrpg.android.habitica.models.user
 
 import com.google.gson.annotations.SerializedName
-import com.habitrpg.android.habitica.models.Avatar
-import com.habitrpg.android.habitica.models.PushDevice
-import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.android.habitica.models.*
 import com.habitrpg.android.habitica.models.invitations.Invitations
 import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.UserParty
@@ -16,7 +13,7 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import java.util.*
 
-open class User : RealmObject(), Avatar {
+open class User : RealmObject(), Avatar, VersionedObject {
 
     @Ignore
     var tasks: TaskList? = null
@@ -57,6 +54,10 @@ open class User : RealmObject(), Avatar {
                 test.userID = id
             }
         }
+
+    @SerializedName("_v")
+    override var versionNumber: Int = 0
+
     var balance: Double = 0.toDouble()
     private var stats: Stats? = null
     var inbox: Inbox? = null
@@ -187,10 +188,8 @@ open class User : RealmObject(), Avatar {
         return (this.balance * 4).toInt()
     }
 
-    override fun getHourglassCount(): Int? {
-        return if (purchased != null) {
-            purchased?.plan?.consecutive?.trinkets
-        } else 0
+    override fun getHourglassCount(): Int {
+        return purchased?.plan?.consecutive?.trinkets ?: 0
     }
 
     override fun getCostume(): Outfit? {
@@ -214,7 +213,7 @@ open class User : RealmObject(), Avatar {
     }
 
     override fun getSleep(): Boolean {
-        return getPreferences() != null && getPreferences()!!.sleep
+        return preferences?.sleep ?: false
     }
 
     fun hasParty(): Boolean {
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
deleted file mode 100644
index a8b9ef43f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
+++ /dev/null
@@ -1,448 +0,0 @@
-package com.habitrpg.android.habitica.prefs.scanner;
-
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-
-import androidx.fragment.app.Fragment;
-
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-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
- * a simple
- * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or
- * learn the
- * project's source code.</p>
- * <p/>
- * <h2>Initiating a barcode scan</h2>
- * <p/>
- * <p>To integrate, create an instance of {@code IntentIntegrator} and call {@link #initiateScan()}
- * and wait
- * for the result in your app.</p>
- * <p/>
- * <p>It does require that the Barcode Scanner (or work-alike) application is installed. The
- * {@link #initiateScan()} method will prompt the user to download the application, if needed.</p>
- * <p/>
- * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
- * the method {@link Activity#onActivityResult(int, int, Intent)} and include a line of code like
- * this:</p>
- * <p/>
- * <pre>{@code
- * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
- *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode,
- * intent);
- *   if (scanResult != null) {
- *     // handle scan result
- *   }
- *   // else continue with any other code you need in the method
- *   ...
- * }
- * }</pre>
- * <p/>
- * <p>This is where you will handle a scan result.</p>
- * <p/>
- * <p>Second, just call this in response to a user action somewhere to begin the scan process:</p>
- * <p/>
- * <pre>{@code
- * IntentIntegrator integrator = new IntentIntegrator(yourActivity);
- * integrator.initiateScan();
- * }</pre>
- * <p/>
- * <p>Note that {@link #initiateScan()} returns an {@link AlertDialog} which is non-null if the
- * user was prompted to download the application. This lets the calling app potentially manage the
- * dialog.
- * In particular, ideally, the app dismisses the dialog if it's still active in its {@link
- * Activity#onPause()}
- * method.</p>
- * <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,
- * and
- * yes/no button labels can be changed.</p>
- * <p/>
- * <p>Finally, you can use {@link #addExtra(String, Object)} to add more parameters to the Intent
- * used
- * to invoke the scanner. This can be used to set additional options not directly exposed by this
- * simplified API.</p>
- * <p/>
- * <p>By default, this will only allow applications that are known to respond to this intent
- * correctly
- * do so. The apps that are allowed to response can be set with {@link
- * #setTargetApplications(List)}.
- * For example, set to {@link #TARGET_BARCODE_SCANNER_ONLY} to only target the Barcode Scanner app
- * itself.</p>
- * <p/>
- * <h2>Sharing text via barcode</h2>
- * <p/>
- * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link
- * #shareText(CharSequence)}.</p>
- * <p/>
- * <p>Some code, particularly download integration, was contributed from the Anobiit
- * application.</p>
- * <p/>
- * <h2>Enabling experimental barcode formats</h2>
- * <p/>
- * <p>Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such
- * as
- * PDF417. Use {@link #initiateScan(java.util.Collection)} with
- * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such
- * formats.</p>
- *
- * @author Sean Owen
- * @author Fred Lin
- * @author Isaac Potoczny-Jones
- * @author Brad Drehmer
- * @author gcstang
- */
-public class IntentIntegrator {
-
-    public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
-    public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
-    public static final String DEFAULT_MESSAGE =
-            "This application requires Barcode Scanner. Would you like to install it?";
-    public static final String DEFAULT_YES = "Yes";
-    public static final String DEFAULT_NO = "No";
-    // supported barcode formats
-    public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
-    public static final Collection<String> ONE_D_CODE_TYPES =
-            list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
-                    "ITF", "RSS_14", "RSS_EXPANDED");
-    public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
-    public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
-    public static final Collection<String> ALL_CODE_TYPES = null;
-    private static final String TAG = IntentIntegrator.class.getSimpleName();
-    private static final String BS_PACKAGE = "com.google.zxing.client.android";
-    public static final List<String> TARGET_BARCODE_SCANNER_ONLY = Collections.singletonList(BS_PACKAGE);
-    private static final String BSPLUS_PACKAGE = "com.srowen.bs.android";
-    public static final List<String> TARGET_ALL_KNOWN = list(
-            BS_PACKAGE, // Barcode Scanner
-            BSPLUS_PACKAGE, // Barcode Scanner+
-            BSPLUS_PACKAGE + ".simple" // Barcode Scanner+ Simple
-            // What else supports this intent?
-    );
-
-    private final Activity activity;
-    private final Map<String, Object> moreExtras;
-    private String title;
-    private String message;
-    private String buttonYes;
-    private String buttonNo;
-    private List<String> targetApplications;
-
-    public IntentIntegrator(Activity activity) {
-        this.activity = activity;
-        title = DEFAULT_TITLE;
-        message = DEFAULT_MESSAGE;
-        buttonYes = DEFAULT_YES;
-        buttonNo = DEFAULT_NO;
-        targetApplications = TARGET_ALL_KNOWN;
-        moreExtras = new HashMap<String, Object>(3);
-    }
-
-    /**
-     * <p>Call this from your {@link Activity}'s
-     * {@link Activity#onActivityResult(int, int, Intent)} method.</p>
-     *
-     * @return null if the event handled here was not related to this class, or
-     * else an {@link IntentResult} containing the result of the scan. If the user cancelled
-     * scanning,
-     * the fields will be null.
-     */
-    public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (requestCode == REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                String contents = intent.getStringExtra("SCAN_RESULT");
-                String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
-                byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
-                int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
-                Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
-                String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
-                return new IntentResult(contents,
-                        formatName,
-                        rawBytes,
-                        orientation,
-                        errorCorrectionLevel);
-            }
-            return new IntentResult();
-        }
-        return null;
-    }
-
-    private static List<String> list(String... values) {
-        return Collections.unmodifiableList(Arrays.asList(values));
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setTitleByID(int titleID) {
-        title = activity.getString(titleID);
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setMessageByID(int messageID) {
-        message = activity.getString(messageID);
-    }
-
-    public String getButtonYes() {
-        return buttonYes;
-    }
-
-    public void setButtonYes(String buttonYes) {
-        this.buttonYes = buttonYes;
-    }
-
-    public void setButtonYesByID(int buttonYesID) {
-        buttonYes = activity.getString(buttonYesID);
-    }
-
-    public String getButtonNo() {
-        return buttonNo;
-    }
-
-    public void setButtonNo(String buttonNo) {
-        this.buttonNo = buttonNo;
-    }
-
-    public void setButtonNoByID(int buttonNoID) {
-        buttonNo = activity.getString(buttonNoID);
-    }
-
-    public Collection<String> getTargetApplications() {
-        return targetApplications;
-    }
-
-    public final void setTargetApplications(List<String> targetApplications) {
-        if (targetApplications.isEmpty()) {
-            throw new IllegalArgumentException("No target applications");
-        }
-        this.targetApplications = targetApplications;
-    }
-
-    public void setSingleTargetApplication(String targetApplication) {
-        this.targetApplications = Collections.singletonList(targetApplication);
-    }
-
-    public Map<String, ?> getMoreExtras() {
-        return moreExtras;
-    }
-
-    public final void addExtra(String key, Object value) {
-        moreExtras.put(key, value);
-    }
-
-    /**
-     * Initiates a scan for all known barcode types.
-     */
-    public final HabiticaAlertDialog initiateScan() {
-        return initiateScan(ALL_CODE_TYPES);
-    }
-
-    public final HabiticaAlertDialog initiateScan(Fragment fragment) {
-        return initiateScan(fragment, ALL_CODE_TYPES);
-    }
-
-    /**
-     * Initiates a scan only for a certain set of barcode types, given as strings corresponding
-     * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
-     * like {@link #PRODUCT_CODE_TYPES} for example.
-     *
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     * if a prompt was needed, or null otherwise
-     */
-    public final HabiticaAlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
-        return initiateScan(null, desiredBarcodeFormats);
-    }
-
-    public final HabiticaAlertDialog initiateScan(Fragment fragment, Collection<String> desiredBarcodeFormats) {
-        Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
-        intentScan.addCategory(Intent.CATEGORY_DEFAULT);
-
-        // check which types of codes to scan for
-        if (desiredBarcodeFormats != null) {
-            // set the desired barcode types
-            StringBuilder joinedByComma = new StringBuilder();
-            for (String format : desiredBarcodeFormats) {
-                if (joinedByComma.length() > 0) {
-                    joinedByComma.append(',');
-                }
-                joinedByComma.append(format);
-            }
-            intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
-        }
-
-        String targetAppPackage = findTargetAppPackage(intentScan);
-        if (targetAppPackage == null) {
-            return showDownloadDialog();
-        }
-        intentScan.setPackage(targetAppPackage);
-        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        attachMoreExtras(intentScan);
-        if (fragment == null) {
-            startActivityForResult(intentScan, REQUEST_CODE);
-        } else {
-            startActivityForResult(fragment, intentScan, REQUEST_CODE);
-        }
-        return null;
-    }
-
-    /**
-     * Start an activity.<br>
-     * This method is defined to allow different methods of activity starting for
-     * newer versions of Android and for compatibility library.
-     *
-     * @param intent Intent to start.
-     * @param code   Request code for the activity
-     * @see android.app.Activity#startActivityForResult(Intent, int)
-     * @see android.app.Fragment#startActivityForResult(Intent, int)
-     */
-    protected void startActivityForResult(Intent intent, int code) {
-        activity.startActivityForResult(intent, code);
-    }
-
-    protected void startActivityForResult(Fragment fragment, Intent intent, int code) {
-        fragment.startActivityForResult(intent, code);
-    }
-
-    private String findTargetAppPackage(Intent intent) {
-        PackageManager pm = activity.getPackageManager();
-        List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-        if (availableApps != null) {
-            for (ResolveInfo availableApp : availableApps) {
-                String packageName = availableApp.activityInfo.packageName;
-                if (targetApplications.contains(packageName)) {
-                    return packageName;
-                }
-            }
-        }
-        return null;
-    }
-
-    private HabiticaAlertDialog showDownloadDialog() {
-        HabiticaAlertDialog downloadDialog = new HabiticaAlertDialog(activity);
-        downloadDialog.setTitle(title);
-        downloadDialog.setMessage(message);
-        downloadDialog.addButton(buttonYes, true, false, (dialogInterface, i) -> {
-            String packageName = targetApplications.get(0);
-            Uri uri = Uri.parse("market://details?id=" + packageName);
-            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-            try {
-                activity.startActivity(intent);
-            } catch (ActivityNotFoundException anfe) {
-                // Hmm, market is not installed
-                Log.w(TAG, "Google Play is not installed; cannot install " + packageName, anfe);
-            }
-            return null;
-        });
-        downloadDialog.addButton(buttonNo, false, false, null);
-        downloadDialog.show();
-        return downloadDialog;
-    }
-
-    /**
-     * Defaults to type "TEXT_TYPE".
-     *
-     * @see #shareText(CharSequence, CharSequence)
-     */
-    public final HabiticaAlertDialog shareText(CharSequence text) {
-        return shareText(text, "TEXT_TYPE");
-    }
-
-    /**
-     * Shares the given text by encoding it as a barcode, such that another user can
-     * scan the text off the screen of the device.
-     *
-     * @param text the text string to encode as a barcode
-     * @param type type of data to encode. See {@code com.google.zxing.client.android.Contents.Type}
-     *             constants.
-     * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
-     * if a prompt was needed, or null otherwise
-     */
-    public final HabiticaAlertDialog shareText(CharSequence text, CharSequence type) {
-        Intent intent = new Intent();
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-        intent.setAction(BS_PACKAGE + ".ENCODE");
-        intent.putExtra("ENCODE_TYPE", type);
-        intent.putExtra("ENCODE_DATA", text);
-        String targetAppPackage = findTargetAppPackage(intent);
-        if (targetAppPackage == null) {
-            return showDownloadDialog();
-        }
-        intent.setPackage(targetAppPackage);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        attachMoreExtras(intent);
-        activity.startActivity(intent);
-        return null;
-    }
-
-    private void attachMoreExtras(Intent intent) {
-        for (Map.Entry<String, Object> entry : moreExtras.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            // Kind of hacky
-            if (value instanceof Integer) {
-                intent.putExtra(key, (Integer) value);
-            } else if (value instanceof Long) {
-                intent.putExtra(key, (Long) value);
-            } else if (value instanceof Boolean) {
-                intent.putExtra(key, (Boolean) value);
-            } else if (value instanceof Double) {
-                intent.putExtra(key, (Double) value);
-            } else if (value instanceof Float) {
-                intent.putExtra(key, (Float) value);
-            } else if (value instanceof Bundle) {
-                intent.putExtra(key, (Bundle) value);
-            } else {
-                intent.putExtra(key, value.toString());
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java
deleted file mode 100644
index 0c0942270..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentResult.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.habitrpg.android.habitica.prefs.scanner;
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
- *
- * @author Sean Owen
- */
-public final class IntentResult {
-
-    private final String contents;
-    private final String formatName;
-    private final byte[] rawBytes;
-    private final Integer orientation;
-    private final String errorCorrectionLevel;
-
-    IntentResult() {
-        this(null, null, null, null, null);
-    }
-
-    IntentResult(String contents,
-                 String formatName,
-                 byte[] rawBytes,
-                 Integer orientation,
-                 String errorCorrectionLevel) {
-        this.contents = contents;
-        this.formatName = formatName;
-        this.rawBytes = rawBytes;
-        this.orientation = orientation;
-        this.errorCorrectionLevel = errorCorrectionLevel;
-    }
-
-    /**
-     * @return raw content of barcode
-     */
-    public String getContents() {
-        return contents;
-    }
-
-    /**
-     * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format
-     * names.
-     */
-    public String getFormatName() {
-        return formatName;
-    }
-
-    /**
-     * @return raw bytes of the barcode content, if applicable, or null otherwise
-     */
-    public byte[] getRawBytes() {
-        return rawBytes;
-    }
-
-    /**
-     * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
-     */
-    public Integer getOrientation() {
-        return orientation;
-    }
-
-    /**
-     * @return name of the error correction level used in the barcode, if applicable
-     */
-    public String getErrorCorrectionLevel() {
-        return errorCorrectionLevel;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder dialogText = new StringBuilder(100);
-        dialogText.append("Format: ").append(formatName).append('\n');
-        dialogText.append("Contents: ").append(contents).append('\n');
-        int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
-        dialogText.append("Raw bytes: (").append(rawBytesLength).append(" bytes)\n");
-        dialogText.append("Orientation: ").append(orientation).append('\n');
-        dialogText.append("EC level: ").append(errorCorrectionLevel).append('\n');
-        return dialogText.toString();
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.java b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.java
deleted file mode 100644
index 00e4e9064..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.habitrpg.android.habitica.proxy;
-
-
-import android.content.Context;
-
-public interface CrashlyticsProxy {
-    void init(Context context);
-
-    void logException(Throwable t);
-
-    void setString(String key, String value);
-
-    void setUserIdentifier(String identifier);
-
-    void setUserName(String name);
-
-    void fabricLogE(String s1, String s2, Exception e);
-
-    void log(String msg);
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.kt
new file mode 100644
index 000000000..442b84a25
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxy.kt
@@ -0,0 +1,20 @@
+package com.habitrpg.android.habitica.proxy
+
+
+import android.content.Context
+
+interface CrashlyticsProxy {
+    fun init(context: Context)
+
+    fun logException(t: Throwable)
+
+    fun setString(key: String, value: String)
+
+    fun setUserIdentifier(identifier: String)
+
+    fun setUserName(name: String)
+
+    fun fabricLogE(s1: String, s2: String, e: Exception)
+
+    fun log(msg: String)
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.java b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.java
deleted file mode 100644
index 66bd74a1e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.habitrpg.android.habitica.proxy.implementation;
-
-
-import android.content.Context;
-
-import com.habitrpg.android.habitica.proxy.CrashlyticsProxy;
-
-public class EmptyCrashlyticsProxy implements CrashlyticsProxy {
-    @Override
-    public void init(Context context) {
-        //pass
-    }
-
-    @Override
-    public void logException(Throwable e) {
-        //pass
-    }
-
-    @Override
-    public void setString(String key, String value) {
-        //pass
-    }
-
-    @Override
-    public void setUserIdentifier(String identifier) {
-        //pass
-    }
-
-    @Override
-    public void setUserName(String name) {
-
-    }
-
-    @Override
-    public void fabricLogE(String s1, String s2, Exception e) {
-        //pass
-    }
-
-    @Override
-    public void log(String msg) {
-        //pass
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt
new file mode 100644
index 000000000..e10609e4a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt
@@ -0,0 +1,36 @@
+package com.habitrpg.android.habitica.proxy.implementation
+
+
+import android.content.Context
+
+import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
+
+class EmptyCrashlyticsProxy : CrashlyticsProxy {
+    override fun init(context: Context) {
+        //pass
+    }
+
+    override fun logException(e: Throwable) {
+        //pass
+    }
+
+    override fun setString(key: String, value: String) {
+        //pass
+    }
+
+    override fun setUserIdentifier(identifier: String) {
+        //pass
+    }
+
+    override fun setUserName(name: String) {
+        //pass
+    }
+
+    override fun fabricLogE(s1: String, s2: String, e: Exception) {
+        //pass
+    }
+
+    override fun log(msg: String) {
+        //pass
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
index 62bd311f7..de9d5b28c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
@@ -4,11 +4,13 @@ import android.app.NotificationManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.res.Resources
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
@@ -21,61 +23,81 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
     @Inject
     lateinit var socialRepository: SocialRepository
     @Inject
+    lateinit var taskRepository: TaskRepository
+    @Inject
     lateinit var apiClient: ApiClient
 
     private var user: User? = null
-    private var action: String? = null
-    private var resources: Resources? = null
-    private var intent: Intent? = null
+    private var groupID: String? = null
+    private var senderID: String? = null
     private var context: Context? = null
+    private var intent: Intent? = null
 
     override fun onReceive(context: Context, intent: Intent) {
         HabiticaBaseApplication.userComponent?.inject(this)
-        this.resources = context.resources
-
-        this.action = intent.action
         this.intent = intent
+        groupID = intent.extras?.getString("groupID")
+        senderID = intent.extras?.getString("senderID")
         this.context = context
-
-        this.userRepository.getUser().firstElement().subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError())
-    }
-
-    fun onUserReceived(user: User) {
-        this.user = user
-        this.handleLocalNotificationAction(action)
-        userRepository.close()
+        handleLocalNotificationAction(intent.action)
     }
 
     private fun handleLocalNotificationAction(action: String?) {
         val notificationManager = this.context?.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
         notificationManager?.cancelAll()
-
-        //@TODO: This is a good place for a factory and event emitter pattern
         when (action) {
-            this.resources?.getString(R.string.accept_party_invite) -> {
-                val partyID = this.user?.invitations?.party?.id ?: return
-                socialRepository.joinGroup(partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.accept_party_invite) -> {
+                groupID?.let {
+                    socialRepository.joinGroup(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                }
             }
-            this.resources?.getString(R.string.reject_party_invite) -> {
-                val partyID = this.user?.invitations?.party?.id ?: return
-                socialRepository.rejectGroupInvite(partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.reject_party_invite) -> {
+                groupID?.let {
+                    socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                }
             }
-            this.resources?.getString(R.string.accept_quest_invite) -> {
-                val partyID = this.user?.party?.id ?: return
-                socialRepository.acceptQuest(user, partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.accept_quest_invite) -> {
+                socialRepository.acceptQuest(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
             }
-            this.resources?.getString(R.string.reject_quest_invite) -> {
-                val partyID = this.user?.party?.id ?: return
-                socialRepository.rejectQuest(user, partyID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.reject_quest_invite) -> {
+                socialRepository.rejectQuest(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
             }
-            this.resources?.getString(R.string.accept_guild_invite) -> {
-                val guildID = intent?.extras?.getString("groupID") ?: return
-                socialRepository.joinGroup(guildID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.accept_guild_invite) -> {
+                groupID?.let {
+                    socialRepository.joinGroup(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                }
             }
-            this.resources?.getString(R.string.reject_guild_invite) -> {
-                val guildID = intent?.extras?.getString("groupID") ?: return
-                socialRepository.rejectGroupInvite(guildID).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            context?.getString(R.string.reject_guild_invite) -> {
+                groupID?.let {
+                    socialRepository.rejectGroupInvite(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                }
+            }
+            context?.getString(R.string.group_message_reply) -> {
+                groupID?.let {
+                    getMessageText(context?.getString(R.string.group_message_reply))?.let { message ->
+                        socialRepository.postGroupChat(it, message).subscribe(Consumer {
+                            context?.let { c -> NotificationManagerCompat.from(c).cancel(it.hashCode()) }
+                        }, RxErrorHandler.handleEmptyError())
+                    }
+                }
+            }
+            context?.getString(R.string.inbox_message_reply) -> {
+                senderID?.let {
+                    getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
+                        socialRepository.postPrivateMessage(it, message).subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                    }
+                }
+            }
+            context?.getString(R.string.complete_task_action) -> {
+                intent?.extras?.getString("taskID")?.let {
+                    taskRepository.taskChecked(null, it, up = true, force = false) { _ ->
+                    }.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+                }
             }
         }
     }
+
+    private fun getMessageText(key: String?): String? {
+        return RemoteInput.getResultsFromIntent(intent)?.getCharSequence(key)?.toString()
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index 7165fd594..0ddeb1960 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.receivers
 
 import android.app.Notification
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -9,6 +8,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Build
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.habitrpg.android.habitica.HabiticaBaseApplication
@@ -18,7 +18,6 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
-import com.habitrpg.android.habitica.helpers.notifications.createOrUpdateHabiticaChannel
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -85,12 +84,9 @@ class NotificationPublisher : BroadcastReceiver() {
     }
 
     private fun notify(intent: Intent, notification: Notification?) {
-        val notificationManager = context?.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            notificationManager?.createOrUpdateHabiticaChannel()
-        }
+        val notificationManager = context?.let { NotificationManagerCompat.from(it) }
         val id = intent.getIntExtra(NOTIFICATION_ID, 0)
-        notificationManager?.notify(id, notification)
+        notification?.let { notificationManager?.notify(id, it) }
     }
 
     private fun buildNotification(wasInactive: Boolean, registrationDate: Date? = null): Notification? {
@@ -138,11 +134,7 @@ class NotificationPublisher : BroadcastReceiver() {
             builder.color = ContextCompat.getColor(thisContext, R.color.brand_300)
         }
 
-        notification = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            builder.build()
-        } else {
-            builder.notification
-        }
+        notification = builder.build()
         notification.defaults = notification.defaults or Notification.DEFAULT_LIGHTS
 
         notification.flags = notification.flags or (Notification.FLAG_AUTO_CANCEL or Notification.FLAG_SHOW_LIGHTS)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index 941454d51..85150d901 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -1,26 +1,27 @@
 package com.habitrpg.android.habitica.receivers
 
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.media.RingtoneManager
-import android.os.Build
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
-import com.habitrpg.android.habitica.helpers.notifications.createOrUpdateHabiticaChannel
+import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
 
 
+
+
 class TaskReceiver : BroadcastReceiver() {
 
     @Inject
@@ -33,7 +34,6 @@ class TaskReceiver : BroadcastReceiver() {
         HabiticaBaseApplication.userComponent?.inject(this)
         val extras = intent.extras
         if (extras != null) {
-            val taskTitle = extras.getString(TaskAlarmManager.TASK_NAME_INTENT_KEY)
             val taskId = extras.getString(TaskAlarmManager.TASK_ID_INTENT_KEY)
             //This will set up the next reminders for dailies
             if (taskId != null) {
@@ -43,7 +43,7 @@ class TaskReceiver : BroadcastReceiver() {
             taskRepository.getTask(taskId ?: "")
                     .firstElement()
                     .subscribe(Consumer {
-                        if (it.isValid && it.completed) {
+                        if (!it.isValid || it.completed) {
                             return@Consumer
                         }
 
@@ -51,12 +51,12 @@ class TaskReceiver : BroadcastReceiver() {
                         additionalData["identifier"] = "task_reminder"
                         AmplitudeManager.sendEvent("receive notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
 
-                        createNotification(context, taskTitle)
+                        createNotification(context, it)
                     }, RxErrorHandler.handleEmptyError())
         }
     }
 
-    private fun createNotification(context: Context, taskTitle: String?) {
+    private fun createNotification(context: Context, task: Task) {
         val intent = Intent(context, MainActivity::class.java)
 
         intent.putExtra("notificationIdentifier", "task_reminder")
@@ -65,16 +65,25 @@ class TaskReceiver : BroadcastReceiver() {
 
         val notificationBuilder = NotificationCompat.Builder(context, "default")
                 .setSmallIcon(R.drawable.ic_gryphon_white)
-                .setContentTitle(taskTitle)
+                .setContentTitle(task.text)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
                 .setSound(soundUri)
                 .setAutoCancel(true)
                 .setContentIntent(pendingIntent)
 
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            /* Create or update. */
-            notificationManager?.createOrUpdateHabiticaChannel()
+        if (task.type == Task.TYPE_DAILY || task.type == Task.TYPE_TODO) {
+            val completeIntent = Intent(context, LocalNotificationActionReceiver::class.java)
+            completeIntent.action = context.getString(R.string.complete_task_action)
+            completeIntent.putExtra("taskID", task.id)
+            val pendingIntentComplete = PendingIntent.getBroadcast(
+                    context,
+                    3000,
+                    completeIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            notificationBuilder.addAction(0, context.getString(R.string.complete), pendingIntentComplete)
         }
-        notificationManager?.notify(System.currentTimeMillis().toInt(), notificationBuilder.build())
+        val notificationManager = NotificationManagerCompat.from(context)
+        notificationManager.notify(task.id.hashCode(), notificationBuilder.build())
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
index 106b692b5..af58d9b4b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
@@ -18,6 +18,7 @@ import com.facebook.imagepipeline.image.ImageInfo
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.Avatar
+import io.reactivex.functions.Consumer
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -58,7 +59,7 @@ class AvatarView : View {
             val canvasRect = Rect()
             avatarRectF?.round(canvasRect)
             avatarBitmap = Bitmap.createBitmap(canvasRect.width(), canvasRect.height(), Bitmap.Config.ARGB_8888)
-            avatarCanvas = Canvas(avatarBitmap)
+            avatarBitmap?.let { avatarCanvas = Canvas(it) }
             draw(avatarCanvas)
 
             return avatarBitmap
@@ -84,12 +85,6 @@ class AvatarView : View {
         isOrphan = true
     }
 
-    fun configureView(showBackground: Boolean, showMount: Boolean, showPet: Boolean) {
-        this.showBackground = showBackground
-        this.showMount = showMount
-        this.showPet = showPet
-    }
-
     private fun init(attrs: AttributeSet?, defStyle: Int) {
         // Load attributes
         val a = context.obtainStyledAttributes(
@@ -217,25 +212,23 @@ class AvatarView : View {
 
         var hasVisualBuffs = false
 
-        if (avatar.stats != null && avatar.stats?.buffs != null) {
-            val buffs = avatar.stats?.buffs
-
-            if (buffs?.snowball == true) {
+        avatar.stats?.buffs?.let { buffs ->
+            if (buffs.snowball == true) {
                 layerMap[LayerType.VISUAL_BUFF] = "snowman"
                 hasVisualBuffs = true
             }
 
-            if (buffs?.seafoam == true) {
+            if (buffs.seafoam == true) {
                 layerMap[LayerType.VISUAL_BUFF] = "seafoam_star"
                 hasVisualBuffs = true
             }
 
-            if (buffs?.shinySeed == true) {
+            if (buffs.shinySeed == true) {
                 layerMap[LayerType.VISUAL_BUFF] = "avatar_floral_" + avatar.stats?.habitClass
                 hasVisualBuffs = true
             }
 
-            if (buffs?.spookySparkles == true) {
+            if (buffs.spookySparkles == true) {
                 layerMap[LayerType.VISUAL_BUFF] = "ghost"
                 hasVisualBuffs = true
             }
@@ -500,34 +493,30 @@ class AvatarView : View {
         if (avatarCanvas != null) draw(avatarCanvas)
     }
 
-    enum class LayerType(internal val order: Int) {
-        BACKGROUND(0),
-        MOUNT_BODY(1),
-        CHAIR(2),
-        BACK(3),
-        SKIN(4),
-        SHIRT(5),
-        ARMOR(6),
-        BODY(7),
-        HEAD_0(8),
-        HAIR_BASE(9),
-        HAIR_BANGS(10),
-        HAIR_MUSTACHE(11),
-        HAIR_BEARD(12),
-        EYEWEAR(13),
-        VISUAL_BUFF(14),
-        HEAD(15),
-        HEAD_ACCESSORY(16),
-        HAIR_FLOWER(17),
-        SHIELD(18),
-        WEAPON(19),
-        MOUNT_HEAD(20),
-        ZZZ(21),
-        PET(22)
-    }
-
-    interface Consumer<in T> {
-        fun accept(t: T)
+    enum class LayerType {
+        BACKGROUND,
+        MOUNT_BODY,
+        CHAIR,
+        BACK,
+        SKIN,
+        SHIRT,
+        ARMOR,
+        BODY,
+        HEAD_0,
+        HAIR_BASE,
+        HAIR_BANGS,
+        HAIR_MUSTACHE,
+        HAIR_BEARD,
+        EYEWEAR,
+        VISUAL_BUFF,
+        HEAD,
+        HEAD_ACCESSORY,
+        HAIR_FLOWER,
+        SHIELD,
+        WEAPON,
+        MOUNT_HEAD,
+        ZZZ,
+        PET
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index c7eab2c34..5dbf0c8ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -22,6 +22,7 @@ import com.habitrpg.android.habitica.ui.views.ValueBar
 import io.reactivex.disposables.Disposable
 import org.greenrobot.eventbus.Subscribe
 import java.util.*
+import kotlin.math.floor
 
 class AvatarWithBarsViewModel(private val context: Context, view: View, userRepository: UserRepository? = null) {
     private val hpBar: ValueBar by bindView(view, R.id.hpBar)
@@ -91,7 +92,7 @@ class AvatarWithBarsViewModel(private val context: Context, view: View, userRepo
 
         currencyView.gold = stats.gp ?: 0.0
         if (user is User) {
-            currencyView.hourglasses = user.hourglassCount?.toDouble() ?: 0.0
+            currencyView.hourglasses = user.getHourglassCount()?.toDouble() ?: 0.0
             currencyView.gems = user.gemCount.toDouble()
         }
 
@@ -114,14 +115,14 @@ class AvatarWithBarsViewModel(private val context: Context, view: View, userRepo
         if (valueMax != 0)  {
             cachedMaxExp = valueMax
         }
-        xpBar.set(Math.floor(value.toDouble()), cachedMaxExp.toDouble())
+        xpBar.set(floor(value.toDouble()), cachedMaxExp.toDouble())
     }
 
     private fun setMpBarData(value: Float, valueMax: Int) {
         if (valueMax != 0) {
             cachedMaxMana = valueMax
         }
-        mpBar.set(Math.floor(value.toDouble()), cachedMaxMana.toDouble())
+        mpBar.set(floor(value.toDouble()), cachedMaxMana.toDouble())
     }
 
     @Subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
index eb6118ef2..663adc533 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
@@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class GemPurchaseOptionsView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
 
-    val seedsImageButton: ImageButton by bindView(R.id.seedsImageButton)
     private val gemImageView: ImageView by bindView(R.id.gem_image)
     private val gemAmountTextView: TextView by bindView(R.id.gem_amount)
     private val purchaseButton: Button by bindView(R.id.purchase_button)
@@ -31,10 +30,6 @@ class GemPurchaseOptionsView(context: Context, attrs: AttributeSet) : FrameLayou
         if (iconRes != null) {
             gemImageView.setImageDrawable(iconRes)
         }
-
-        if (a.getBoolean(R.styleable.GemPurchaseOptionsView_showSeedsPromo, false)) {
-            seedsImageButton.visibility = View.VISIBLE
-        }
     }
 
     fun setOnPurchaseClickListener(listener: OnClickListener) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
index 874aff703..85911f935 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.kt
@@ -9,6 +9,7 @@ import android.util.DisplayMetrics
 import android.view.WindowManager
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
+import kotlin.math.min
 
 class MaxHeightLinearLayout : LinearLayout {
 
@@ -53,7 +54,7 @@ class MaxHeightLinearLayout : LinearLayout {
         val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as? WindowManager
         windowManager?.defaultDisplay?.getMetrics(displaymetrics)
         val height = (displaymetrics.heightPixels * maxHeight).toInt()
-        heightMeasurement = Math.min(heightMeasurement, MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST))
+        heightMeasurement = min(heightMeasurement, MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST))
 
         super.onMeasure(widthMeasureSpec, heightMeasurement)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
index bc6d7bd58..73fec6b99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
@@ -3,9 +3,10 @@ package com.habitrpg.android.habitica.ui
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Path
-import android.graphics.RectF
+import android.graphics.Rect
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.core.graphics.toRectF
 
 
 class RoundedFrameLayout @JvmOverloads constructor(
@@ -14,11 +15,14 @@ class RoundedFrameLayout @JvmOverloads constructor(
 
     var radius = 4f
     var isCirclular = true
+    val clipPath = Path()
+    val bounds = Rect()
 
     override fun onDraw(canvas: Canvas) {
-        val clipPath = Path()
+        clipPath.reset()
         val radius = if (isCirclular) (canvas.height/2).toFloat() else radius
-        clipPath.addRoundRect(RectF(canvas.clipBounds), radius, radius, Path.Direction.CW)
+        canvas.getClipBounds(bounds)
+        clipPath.addRoundRect(bounds.toRectF(), radius, radius, Path.Direction.CW)
         canvas.clipPath(clipPath)
         super.onDraw(canvas)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
deleted file mode 100644
index 98fd33c25..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.habitrpg.android.habitica.ui;
-
-import android.content.Context;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.util.Log;
-import android.view.View;
-
-import com.habitrpg.android.habitica.BuildConfig;
-
-/**
- * http://stackoverflow.com/a/29945693/1315039
- */
-public class WrapContentRecyclerViewLayoutManager extends LinearLayoutManager {
-
-    private static final int CHILD_WIDTH = 0;
-    private static final int CHILD_HEIGHT = 1;
-    private static final int DEFAULT_CHILD_SIZE = 100;
-
-    private final int[] childDimensions = new int[2];
-
-    private int childSize = DEFAULT_CHILD_SIZE;
-    private boolean hasChildSize;
-
-    @SuppressWarnings("UnusedDeclaration")
-    public WrapContentRecyclerViewLayoutManager(Context context) {
-        super(context);
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
-    public WrapContentRecyclerViewLayoutManager(Context context, int orientation, boolean reverseLayout) {
-        super(context, orientation, reverseLayout);
-    }
-
-    public static int makeUnspecifiedSpec() {
-        return View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-    }
-
-    @Override
-    public void onMeasure(RecyclerView.Recycler recycler, RecyclerView.State state, int widthSpec, int heightSpec) {
-        final int widthMode = View.MeasureSpec.getMode(widthSpec);
-        final int heightMode = View.MeasureSpec.getMode(heightSpec);
-
-        final int widthSize = View.MeasureSpec.getSize(widthSpec);
-        final int heightSize = View.MeasureSpec.getSize(heightSpec);
-
-        final boolean exactWidth = widthMode == View.MeasureSpec.EXACTLY;
-        final boolean exactHeight = heightMode == View.MeasureSpec.EXACTLY;
-
-        final int unspecified = makeUnspecifiedSpec();
-
-        if (exactWidth && exactHeight) {
-            // in case of exact calculations for both dimensions let's use default "onMeasure" implementation
-            super.onMeasure(recycler, state, widthSpec, heightSpec);
-            return;
-        }
-
-        final boolean vertical = getOrientation() == VERTICAL;
-
-        initChildDimensions(widthSize, heightSize, vertical);
-
-        int width = 0;
-        int height = 0;
-
-        // it's possible to get scrap views in recycler which are bound to old (invalid) adapter entities. This
-        // happens because their invalidation happens after "onMeasure" method. As a workaround let's clear the
-        // recycler now (it should not cause any performance issues while scrolling as "onMeasure" is never
-        // called whiles scrolling)
-        recycler.clear();
-
-        final int stateItemCount = state.getItemCount();
-        final int adapterItemCount = getItemCount();
-        // adapter always contains actual data while state might contain old data (f.e. data before the animation is
-        // done). As we want to measure the view with actual data we must use data from the adapter and not from  the
-        // state
-        for (int i = 0; i < adapterItemCount; i++) {
-            if (vertical) {
-                if (!hasChildSize) {
-                    if (i < stateItemCount) {
-                        // we should not exceed state count, otherwise we'll get IndexOutOfBoundsException. For such items
-                        // we will use previously calculated dimensions
-                        measureChild(recycler, i, widthSpec, unspecified, childDimensions);
-                    } else {
-                        logMeasureWarning(i);
-                    }
-                }
-                height += childDimensions[CHILD_HEIGHT];
-                if (i == 0) {
-                    width = childDimensions[CHILD_WIDTH];
-                }
-            } else {
-                if (!hasChildSize) {
-                    if (i < stateItemCount) {
-                        // we should not exceed state count, otherwise we'll get IndexOutOfBoundsException. For such items
-                        // we will use previously calculated dimensions
-                        measureChild(recycler, i, unspecified, heightSpec, childDimensions);
-                    } else {
-                        logMeasureWarning(i);
-                    }
-                }
-                width += childDimensions[CHILD_WIDTH];
-                if (i == 0) {
-                    height = childDimensions[CHILD_HEIGHT];
-                }
-            }
-        }
-
-        // we really should wrap the contents of the view, let's do it
-
-        if (exactWidth) {
-            width = widthSize;
-        } else {
-            width += getPaddingLeft() + getPaddingRight();
-        }
-
-        if (exactHeight) {
-            height = heightSize;
-        } else {
-            height += getPaddingTop() + getPaddingBottom();
-        }
-
-        setMeasuredDimension(width, height);
-    }
-
-    private void logMeasureWarning(int child) {
-        if (BuildConfig.DEBUG) {
-            Log.w("LinearLayoutManager", "Can't measure child #" + child + ", previously used dimensions will be reused." +
-                    "To remove this message either use #setChildSize() method or don't run RecyclerView animations");
-        }
-    }
-
-    private void initChildDimensions(int width, int height, boolean vertical) {
-        if (childDimensions[CHILD_WIDTH] != 0 || childDimensions[CHILD_HEIGHT] != 0) {
-            // already initialized, skipping
-            return;
-        }
-        if (vertical) {
-            childDimensions[CHILD_WIDTH] = width;
-            childDimensions[CHILD_HEIGHT] = childSize;
-        } else {
-            childDimensions[CHILD_WIDTH] = childSize;
-            childDimensions[CHILD_HEIGHT] = height;
-        }
-    }
-
-    @Override
-    public void setOrientation(int orientation) {
-        // might be called before the constructor of this class is called
-        //noinspection ConstantConditions
-        if (childDimensions != null) {
-            if (getOrientation() != orientation) {
-                childDimensions[CHILD_WIDTH] = 0;
-                childDimensions[CHILD_HEIGHT] = 0;
-            }
-        }
-        super.setOrientation(orientation);
-    }
-
-    public void clearChildSize() {
-        hasChildSize = false;
-        setChildSize(DEFAULT_CHILD_SIZE);
-    }
-
-    public void setChildSize(int childSize) {
-        hasChildSize = true;
-        if (this.childSize != childSize) {
-            this.childSize = childSize;
-            requestLayout();
-        }
-    }
-
-    private void measureChild(RecyclerView.Recycler recycler, int position, int widthSpec, int heightSpec, int[] dimensions) {
-        final View child;
-        try {
-            child = recycler.getViewForPosition(position);
-        } catch (IndexOutOfBoundsException e) {
-            return;
-        }
-
-        final RecyclerView.LayoutParams p = (RecyclerView.LayoutParams) child.getLayoutParams();
-
-        final int hPadding = getPaddingLeft() + getPaddingRight();
-        final int vPadding = getPaddingTop() + getPaddingBottom();
-
-        final int hMargin = p.leftMargin + p.rightMargin;
-        final int vMargin = p.topMargin + p.bottomMargin;
-
-        final int hDecoration = getRightDecorationWidth(child) + getLeftDecorationWidth(child);
-        final int vDecoration = getTopDecorationHeight(child) + getBottomDecorationHeight(child);
-
-        final int childWidthSpec = getChildMeasureSpec(widthSpec, hPadding + hMargin + hDecoration, p.width, canScrollHorizontally());
-        final int childHeightSpec = getChildMeasureSpec(heightSpec, vPadding + vMargin + vDecoration, p.height, canScrollVertically());
-
-        child.measure(childWidthSpec, childHeightSpec);
-
-        dimensions[CHILD_WIDTH] = getDecoratedMeasuredWidth(child) + p.leftMargin + p.rightMargin;
-        dimensions[CHILD_HEIGHT] = getDecoratedMeasuredHeight(child) + p.bottomMargin + p.topMargin;
-
-        recycler.recycleView(child);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 178f7df83..8133d8f76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -1,15 +1,18 @@
 package com.habitrpg.android.habitica.ui.activities
 
+import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.os.Bundle
-import android.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
+import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.HabiticaApplication
 import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.events.ShowConnectionProblemEvent
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.LanguageHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.disposables.CompositeDisposable
@@ -20,6 +23,8 @@ import java.util.*
 
 abstract class BaseActivity : AppCompatActivity() {
 
+    private var currentTheme: String? = null
+    internal var forcedTheme: String? = null
     private var destroyed: Boolean = false
 
     protected abstract fun getLayoutResId(): Int
@@ -42,6 +47,7 @@ abstract class BaseActivity : AppCompatActivity() {
         val configuration = Configuration()
         configuration.setLocale(languageHelper.locale)
         resources.updateConfiguration(configuration, resources.displayMetrics)
+        loadTheme(sharedPreferences)
 
         delegate.setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         super.onCreate(savedInstanceState)
@@ -59,6 +65,7 @@ abstract class BaseActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
         isActivityVisible = true
+        loadTheme(PreferenceManager.getDefaultSharedPreferences(this))
     }
 
     override fun onPause() {
@@ -73,6 +80,33 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onStop()
     }
 
+    private fun loadTheme(sharedPreferences: SharedPreferences) {
+        val theme = if (forcedTheme != null) {
+            forcedTheme
+        } else {
+            sharedPreferences.getString("theme_name", "purple")
+        }
+        if (theme == currentTheme) return
+        setTheme(when (theme) {
+            "maroon" -> R.style.MainAppTheme_Maroon
+            "red" -> R.style.MainAppTheme_Red
+            "orange" -> R.style.MainAppTheme_Orange
+            "yellow" -> R.style.MainAppTheme_Yellow
+            "green" -> R.style.MainAppTheme_Green
+            "teal" -> R.style.MainAppTheme_Teal
+            "blue" -> R.style.MainAppTheme_Blue
+            else -> R.style.MainAppTheme
+        })
+        window.navigationBarColor = getThemeColor(R.attr.colorPrimaryDark)
+        window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
+
+        if (currentTheme != null) {
+            reload()
+        } else {
+            currentTheme = theme
+        }
+    }
+
     protected abstract fun injectActivity(component: UserComponent?)
 
     protected fun setupToolbar(toolbar: Toolbar?) {
@@ -104,7 +138,13 @@ abstract class BaseActivity : AppCompatActivity() {
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(event.title)
         alert.setMessage(event.message)
-        alert.addButton(android.R.string.ok, true, false, null)
-        alert.show()
+        alert.addButton(android.R.string.ok, isPrimary = true, isDestructive = false, function = null)
+        alert.enqueue()
+    }
+
+    fun reload() {
+        finish()
+        overridePendingTransition(R.anim.activity_fade_in, R.anim.activity_fade_out)
+        startActivity(intent)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 38df6bd1e..c6befae3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -10,13 +10,13 @@ import android.view.*
 import android.widget.*
 import androidx.appcompat.widget.AppCompatCheckedTextView
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.content.ContextCompat
 import com.google.android.material.textfield.TextInputLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
@@ -197,7 +197,7 @@ class ChallengeFormActivity : BaseActivity() {
         if (errorMessages.count() > 0) {
             val alert = HabiticaAlertDialog(this)
             alert.setMessage(errorMessages.joinToString("\n"))
-            alert.show()
+            alert.enqueue()
         }
         return errorMessages.size == 0
     }
@@ -209,7 +209,11 @@ class ChallengeFormActivity : BaseActivity() {
         val bundle = intent.extras
 
         challengeTasks = ChallengeTasksRecyclerViewAdapter(null, 0, this, "", null, false, true)
-        compositeSubscription.add(challengeTasks.taskOpenEvents.subscribe { openNewTaskActivity(it.type, it) })
+        compositeSubscription.add(challengeTasks.taskOpenEvents.subscribe {
+            if (it.isValid) {
+                openNewTaskActivity(it.type, it)
+            }
+        })
         locationAdapter = GroupArrayAdapter(this)
 
         if (bundle != null) {
@@ -306,7 +310,7 @@ class ChallengeFormActivity : BaseActivity() {
             supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
 
             supportActionBar.title = ""
-            supportActionBar.setBackgroundDrawable(ColorDrawable(ContextCompat.getColor(this, R.color.brand_200)))
+            supportActionBar.setBackgroundDrawable(ColorDrawable(getThemeColor(R.attr.colorPrimaryOffset)))
             supportActionBar.elevation = 0f
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index d94fcca3f..3544a903f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -20,8 +20,8 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.*
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
@@ -264,7 +264,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         alert.setTitle(getString(R.string.class_changed, className))
         alert.setMessage(getString(R.string.class_changed_description))
         alert.addButton(getString(R.string.complete_tutorial), true)
-        alert.show()
+        alert.enqueue()
     }
 
     private fun optOutOfClasses() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 92bb0f0f5..4c5ac8972 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.*
 import android.widget.*
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
@@ -27,13 +28,13 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.Flowable
 import io.reactivex.functions.Consumer
 import io.realm.RealmResults
@@ -41,6 +42,8 @@ import net.pherth.android.emoji_library.EmojiEditText
 import java.text.SimpleDateFormat
 import java.util.*
 import javax.inject.Inject
+import kotlin.math.floor
+import kotlin.math.min
 
 class FullProfileActivity : BaseActivity() {
     @Inject
@@ -50,6 +53,7 @@ class FullProfileActivity : BaseActivity() {
     @Inject
     lateinit var socialRepository: SocialRepository
 
+    private val toolbar: Toolbar by bindView(R.id.toolbar)
     private val profileImage: SimpleDraweeView by bindView(R.id.profile_image)
     private val blurbTextView: TextView by bindView(R.id.profile_blurb)
     private val avatarView: AvatarView by bindView(R.id.avatarView)
@@ -87,6 +91,7 @@ class FullProfileActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setupToolbar(toolbar)
 
         userID = intent?.extras?.getString("userID", "") ?: ""
         if (userID.isEmpty()) {
@@ -113,9 +118,7 @@ class FullProfileActivity : BaseActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-
-        return when (id) {
+        return when (item.itemId) {
             R.id.private_message -> {
                 showSendMessageToUserDialog()
                 true
@@ -190,7 +193,7 @@ class FullProfileActivity : BaseActivity() {
             val clipboard = view.context
                     .getSystemService(Context.CLIPBOARD_SERVICE) as? android.content.ClipboardManager
             val clip = android.content.ClipData.newPlainText(user.username, user.username)
-            clipboard?.primaryClip = clip
+            clipboard?.setPrimaryClip(clip)
         }
 
         avatarView.setAvatar(user)
@@ -213,8 +216,8 @@ class FullProfileActivity : BaseActivity() {
         petsFoundCount.text = user.petsFoundCount.toString()
         mountsTamedCount.text = user.mountsTamedCount.toString()
 
-        DataBindingUtils.loadImage(this.currentPetDrawee, "Pet-" + user.currentPet)
-        DataBindingUtils.loadImage(this.currentMountDrawee, "Mount_Icon_" + user.currentMount)
+        currentPetDrawee.loadImage("Pet-" + user.currentPet)
+        currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
     }
 
     // endregion
@@ -253,7 +256,7 @@ class FullProfileActivity : BaseActivity() {
     private fun fillAchievements(labelID: Int, achievements: List<Achievement>, targetList: MutableList<Any>) {
         // Order by ID first
         val achievementList = ArrayList(achievements)
-        achievementList.sortWith(Comparator { achievement, t1 -> java.lang.Double.compare(achievement.index.toDouble(), t1.index.toDouble()) })
+        achievementList.sortWith(Comparator { achievement, t1 -> achievement.index.toDouble().compareTo(t1.index.toDouble()) })
 
         targetList.add(getString(labelID))
         targetList.addAll(achievementList)
@@ -266,7 +269,7 @@ class FullProfileActivity : BaseActivity() {
 
     private fun getFloorValueString(`val`: Float, roundDown: Boolean): String {
         return if (roundDown) {
-            Math.floor(`val`.toDouble()).toString()
+            floor(`val`.toDouble()).toString()
         } else {
             if (`val`.toDouble() == 0.0) {
                 "0"
@@ -278,13 +281,13 @@ class FullProfileActivity : BaseActivity() {
 
     private fun getFloorValue(value: Float, roundDown: Boolean): Float {
         return if (roundDown) {
-            Math.floor(value.toDouble()).toFloat()
+            floor(value.toDouble()).toFloat()
         } else {
             value
         }
     }
 
-    private fun addEquipmentRow(table: TableLayout, gearKey: String?, text: String, stats: String) {
+    private fun addEquipmentRow(table: TableLayout, gearKey: String?, text: String?, stats: String?) {
         val gearRow = layoutInflater.inflate(R.layout.profile_gear_tablerow, table, false) as? TableRow
 
         val draweeView = gearRow?.findViewById<SimpleDraweeView>(R.id.gear_drawee)
@@ -303,7 +306,7 @@ class FullProfileActivity : BaseActivity() {
 
         val valueTextView = gearRow?.findViewById<TextView>(R.id.tableRowTextView2)
 
-        if (!stats.isEmpty()) {
+        if (stats?.isNotEmpty() == true) {
             valueTextView?.text = stats
         } else {
             valueTextView?.visibility = View.GONE
@@ -314,7 +317,7 @@ class FullProfileActivity : BaseActivity() {
     }
 
     private fun addLevelAttributes(user: Member) {
-        val byLevelStat = Math.min((user.stats?.lvl ?: 0) / 2.0f, 50f)
+        val byLevelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f)
 
         addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false)
     }
@@ -368,10 +371,10 @@ class FullProfileActivity : BaseActivity() {
         val buffs = stats.buffs
 
         addAttributeRow(getString(R.string.profile_allocated), stats.strength?.toFloat() ?: 0f, stats.intelligence?.toFloat() ?: 0f, stats.constitution?.toFloat() ?: 0f, stats.per?.toFloat() ?: 0f, true, false)
-        addAttributeRow(getString(R.string.buffs), buffs?.getStr() ?: 0f, buffs?.get_int() ?: 0f, buffs?.getCon() ?: 0f, buffs?.getPer() ?: 0f, true, false)
+        addAttributeRow(getString(R.string.buffs), buffs?.getStr() ?: 0f, buffs?.get_int() ?: 0f, buffs?.getCon() ?: 0f, buffs?.getPer() ?: 0f, roundDown = true, isSummary = false)
 
         // Summary row
-        addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, false, true)
+        addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, roundDown = false, isSummary = true)
     }
 
     private fun addAttributeRow(label: String, strVal: Float, intVal: Float, conVal: Float, perVal: Float, roundDown: Boolean, isSummary: Boolean) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
index 8922a54ba..c5603b498 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
@@ -14,21 +14,16 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.user.ABTest
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment
 import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment
 import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.playseeds.android.sdk.Seeds
-import com.playseeds.android.sdk.inappmessaging.InAppMessageListener
-import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import org.solovyev.android.checkout.*
 import java.util.*
 import javax.inject.Inject
 
-class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
+class GemPurchaseActivity : BaseActivity() {
 
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
@@ -62,11 +57,6 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        Seeds.sharedInstance()
-                .simpleInit(this, this, "https://dash.playseeds.com", getString(R.string.seeds_app_key)).isLoggingEnabled = true
-        Seeds.sharedInstance().requestInAppMessage(getString(R.string.seeds_interstitial_gems))
-        Seeds.sharedInstance().requestInAppMessage(getString(R.string.seeds_interstitial_sharing))
-
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
 
@@ -77,20 +67,6 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
         viewPager.currentItem = 0
 
         setViewPagerAdapter()
-
-        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { user ->
-            for (test in user.abTests ?: emptyList<ABTest>()) {
-                if (test.name == "subscriptionPageOrder") {
-                    if (test.group == "subscriptionFirst") {
-                        showSubscriptionPageFirst = true
-                        viewPager.adapter?.notifyDataSetChanged()
-                        return@Consumer
-                    }
-                }
-            }
-            showSubscriptionPageFirst = false
-            viewPager.adapter?.notifyDataSetChanged()
-        }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onStart() {
@@ -160,50 +136,6 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
 
     }
 
-    override fun inAppMessageClicked(messageId: String) {
-        for (fragment in fragments) {
-            if (fragment.javaClass.isAssignableFrom(GemsPurchaseFragment::class.java)) {
-                (fragment as? GemsPurchaseFragment)?.purchaseGems(PurchaseTypes.Purchase84Gems)
-            }
-        }
-    }
-
-    override fun inAppMessageDismissed(messageId: String) {
-
-    }
-
-    override fun inAppMessageLoadSucceeded(messageId: String) {
-
-    }
-
-    override fun inAppMessageShown(messageId: String, succeeded: Boolean) {
-
-    }
-
-    override fun noInAppMessageFound(messageId: String) {
-
-    }
-
-    override fun inAppMessageClickedWithDynamicPrice(messageId: String, price: Double?) {
-
-    }
-
-    fun showSeedsPromo(messageId: String, context: String) {
-        try {
-            runOnUiThread {
-                if (Seeds.sharedInstance().isInAppMessageLoaded(messageId)) {
-                    Seeds.sharedInstance().showInAppMessage(messageId, context)
-                } else {
-                    // Skip the interstitial showing this time and try to reload the interstitial
-                    Seeds.sharedInstance().requestInAppMessage(messageId)
-                }
-            }
-        } catch (e: Exception) {
-            println("Exception: $e")
-        }
-
-    }
-
     private fun setViewPagerAdapter() {
         val fragmentManager = supportFragmentManager
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
index 1cfb87485..17a641765 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
@@ -273,7 +273,7 @@ class GiftIAPActivity: BaseActivity() {
                     dialog.dismiss()
                     finish()
                 }
-        alert.show()
+        alert.enqueue()
     }
 
     private fun consumePurchase(purchase: Purchase) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
index e73b3e440..843b959ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
@@ -110,7 +110,7 @@ class GroupFormActivity : BaseActivity() {
         bundle.putString("name", name)
         bundle.putString("groupType", groupType)
         bundle.putString("description", MarkdownParser.parseCompiled(this.groupDescriptionEditText.text))
-        bundle.putBoolean("leaderCreateChallenge", leaderCreateChallengeSwitch.isActivated)
+        bundle.putBoolean("leaderOnlyChallenges", leaderCreateChallengeSwitch.isChecked)
         bundle.putString("leader", this.groupLeader)
         resultIntent.putExtras(bundle)
         setResult(Activity.RESULT_OK, resultIntent)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
index 78083eaf0..ba3dd1298 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
-import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
@@ -19,18 +18,20 @@ import com.habitrpg.android.habitica.extensions.runDelayed
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.functions.Consumer
+import kotlinx.android.synthetic.main.activity_prefs.*
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Named
 
+
+
 class GroupInviteActivity : BaseActivity() {
 
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
@@ -53,6 +54,7 @@ class GroupInviteActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setupToolbar(toolbar)
         viewPager.currentItem = 0
 
         if (intent.getStringExtra("groupType") == "party") {
@@ -75,25 +77,30 @@ class GroupInviteActivity : BaseActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
 
-        if (id == R.id.action_send_invites) {
-            setResult(Activity.RESULT_OK, createResultIntent())
-            dismissKeyboard()
-            if (!fragments[viewPager.currentItem].values.isEmpty()) {
-                showSnackbar(snackbarView, "Invite Sent!", HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
-                runDelayed(1, TimeUnit.SECONDS, this::finish)
-            } else {
-                finish()
+        return when (item.itemId) {
+            R.id.action_send_invites -> {
+                setResult(Activity.RESULT_OK, createResultIntent())
+                dismissKeyboard()
+                if (!fragments[viewPager.currentItem].values.isEmpty()) {
+                    showSnackbar(snackbarView, "Invite Sent!", HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
+                    runDelayed(1, TimeUnit.SECONDS, this::finish)
+                } else {
+                    finish()
+                }
+                true
             }
-            return true
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
         }
-
-        return super.onOptionsItemSelected(item)
     }
 
     private fun createResultIntent(): Intent {
         val intent = Intent()
+        if (fragments.size == 0) return intent
         val fragment = fragments[viewPager.currentItem]
         if (viewPager.currentItem == 1) {
             intent.putExtra(IS_EMAIL_KEY, true)
@@ -139,23 +146,6 @@ class GroupInviteActivity : BaseActivity() {
         tabLayout.setupWithViewPager(viewPager)
     }
 
-    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        val scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
-
-        if (scanningResult != null && scanningResult.contents != null) {
-            val qrCodeUrl = scanningResult.contents
-            val uri = qrCodeUrl.toUri()
-            if (uri.pathSegments.size < 3) {
-                return
-            }
-            userIdToInvite = uri.pathSegments[2]
-
-            compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer<User> { this.handleUserReceived(it) }, RxErrorHandler.handleEmptyError()))
-        }
-    }
-
     private fun handleUserReceived(user: User) {
         if (this.userIdToInvite == null) {
             return
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
index 736f4f6c8..120587edd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
@@ -5,6 +5,7 @@ import android.webkit.WebView
 import com.commonsware.cwac.anddown.AndDown
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import kotlinx.android.synthetic.main.activity_prefs.*
 import okhttp3.*
 import java.io.BufferedReader
 import java.io.IOException
@@ -21,6 +22,7 @@ class GuidelinesActivity: BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setupToolbar(toolbar)
 
         val client = OkHttpClient()
         val request = Request.Builder().url("https://s3.amazonaws.com/habitica-assets/mobileApp/endpoint/community-guidelines.md").build()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index 22abe5db8..0f3188a09 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -129,7 +129,6 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        FacebookSdk.sdkInitialize(this.applicationContext)
         super.onCreate(savedInstanceState)
             supportActionBar?.hide()
         //Set default values to avoid null-responses when requesting unedited settings
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 033adce5f..3f0746e3c 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.ui.activities
 
 import android.annotation.SuppressLint
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Intent
@@ -9,9 +11,9 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.preference.PreferenceManager
 import android.util.Log
 import android.view.*
 import android.widget.FrameLayout
@@ -35,10 +37,7 @@ import com.habitrpg.android.habitica.api.HostConfig
 import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.*
-import com.habitrpg.android.habitica.events.ShareEvent
-import com.habitrpg.android.habitica.events.ShowCheckinDialog
-import com.habitrpg.android.habitica.events.ShowConnectionProblemEvent
-import com.habitrpg.android.habitica.events.ShowSnackbarEvent
+import com.habitrpg.android.habitica.events.*
 import com.habitrpg.android.habitica.events.commands.FeedCommand
 import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.extensions.dpToPx
@@ -49,6 +48,8 @@ import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase
 import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
 import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
@@ -59,7 +60,6 @@ import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
@@ -67,6 +67,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import com.habitrpg.android.habitica.ui.views.ValueBar
+import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationView
 import com.habitrpg.android.habitica.ui.views.yesterdailies.YesterdailyDialog
@@ -165,10 +166,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         launchTrace = FirebasePerformance.getInstance().newTrace("MainActivityLaunch")
         launchTrace?.start()
 
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        sharedPreferences.edit {
-            this.putInt("theme", R.style.AppTheme_NoActionBar)
-        }
         super.onCreate(savedInstanceState)
 
         if (!HabiticaBaseApplication.checkUserAuthentication(this, hostConfig)) {
@@ -178,7 +175,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         setupToolbar(toolbar)
 
         avatarInHeader = AvatarWithBarsViewModel(this, avatarWithBars, userRepository)
-        sideAvatarView = AvatarView(this, true, false, false)
+        sideAvatarView = AvatarView(this, showBackground = true, showMount = false, showPet = false)
 
         compositeSubscription.add(userRepository.getUser()
                 .subscribe(Consumer { newUser ->
@@ -216,7 +213,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
         val navigationController = findNavController(R.id.nav_host_fragment)
         navigationController.addOnDestinationChangedListener { _, destination, _ ->
-            if (destination.label.isNullOrEmpty()) {
+            if (destination.label.isNullOrEmpty() && user?.isValid == true) {
                 toolbarTitleTextView.text = user?.profile?.name
             } else if (user?.profile != null) {
                 toolbarTitleTextView.text = destination.label
@@ -224,6 +221,31 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             drawerFragment?.setSelection(destination.id, false)
         }
         MainNavigationController.setup(navigationController)
+
+        setupNotifications()
+        setupBottomnavigationLayoutListener()
+    }
+
+    private fun setupNotifications() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channelId = "default"
+            val channel = NotificationChannel(
+                    channelId,
+                    "Habitica Notifications",
+                    NotificationManager.IMPORTANCE_DEFAULT)
+            val manager = getSystemService(NotificationManager::class.java)
+            manager?.createNotificationChannel(channel)
+        }
+    }
+
+    private fun setupBottomnavigationLayoutListener() {
+        bottomNavigation.viewTreeObserver.addOnGlobalLayoutListener {
+            if (bottomNavigation.visibility == View.VISIBLE) {
+                snackbarContainer.setPadding(0, 0, 0, bottomNavigation.barHeight + 12.dpToPx(this))
+            } else {
+                snackbarContainer.setPadding(0, 0, 0, 0)
+            }
+        }
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -277,7 +299,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         }
 
         if (intent.hasExtra("notificationIdentifier")) {
-            val identifier = intent.getStringExtra("notificationIdentifier")
+            val identifier = intent.getStringExtra("notificationIdentifier") ?: ""
             val additionalData = HashMap<String, Any>()
             additionalData["identifier"] = identifier
             AmplitudeManager.sendEvent("open notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -308,8 +330,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         super.startActivity(intent, options)
     }
 
-
-
     private fun updateWidgets() {
         updateWidget(AvatarStatsWidgetProvider::class.java)
         updateWidget(TodoListWidgetProvider::class.java)
@@ -427,7 +447,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                                     EventBus.getDefault().post(event1)
                                     hatchingDialog.dismiss()
                                 }
-                        dialog.show()
+                        dialog.enqueue()
                     }
                 }, RxErrorHandler.handleEmptyError()))
     }
@@ -447,7 +467,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
 
     private fun displayDeathDialogIfNeeded() {
-
         if (user?.stats?.hp ?: 1.0 > 0) {
             return
         }
@@ -475,7 +494,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                         }
                     }
             soundManager.loadAndPlayAudio(SoundManager.SoundDeath)
-            this.faintDialog?.show()
+            this.faintDialog?.enqueue()
         }
     }
 
@@ -569,7 +588,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         sharingIntent.type = "*/*"
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
         val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "share.png", event.shareImage)
-        val fileUri = FileProvider.getUriForFile(this, getString(R.string.content_provider), f)
+        val fileUri = f?.let { FileProvider.getUriForFile(this, getString(R.string.content_provider), it) }
         sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
         val resInfoList = this.packageManager.queryIntentActivities(sharingIntent, PackageManager.MATCH_DEFAULT_ONLY)
         for (resolveInfo in resInfoList) {
@@ -644,7 +663,11 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         youEarnedTexView?.text = youEarnedMessage
 
         val nextUnlockTextView = view.findViewById(R.id.next_unlock_message) as? TextView
-        nextUnlockTextView?.text = event.nextUnlockText
+        if (event.nextUnlockCount > 0) {
+            nextUnlockTextView?.text = event.nextUnlockText
+        } else {
+            nextUnlockTextView?.visibility = View.GONE
+        }
 
         compositeSubscription.add(Completable.complete()
                 .observeOn(AndroidSchedulers.mainThread())
@@ -660,6 +683,20 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                 }, RxErrorHandler.handleEmptyError()))
     }
 
+    @Subscribe
+    fun showAchievementDialog(event: ShowAchievementDialog) {
+        compositeSubscription.add(Completable.complete()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(Action {
+                    val dialog = AchievementDialog(this)
+                    dialog.setType(event.type)
+                    dialog.enqueue()
+                    apiClient.readNotification(event.id)
+                            .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+                }, RxErrorHandler.handleEmptyError()))
+
+    }
+
     override fun onEvent(event: ShowConnectionProblemEvent) {
         if (event.title != null) {
             super.onEvent(event)
@@ -674,6 +711,35 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         }
     }
 
+    fun hatchPet(potion: HatchingPotion, egg: Egg) {
+        compositeSubscription.add(this.inventoryRepository.hatchPet(egg, potion) {
+            val petWrapper = View.inflate(this, R.layout.pet_imageview, null) as? FrameLayout
+            val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView
+
+            DataBindingUtils.loadImage(petImageView, "Pet-" + egg.key + "-" + potion.key)
+            val potionName = potion.text
+            val eggName = egg.text
+            val dialog = HabiticaAlertDialog(this)
+            dialog.setTitle(getString(R.string.hatched_pet_title, potionName, eggName))
+            dialog.setAdditionalContentView(petWrapper)
+            dialog.addButton(R.string.onwards, true) { hatchingDialog, _ -> hatchingDialog.dismiss() }
+            dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
+                val event1 = ShareEvent()
+                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName) + " https://habitica.com/social/hatch-pet"
+                val petImageSideLength = 140
+                val sharedImage = Bitmap.createBitmap(petImageSideLength, petImageSideLength, Bitmap.Config.ARGB_8888)
+                val canvas = Canvas(sharedImage)
+                canvas.drawColor(ContextCompat.getColor(this, R.color.brand_300))
+                petImageView?.drawable?.setBounds(0, 0, petImageSideLength, petImageSideLength)
+                petImageView?.drawable?.draw(canvas)
+                event1.shareImage = sharedImage
+                EventBus.getDefault().post(event1)
+                hatchingDialog.dismiss()
+            }
+            dialog.enqueue()
+        }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+    }
+
     companion object {
         const val SELECT_CLASS_RESULT = 11
         const val GEM_PURCHASE_REQUEST = 111
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 61cc533e5..ad6e9dc39 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.Html
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.*
@@ -150,7 +149,11 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
     private fun createNewStuffNotification(notification: Notification): View? {
         val data = notification.data as? NewStuffData
-        val text = fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + data?.title)
+        val text = if (data?.title != null) {
+            fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + data.title)
+        } else {
+            fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b>")
+        }
 
         return createDismissableNotificationItem(
                 notification,
@@ -318,7 +321,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         } else {
             questObjectiveLabelView?.text = getString(R.string.collect)
             val collectionList = questContent.collect?.map { it.count.toString() + " " + it.text }
-            questObjectiveTextView?.text = TextUtils.join(", ", collectionList)
+            questObjectiveTextView?.text = collectionList?.joinToString(", ")
 
             questDifficultyView?.rating = 1f
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index e9f7bf4d3..f849645f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -20,6 +20,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
@@ -125,7 +126,7 @@ class ReportMessageActivity : BaseActivity() {
     private fun setStatusBarDim(dim: Boolean) {
         if (dim) {
             appBar.elevation = 0f
-            window.statusBarColor = ContextCompat.getColor(this, R.color.brand_50)
+            window.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
             closeButton.visibility = View.GONE
             toolbarTextView.setTypeface(null, Typeface.BOLD)
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index 7d393eb5c..b5cc6a7af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -23,6 +23,7 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
@@ -71,9 +72,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUser(hostConfig.userID)
-                .subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
-
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer { this.onUserReceived(it) }))
+        compositeSubscription.add(userRepository.retrieveUser().subscribeWithErrorHandler(Consumer {}))
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -122,7 +122,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private fun nextClicked() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         sharedPreferences.edit {
-            putString("FirstDayOfTheWeek", Integer.toString(Calendar.getInstance().firstDayOfWeek))
+            putString("FirstDayOfTheWeek", Calendar.getInstance().firstDayOfWeek.toString())
         }
         if (isLastPage) {
             if (this.taskSetupFragment == null) {
@@ -172,9 +172,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
     }
 
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
-
-    }
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
 
     override fun onPageSelected(position: Int) {
         when {
@@ -193,15 +191,17 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
-    override fun onPageScrollStateChanged(state: Int) {
-
-    }
+    override fun onPageScrollStateChanged(state: Int) = Unit
 
     private fun onUserReceived(user: User?) {
         if (completedSetup) {
             if (!compositeSubscription.isDisposed) {
                 compositeSubscription.dispose()
             }
+            val additionalData = HashMap<String, Any>()
+            additionalData["status"] = "completed"
+            AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
+
             this.startMainActivity()
             return
         }
@@ -212,10 +212,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             this.avatarSetupFragment?.setUser(user)
             this.taskSetupFragment?.setUser(user)
         }
-
-        val additionalData = HashMap<String, Any>()
-        additionalData["status"] = "completed"
-        AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
     }
 
     private fun startMainActivity() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
index 24f54a94c..cc693b826 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import io.reactivex.functions.Consumer
+import kotlinx.android.synthetic.main.activity_prefs.*
 import javax.inject.Inject
 
 class SkillMemberActivity : BaseActivity() {
@@ -35,6 +36,7 @@ class SkillMemberActivity : BaseActivity() {
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setupToolbar(toolbar)
         loadMemberList()
     }
 
@@ -46,12 +48,12 @@ class SkillMemberActivity : BaseActivity() {
             resultIntent.putExtra("member_id", userId)
             setResult(Activity.RESULT_OK, resultIntent)
             finish()
-        }, RxErrorHandler.handleEmptyError())
+        }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
         recyclerView.adapter = viewAdapter
 
-        userRepository.getUser()
+        compositeSubscription.add(userRepository.getUser()
                 .firstElement()
                 .flatMap { user -> socialRepository.getGroupMembers(user.party?.id ?: "").firstElement() }
-                .subscribe(Consumer { viewAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe(Consumer { viewAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
index f33ec13c0..c1fe1c077 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
@@ -3,11 +3,11 @@ package com.habitrpg.android.habitica.ui.activities
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import com.google.android.material.tabs.TabLayout
+import android.util.SparseArray
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.viewpager.widget.ViewPager
-import android.util.SparseArray
+import com.google.android.material.tabs.TabLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import io.reactivex.functions.Consumer
+import kotlinx.android.synthetic.main.activity_prefs.*
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -38,6 +39,7 @@ class SkillTasksActivity : BaseActivity() {
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setupToolbar(toolbar)
         loadTaskLists()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 92c6b5d23..8f74022b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -27,6 +27,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.Tag
@@ -112,6 +113,7 @@ class TaskFormActivity : BaseActivity() {
         taskDifficultyButtons.tintColor = value
         habitScoringButtons.tintColor = value
         habitResetStreakButtons.tintColor = value
+        taskSchedulingControls.tintColor = value
         supportActionBar?.setBackgroundDrawable(ColorDrawable(value))
         updateTagViewsColors()
     }
@@ -125,18 +127,33 @@ class TaskFormActivity : BaseActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        val bundle = intent.extras ?: return
+
+        val taskId = bundle.getString(TASK_ID_KEY)
+        forcedTheme = if (taskId != null) {
+            val taskValue = bundle.getDouble(TASK_VALUE_KEY)
+            when {
+                taskValue < -20 -> "maroon"
+                taskValue < -10 -> "red"
+                taskValue < -1 -> "orange"
+                taskValue < 1 -> "yellow"
+                taskValue < 5 -> "green"
+                taskValue < 10 -> "teal"
+                else -> "blue"
+            }
+        } else {
+            "purple"
+        }
+
         super.onCreate(savedInstanceState)
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
-        tintColor = ContextCompat.getColor(this, R.color.brand_300)
-
-        val bundle = intent.extras ?: return
+        tintColor = getThemeColor(R.attr.taskFormTint)
 
         isChallengeTask = bundle.getBoolean(IS_CHALLENGE_TASK, false)
 
         taskType = bundle.getString(TASK_TYPE_KEY) ?: Task.TYPE_HABIT
-        val taskId = bundle.getString(TASK_ID_KEY)
         preselectedTags = bundle.getStringArrayList(SELECTED_TAGS_KEY)
 
         compositeSubscription.add(tagRepository.getTags()
@@ -321,12 +338,12 @@ class TaskFormActivity : BaseActivity() {
             }
             Task.TYPE_DAILY -> {
                 taskSchedulingControls.startDate = task.startDate ?: Date()
-                taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
                 taskSchedulingControls.everyX = task.everyX ?: 1
                 task.repeat?.let { taskSchedulingControls.weeklyRepeat = it }
                 taskSchedulingControls.daysOfMonth = task.getDaysOfMonth()
                 taskSchedulingControls.weeksOfMonth = task.getWeeksOfMonth()
                 habitAdjustPositiveStreakView.setText((task.streak ?: 0).toString())
+                taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
             }
             Task.TYPE_TODO -> taskSchedulingControls.dueDate = task.dueDate
             Task.TYPE_REWARD -> rewardValueFormView.value = task.value
@@ -336,7 +353,7 @@ class TaskFormActivity : BaseActivity() {
             remindersContainer.taskType = taskType
             task.reminders?.let { remindersContainer.reminders = it }
         }
-        task.attribute?.let { setSelectedAttribute(it) }
+        task.attribute?.let { selectedStat = it }
         setAllTagSelections()
     }
 
@@ -377,6 +394,8 @@ class TaskFormActivity : BaseActivity() {
             thisTask = Task()
             thisTask.type = taskType
             thisTask.dateCreated = Date()
+        } else {
+            if (!thisTask.isValid) return
         }
         thisTask.text = textEditText.text.toString()
         thisTask.notes = notesEditText.text.toString()
@@ -388,8 +407,8 @@ class TaskFormActivity : BaseActivity() {
             thisTask.up = habitScoringButtons.isPositive
             thisTask.down = habitScoringButtons.isNegative
             thisTask.frequency = habitResetStreakButtons.selectedResetOption.value
-            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.counterUp = habitAdjustPositiveStreakView.text.toString().toInt()
-            if (habitAdjustNegativeStreakView.text.isNotEmpty()) thisTask.counterDown = habitAdjustNegativeStreakView.text.toString().toInt()
+            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.counterUp = habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
+            if (habitAdjustNegativeStreakView.text.isNotEmpty()) thisTask.counterDown = habitAdjustNegativeStreakView.text.toString().toIntCatchOverflow()
         } else if (taskType == Task.TYPE_DAILY) {
             thisTask.startDate = taskSchedulingControls.startDate
             thisTask.everyX = taskSchedulingControls.everyX
@@ -397,7 +416,7 @@ class TaskFormActivity : BaseActivity() {
             thisTask.repeat = taskSchedulingControls.weeklyRepeat
             thisTask.setDaysOfMonth(taskSchedulingControls.daysOfMonth)
             thisTask.setWeeksOfMonth(taskSchedulingControls.weeksOfMonth)
-            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.streak = habitAdjustPositiveStreakView.text.toString().toInt()
+            if (habitAdjustPositiveStreakView.text.isNotEmpty()) thisTask.streak = habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
         } else if (taskType == Task.TYPE_TODO) {
             thisTask.dueDate = taskSchedulingControls.dueDate
         } else if (taskType == Task.TYPE_REWARD) {
@@ -464,6 +483,7 @@ class TaskFormActivity : BaseActivity() {
     companion object {
         val SELECTED_TAGS_KEY = "selectedTags"
         const val TASK_ID_KEY = "taskId"
+        const val TASK_VALUE_KEY = "taskValue"
         const val USER_ID_KEY = "userId"
         const val TASK_TYPE_KEY = "type"
         const val IS_CHALLENGE_TASK = "isChallengeTask"
@@ -473,4 +493,12 @@ class TaskFormActivity : BaseActivity() {
         // in order to disable the event handler in MainActivity
         const val SET_IGNORE_FLAG = "ignoreFlag"
     }
-}
\ No newline at end of file
+}
+
+private fun String.toIntCatchOverflow(): Int? {
+    return try {
+        toInt()
+    } catch (e: NumberFormatException) {
+        0
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
index 0f465fa74..2f5b21803 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
@@ -86,8 +86,8 @@ class FAQOverviewRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Ada
         }
 
         override fun onClick(v: View) {
-            article?.let {
-                MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(it.position))
+            article?.position?.let {
+                MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(it))
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index f3b087cba..df3fbedc7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -98,6 +98,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
 
         private val titleTextView: TextView? by bindOptionalView(itemView, R.id.titleTextView)
         private val pillView: TextView? by bindOptionalView(itemView, R.id.pillView)
+        private val bubbleView: View? by bindOptionalView(itemView, R.id.bubble_view)
         private val additionalInfoView: TextView? by bindOptionalView(itemView, R.id.additionalInfoView)
 
         fun bind(drawerItem: HabiticaDrawerItem, isSelected: Boolean) {
@@ -141,6 +142,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
                     }
                 }
             }
+            bubbleView?.visibility = if (drawerItem.showBubble) View.VISIBLE else View.GONE
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
index 274a1556b..43912d36d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
@@ -16,8 +16,8 @@ class SimpleSpinnerAdapter(context: Context, resource: Int) : ArrayAdapter<CharS
         return view
     }
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
-        val view = parent?.inflate(android.R.layout.simple_spinner_item, false) ?: View(context)
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        val view = convertView ?: parent.inflate(android.R.layout.simple_spinner_item, false)
         (view as? TextView)?.text = getItem(position)
         return view
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
index ab2d72060..ecebf6cf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
@@ -18,8 +18,8 @@ class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<C
     override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup?): View =
             createView(position, convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item, false))
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View =
-            createView(position, convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item_selected, false))
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View =
+            createView(position, convertView ?: parent.inflate(R.layout.class_spinner_dropdown_item_selected, false))
 
     private fun createView(position: Int, row: View?): View {
         val textView: TextView? = row?.findViewById(R.id.textView)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
index 1fb780f30..e259cc58c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
@@ -89,7 +89,7 @@ class MountDetailRecyclerAdapter(data: OrderedRealmCollection<Mount>?, autoUpdat
         }
 
         override fun onClick(v: View) {
-            if (ownedMount?.owned == false) {
+            if (ownedMount?.owned != true) {
                 return
             }
             val menu = BottomSheetMenu(itemView.context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
index cab6dbe0c..64ecb6bbd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
@@ -60,7 +60,7 @@ class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>()
             this.taskGroup = taskGroup
             this.isChecked = isChecked
 
-            taskGroup?.let {
+            taskGroup.let {
                 textView.text = it[0]
             }
             if (this.isChecked == true) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index 144fc3495..c0300c3e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -35,7 +35,7 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
         data?.get(position)?.let { challenge ->
             holder.bind(challenge, challengeMemberships?.first { challenge.id == it.challengeID } != null)
             holder.itemView.setOnClickListener {
-                if (challenge.isManaged) {
+                if (challenge.isManaged && challenge.isValid) {
                     challenge.id?.let {
                         openChallengeFragmentEvents.onNext(it)
                     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index 092232599..afb4dad1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -1,35 +1,17 @@
 package com.habitrpg.android.habitica.ui.adapter.social
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.Resources
-import android.graphics.drawable.BitmapDrawable
-import android.text.method.LinkMovementMethod
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Flowable
-import io.reactivex.Maybe
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
@@ -63,11 +45,23 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        data?.let {
-            if (it[position].isSystemMessage) {
-                (holder as? SystemChatMessageViewHolder)?.bind(it[position])
+        data?.let { data ->
+            if (data[position].isSystemMessage) {
+                (holder as? SystemChatMessageViewHolder)?.bind(data[position])
             } else {
-                (holder as? ChatRecyclerViewHolder)?.bind(it[position], uuid)
+                val chatHolder = holder as? ChatRecyclerViewHolder ?: return
+                val message = data[position]
+                chatHolder.bind(message,
+                        uuid,
+                        user,
+                        expandedMessageId == message.id)
+                chatHolder.onShouldExpand = { expandMessage(message.id, position) }
+                chatHolder.onLikeMessage = { likeMessageEvents.onNext(it) }
+                chatHolder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+                chatHolder.onReply = { replyMessageEvents.onNext(it) }
+                chatHolder.onCopyMessage = { copyMessageEvents.onNext(it) }
+                chatHolder.onFlagMessage = { flagMessageEvents.onNext(it) }
+                chatHolder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
             }
         }
     }
@@ -100,195 +94,21 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
         return copyMessageEvents.toFlowable(BackpressureStrategy.DROP)
     }
 
-    inner class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val textView: TextView by bindView(R.id.text_view)
-
-        fun bind(chatMessage: ChatMessage?) {
-            textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
-        }
-
-    }
-
-    inner class ChatRecyclerViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : RecyclerView.ViewHolder(itemView) {
-
-        private val messageWrapper: ViewGroup by bindView(R.id.message_wrapper)
-        private val avatarView: AvatarView by bindView(R.id.avatar_view)
-        private val userLabel: UsernameLabel by bindView(R.id.user_label)
-        private val messageText: HabiticaEmojiTextView by bindView(R.id.message_text)
-        private val sublineTextView: TextView by bindView(R.id.subline_textview)
-        private val likeBackground: LinearLayout by bindView(R.id.like_background_layout)
-        private val tvLikes: TextView by bindView(R.id.tvLikes)
-        private val buttonsWrapper: ViewGroup by bindView(R.id.buttons_wrapper)
-        private val replyButton: Button by bindView(R.id.reply_button)
-        private val copyButton: Button by bindView(R.id.copy_button)
-        private val reportButton: Button by bindView(R.id.report_button)
-        private val deleteButton: Button by bindView(R.id.delete_button)
-        private val modView: TextView by bindView(R.id.mod_view)
-
-        val context: Context = itemView.context
-        val res: Resources = itemView.resources
-        private var chatMessage: ChatMessage? = null
-
-        init {
-            itemView.setOnClickListener {
-                expandMessage()
-            }
-            tvLikes.setOnClickListener { chatMessage?.let { likeMessageEvents.onNext(it) } }
-            messageText.setOnClickListener { expandMessage() }
-            messageText.movementMethod = LinkMovementMethod.getInstance()
-            userLabel.setOnClickListener { chatMessage?.uuid?.let {userLabelClickEvents.onNext(it) } }
-            avatarView.setOnClickListener { chatMessage?.uuid?.let {userLabelClickEvents.onNext(it) } }
-            replyButton.setOnClickListener {
-                if (chatMessage?.username != null) {
-                    chatMessage?.username?.let { replyMessageEvents.onNext(it) }
-                } else {
-                    chatMessage?.user?.let { replyMessageEvents.onNext(it) }
-                }
-            }
-            replyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReplyIcon()),
-                    null, null, null)
-            copyButton.setOnClickListener { chatMessage?.let { copyMessageEvents.onNext(it) } }
-            copyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatCopyIcon()),
-                    null, null, null)
-            reportButton.setOnClickListener { chatMessage?.let { flagMessageEvents.onNext(it) } }
-            reportButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReportIcon()),
-                    null, null, null)
-            deleteButton.setOnClickListener { chatMessage?.let { deleteMessageEvents.onNext(it) } }
-            deleteButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatDeleteIcon()),
-                    null, null, null)
-        }
-
-        fun bind(msg: ChatMessage, uuid: String) {
-            chatMessage = msg
-            userId = uuid
-
-            setLikeProperties()
-
-            val wasSent = messageWasSent()
-
-            val name = user?.profile?.name
-            if (wasSent) {
-                userLabel.tier = user?.contributor?.level ?: 0
-                userLabel.username = name
-                if (user?.username != null) {
-                    @SuppressLint("SetTextI18n")
-                    sublineTextView.text = "${user?.formattedUsername} ∙ ${msg.getAgoString(res)}"
-                } else {
-                    sublineTextView.text = msg.getAgoString(res)
-                }
-            } else {
-                userLabel.tier = msg.contributor?.level ?: 0
-                userLabel.username = msg.user
-                if (msg.username != null) {
-                    @SuppressLint("SetTextI18n")
-                    sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.getAgoString(res)}"
-                } else {
-                    sublineTextView.text = msg.getAgoString(res)
-                }
-            }
-            when {
-                userLabel.tier == 8 -> {
-                    modView.visibility = View.VISIBLE
-                    modView.text = context.getString(R.string.moderator)
-                    modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
-                    modView.setScaledPadding(context, 12, 4, 12, 4)
-                }
-                userLabel.tier == 9 -> {
-                    modView.visibility = View.VISIBLE
-                    modView.text = context.getString(R.string.staff)
-                    modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
-                    modView.setScaledPadding(context, 12, 4, 12, 4)
-                }
-                else -> modView.visibility = View.GONE
-            }
-
-            if (wasSent) {
-                avatarView.visibility = View.GONE
-                itemView.setPadding(64.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
-            } else {
-                val displayMetrics = res.displayMetrics
-                val dpWidth = displayMetrics.widthPixels / displayMetrics.density
-                if (dpWidth > 350) {
-                    avatarView.visibility = View.VISIBLE
-                    msg.userStyles?.let {
-                        avatarView.setAvatar(it)
-                    }
-                } else {
-                    avatarView.visibility = View.GONE
-                }
-                itemView.setPadding(16.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
-            }
-
-            messageText.text = chatMessage?.parsedText
-            if (msg.parsedText == null) {
-                messageText.text = chatMessage?.text
-                Maybe.just(chatMessage?.text ?: "")
-                        .map { MarkdownParser.parseMarkdown(it) }
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe({ parsedText ->
-                            chatMessage?.parsedText = parsedText
-                            messageText.text = chatMessage?.parsedText
-                        }, { it.printStackTrace() })
-            }
-
-            val username = user?.formattedUsername
-            messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
-                ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
-            } else {
-                ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg)
-            }
-            messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
-
-            if (expandedMessageId == msg.id) {
-                buttonsWrapper.visibility = View.VISIBLE
-                deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE
-                replyButton.visibility = if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
-            } else {
-                buttonsWrapper.visibility = View.GONE
-            }
-        }
-
-        private fun messageWasSent(): Boolean {
-            return chatMessage?.sent == true || chatMessage?.uuid == userId
-        }
-
-        private fun setLikeProperties() {
-            likeBackground.visibility = if (isTavern) View.VISIBLE else View.INVISIBLE
-            @SuppressLint("SetTextI18n")
-            tvLikes.text = "+" + chatMessage?.likeCount
-
-            val backgroundColorRes: Int
-            val foregroundColorRes: Int
-
-            if (chatMessage?.likeCount != 0) {
-                if (chatMessage?.userLikesMessage(userId) == true) {
-                    backgroundColorRes = R.color.tavern_userliked_background
-                    foregroundColorRes = R.color.tavern_userliked_foreground
-                } else {
-                    backgroundColorRes = R.color.tavern_somelikes_background
-                    foregroundColorRes = R.color.tavern_somelikes_foreground
-                }
-            } else {
-                backgroundColorRes = R.color.tavern_nolikes_background
-                foregroundColorRes = R.color.tavern_nolikes_foreground
-            }
-
-            DataBindingUtils.setRoundedBackground(likeBackground, ContextCompat.getColor(context, backgroundColorRes))
-            tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes))
-        }
-
-        private fun shouldShowDelete(): Boolean {
-            return chatMessage?.isSystemMessage != true && (chatMessage?.uuid == userId || user?.contributor?.admin == true || chatMessage?.isInboxMessage == true)
-        }
-
-        private fun expandMessage() {
-            expandedMessageId = if (expandedMessageId == chatMessage?.id) {
-                null
-            } else {
-                chatMessage?.id
-            }
-            notifyItemChanged(adapterPosition)
+    private fun expandMessage(id: String, position: Int) {
+        expandedMessageId = if (expandedMessageId == id) {
+            null
+        } else {
+            id
         }
+        notifyItemChanged(position)
     }
 }
+
+class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    private val textView: TextView by bindView(R.id.text_view)
+
+    fun bind(chatMessage: ChatMessage?) {
+        textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
+    }
+
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
new file mode 100644
index 000000000..c14967dad
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
@@ -0,0 +1,90 @@
+package com.habitrpg.android.habitica.ui.adapter.social
+
+import android.view.ViewGroup
+import androidx.paging.PagedListAdapter
+import androidx.recyclerview.widget.DiffUtil
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
+import io.reactivex.BackpressureStrategy
+import io.reactivex.Flowable
+import io.reactivex.subjects.PublishSubject
+
+class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
+    private var expandedMessageId: String? = null
+
+    private val likeMessageEvents = PublishSubject.create<ChatMessage>()
+    private val userLabelClickEvents = PublishSubject.create<String>()
+    private val deleteMessageEvents = PublishSubject.create<ChatMessage>()
+    private val flagMessageEvents = PublishSubject.create<ChatMessage>()
+    private val replyMessageEvents = PublishSubject.create<String>()
+    private val copyMessageEvents = PublishSubject.create<ChatMessage>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
+        return ChatRecyclerViewHolder(parent.inflate(R.layout.tavern_chat_item), user?.id ?: "", false)
+    }
+
+    override fun onBindViewHolder(holder: ChatRecyclerViewHolder, position: Int) {
+        val message = getItem(position) ?: return
+
+        holder.bind(message,
+                user?.id ?: "",
+                user,
+                expandedMessageId == message.id)
+        holder.onShouldExpand = { expandMessage(message.id, position) }
+        holder.onLikeMessage = { likeMessageEvents.onNext(it) }
+        holder.onOpenProfile = { userLabelClickEvents.onNext(it) }
+        holder.onReply = { replyMessageEvents.onNext(it) }
+        holder.onCopyMessage = { copyMessageEvents.onNext(it) }
+        holder.onFlagMessage = { flagMessageEvents.onNext(it) }
+        holder.onDeleteMessage = { deleteMessageEvents.onNext(it) }
+    }
+
+    fun getLikeMessageFlowable(): Flowable<ChatMessage> {
+        return likeMessageEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getUserLabelClickFlowable(): Flowable<String> {
+        return userLabelClickEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getFlagMessageClickFlowable(): Flowable<ChatMessage> {
+        return flagMessageEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getDeleteMessageFlowable(): Flowable<ChatMessage> {
+        return deleteMessageEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getReplyMessageEvents(): Flowable<String> {
+        return replyMessageEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getCopyMessageFlowable(): Flowable<ChatMessage> {
+        return copyMessageEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    private fun expandMessage(id: String, position: Int) {
+        expandedMessageId = if (expandedMessageId == id) {
+            null
+        } else {
+            id
+        }
+        notifyItemChanged(position)
+    }
+
+    companion object {
+        private val DIFF_CALLBACK = object :
+                DiffUtil.ItemCallback<ChatMessage>() {
+            // Concert details may have changed if reloaded from the database,
+            // but ID is fixed.
+            override fun areItemsTheSame(oldConcert: ChatMessage,
+                                         newConcert: ChatMessage) = oldConcert.id == newConcert.id
+
+            override fun areContentsTheSame(oldConcert: ChatMessage,
+                                            newConcert: ChatMessage) = oldConcert == newConcert
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
index 071b60621..8135ac277 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
@@ -23,7 +23,7 @@ class PartyMemberRecyclerViewAdapter(data: OrderedRealmCollection<Member>?, auto
 
     override fun onBindViewHolder(holder: GroupMemberViewHolder, position: Int) {
         data?.let {
-            holder.bind(it[position], leaderID)
+            holder.bind(it[position], leaderID, null)
             holder.onClickEvent = {
                 userClickedEvents.onNext(it[position].id ?: "")
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
index 9e316eef2..8f5d43b81 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
@@ -42,7 +42,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
             val guild = v.tag as? Group ?: return@setOnClickListener
             val isMember = this.memberGuildIDs.contains(guild.id)
             if (isMember) {
-                this@PublicGuildsRecyclerViewAdapter.socialRepository?.leaveGroup(guild.id)
+                this@PublicGuildsRecyclerViewAdapter.socialRepository?.leaveGroup(guild.id, true)
                         ?.subscribe(Consumer {
                             if (data != null) {
                                 val indexOfGroup = data?.indexOf(guild)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
index d6ccf0052..b9cf62730 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
@@ -25,7 +25,7 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay
     val taskList: MutableList<Task>
         get() = content?.map { t -> t }?.toMutableList() ?: mutableListOf()
 
-    protected var taskOpenEventsSubject = PublishSubject.create<Task>()
+    private var taskOpenEventsSubject = PublishSubject.create<Task>()
     val taskOpenEvents: Flowable<Task> = taskOpenEventsSubject.toFlowable(BackpressureStrategy.LATEST)
 
     override fun injectThis(component: UserComponent) {
@@ -116,9 +116,9 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay
             addBtn.setOnClickListener { newTask?.let { callback.onNext(it) } }
         }
 
-        override fun bind(newTask: Task, position: Int) {
-            this.newTask = newTask
-            addBtn.text = newTask.text
+        override fun bind(data: Task, position: Int) {
+            this.newTask = data
+            addBtn.text = data.text
         }
     }
 
@@ -126,8 +126,8 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay
 
         private val dividerName: TextView = itemView.findViewById(R.id.divider_name)
 
-        override fun bind(newTask: Task, position: Int) {
-            dividerName.text = newTask.text
+        override fun bind(data: Task, position: Int) {
+            dividerName.text = data.text
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index 54eeedd1d..f91fe1375 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -98,7 +98,9 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(privat
 
         if (taskFilterHelper != null) {
             val query = taskFilterHelper.createQuery(unfilteredData)
-            updateData(query.sort("position").findAll())
+            if (query != null) {
+                updateData(query.sort("position").findAll())
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index 8682c7d4a..02ab01857 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -25,16 +25,24 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
     override val errorButtonEvents = errorButtonEventsSubject.toFlowable(BackpressureStrategy.DROP)
     private var taskScoreEventsSubject = PublishSubject.create<Pair<Task, TaskDirection>>()
     override val taskScoreEvents: Flowable<Pair<Task, TaskDirection>> = taskScoreEventsSubject.toFlowable(BackpressureStrategy.LATEST)
-    protected var checklistItemScoreSubject = PublishSubject.create<Pair<Task, ChecklistItem>>()
+    private var checklistItemScoreSubject = PublishSubject.create<Pair<Task, ChecklistItem>>()
     override val checklistItemScoreEvents: Flowable<Pair<Task, ChecklistItem>> = checklistItemScoreSubject.toFlowable(BackpressureStrategy.DROP)
-    protected var taskOpenEventsSubject = PublishSubject.create<Task>()
+    private var taskOpenEventsSubject = PublishSubject.create<Task>()
     override val taskOpenEvents: Flowable<Task> = taskOpenEventsSubject.toFlowable(BackpressureStrategy.LATEST)
+    private var purchaseCardSubject = PublishSubject.create<ShopItem>()
+    val purchaseCardEvents: Flowable<ShopItem> = purchaseCardSubject.toFlowable(BackpressureStrategy.LATEST)
 
     private val inAppRewardCount: Int
-        get() = inAppRewards?.size ?: 0
+        get() {
+            if (inAppRewards?.isValid != true) return 0
+            return inAppRewards?.size ?: 0
+        }
 
     private val customRewardCount: Int
-        get() = customRewards?.size ?: 0
+        get() {
+            if (customRewards?.isValid != true) return 0
+            return customRewards?.size ?: 0
+        }
 
     override var ignoreUpdates: Boolean
         get() = false
@@ -50,7 +58,11 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
                 task -> taskOpenEventsSubject.onNext(task)
             }
         } else {
-            ShopItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_shopitem, parent, false))
+            val viewHolder = ShopItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_shopitem, parent, false))
+            viewHolder.purchaseCardAction = {
+                purchaseCardSubject.onNext(it)
+            }
+            viewHolder
         }
     }
 
@@ -87,8 +99,8 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
         return rewardCount
     }
 
-    override fun updateData(data: OrderedRealmCollection<Task>?) {
-        this.customRewards = data
+    override fun updateData(tasks: OrderedRealmCollection<Task>?) {
+        this.customRewards = tasks
         notifyDataSetChanged()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index 0891878bd..47cb45422 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -29,7 +29,6 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
 
     private var menuID: Int = 0
     private lateinit var adapter: AchievementsAdapter
-    private val layoutManager = GridLayoutManager(activity, 2)
     private var useGridLayout = false
     set(value) {
         field = value
@@ -69,6 +68,7 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
 
         resetViews()
 
+        val layoutManager = GridLayoutManager(activity, 2)
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
         adapter.useGridLayout = useGridLayout
@@ -118,15 +118,15 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
                 }))
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         if (useGridLayout) {
-            val menuItem = menu?.add(R.string.switch_to_list_view)
+            val menuItem = menu.add(R.string.switch_to_list_view)
             menuID = menuItem?.itemId ?: 0
             menuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             menuItem?.setIcon(R.drawable.ic_round_view_list_24px)
 
         } else {
-            val menuItem = menu?.add(R.string.switch_to_grid_view)
+            val menuItem = menu.add(R.string.switch_to_grid_view)
             menuID = menuItem?.itemId ?: 0
             menuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             menuItem?.setIcon(R.drawable.ic_round_view_module_24px)
@@ -134,8 +134,8 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList
         super.onCreateOptionsMenu(menu, inflater)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        if (item?.itemId == menuID) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == menuID) {
             useGridLayout = !useGridLayout
             activity?.invalidateOptionsMenu()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index 01c19915c..bb3121e0e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -9,7 +9,6 @@ import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayout
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.user.User
@@ -31,7 +30,6 @@ abstract class BaseMainFragment : BaseFragment() {
     val collapsingToolbar get() = activity?.toolbar
     val toolbarAccessoryContainer get() = activity?.toolbarAccessoryContainer
     val bottomNavigation get() = activity?.bottomNavigation
-    val floatingMenuWrapper get() = activity?.snackbarContainer
     var usesTabLayout: Boolean = false
     var hidesToolbar: Boolean = false
     var usesBottomNavigation = false
@@ -45,27 +43,17 @@ abstract class BaseMainFragment : BaseFragment() {
         }
     }
 
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        if (savedInstanceState != null && savedInstanceState.containsKey("userId")) {
-            val userId = savedInstanceState.getString("userId")
-            if (userId != null) {
-                compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer { habitRPGUser -> user = habitRPGUser }, RxErrorHandler.handleEmptyError()))
-            }
-        }
+        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { user = it }, RxErrorHandler.handleEmptyError()))
 
         if (this.usesBottomNavigation) {
             bottomNavigation?.visibility = View.VISIBLE
-            activity?.snackbarContainer?.setScaledPadding(context, 0, 0, 0, 68)
         } else {
             bottomNavigation?.visibility = View.GONE
-            activity?.snackbarContainer?.setScaledPadding(context, 0, 0, 0, 0)
         }
 
-        floatingMenuWrapper?.removeAllViews()
-
         setHasOptionsMenu(true)
 
         updateTabLayoutVisibility()
@@ -96,14 +84,6 @@ abstract class BaseMainFragment : BaseFragment() {
         super.onDestroy()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        if (user?.isValid == true) {
-            outState.putString("userId", user?.id)
-        }
-
-        super.onSaveInstanceState(outState)
-    }
-
     private fun hideToolbar() {
         activity?.avatarWithBars?.visibility = View.GONE
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt
index 1aa0121d2..d872c7aca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt
@@ -56,8 +56,6 @@ class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
         val heartDrawable = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHeartLarge())
         supportTextView?.setCompoundDrawables(null, heartDrawable, null, null)
-
-        gems84View?.seedsImageButton?.setOnClickListener { (this.activity as? GemPurchaseActivity)?.showSeedsPromo(getString(R.string.seeds_interstitial_gems), "store") }
     }
 
     override fun setupCheckout() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index b391f0522..91b2687fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -228,6 +228,9 @@ class NavigationDrawerFragment : DialogFragment() {
             }
             updateItem(statsItem)
         }
+        getItemWithIdentifier(SIDEBAR_NEWS)?.let {
+            it.showBubble = user.flags?.newStuff ?: false
+        }
     }
 
     override fun onDestroy() {
@@ -315,11 +318,7 @@ class NavigationDrawerFragment : DialogFragment() {
         }))
         subscriptions?.add(viewModel.getHasPartyNotification().subscribeWithErrorHandler(Consumer {
             val partyMenuItem = getItemWithIdentifier(SIDEBAR_PARTY)
-            if (it) {
-                partyMenuItem?.additionalInfo = ""
-            } else {
-                partyMenuItem?.additionalInfo = null
-            }
+            partyMenuItem?.showBubble = it
         }))
     }
 
@@ -379,10 +378,14 @@ class NavigationDrawerFragment : DialogFragment() {
 
     private fun setNotificationsSeen(allSeen: Boolean) {
         context?.let {
-            val colorId = if (allSeen) R.color.gray_200 else R.color.brand_400
+            val color = if (allSeen) {
+                ContextCompat.getColor(it, R.color.gray_200)
+            } else {
+                it.getThemeColor(R.attr.colorAccent)
+            }
 
             val bg = notificationsBadge.background as? GradientDrawable
-            bg?.color = ColorStateList.valueOf(ContextCompat.getColor(it, colorId))
+            bg?.color = ColorStateList.valueOf(color)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
index 9c5b4c249..0cf5b635a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
@@ -1,15 +1,17 @@
 package com.habitrpg.android.habitica.ui.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.ConsoleMessage
 import android.webkit.WebChromeClient
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_news.*
 
 
@@ -21,6 +23,7 @@ class NewsFragment : BaseMainFragment() {
         return container?.inflate(R.layout.fragment_news)
     }
 
+    @SuppressLint("SetJavaScriptEnabled")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val address = if (BuildConfig.DEBUG) BuildConfig.BASE_URL else context?.getString(R.string.base_url)
@@ -36,5 +39,8 @@ class NewsFragment : BaseMainFragment() {
         component.inject(this)
     }
 
-
+    override fun onResume() {
+        super.onResume()
+        compositeSubscription.add(userRepository.updateUser(user, "flags.newStuff", false).subscribeWithErrorHandler(Consumer {}))
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 29798255c..4dad9611c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -25,6 +26,7 @@ import kotlinx.android.synthetic.main.fragment_stats.*
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
+import kotlin.math.min
 
 
 class StatsFragment: BaseMainFragment() {
@@ -77,7 +79,7 @@ class StatsFragment: BaseMainFragment() {
         leftSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
         rightSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
         context?.let {
-            val color = ContextCompat.getColor(it, R.color.brand_200)
+            val color = it.getThemeColor(R.attr.colorPrimaryOffset)
             distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
             distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
             distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
@@ -198,7 +200,7 @@ class StatsFragment: BaseMainFragment() {
     }
 
     private fun updateStats(currentUser: User) {
-        val levelStat = Math.min((currentUser.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
+        val levelStat = min((currentUser.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
 
         totalStrength = levelStat
         totalIntelligence = levelStat
@@ -245,7 +247,7 @@ class StatsFragment: BaseMainFragment() {
                 .retry(1)
                 .subscribe(Consumer {
             val userStatComputer = UserStatComputer()
-            val statsRows = userStatComputer.computeClassBonus(it, user)
+            val statsRows = user?.let { it1 -> userStatComputer.computeClassBonus(it, it1) } ?: return@Consumer
 
             var strength = 0
             var intelligence = 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
index 5e8430a11..273351486 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
@@ -61,7 +61,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     private val subscribeListItem3Description: TextView? by bindView(R.id.subscribe_listitem3_description)
     private val subscribeListItem4Description: TextView? by bindView(R.id.subscribe_listitem4_description)
 
-    private val loadingIndicator: ProgressBar? by bindView(R.id.loadingIndicator)
+    private val loadingIndicator: ProgressBar? by bindOptionalView(R.id.loadingIndicator)
     private val subscriptionOptions: View? by bindView(R.id.subscriptionOptions)
 
     private val subscription1MonthView: SubscriptionOptionView? by bindView(R.id.subscription1month)
@@ -286,7 +286,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
                         }
                         startActivity(intent)
                     }
-            alert.addCancelButton() { dialog, _ ->
+            alert.addCancelButton { _, _ ->
                         thisActivity.dismissKeyboard()
                     }
             alert.setAdditionalContentView(chooseRecipientDialogView)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index a207c947a..02296b1e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -81,19 +81,17 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         }
 
         setGridSpanCount(view.width)
-        if (recyclerView.layoutManager == null) {
-            layoutManager = GridLayoutManager(activity, 2)
-            layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-                override fun getSpanSize(position: Int): Int {
-                    return if (adapter.getItemViewType(position) == 0) {
-                        layoutManager.spanCount
-                    } else {
-                        1
-                    }
+        val layoutManager = GridLayoutManager(activity, 2)
+        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+            override fun getSpanSize(position: Int): Int {
+                return if (adapter.getItemViewType(position) == 0) {
+                    layoutManager.spanCount
+                } else {
+                    1
                 }
             }
-            recyclerView.layoutManager = layoutManager
         }
+        recyclerView.layoutManager = layoutManager
         recyclerView.addItemDecoration(MarginDecoration(context))
 
         recyclerView.adapter = adapter
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 4b52233b6..c5d7bd18d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -94,7 +94,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
     override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
         val newSize: String = if (position == 0) "slim" else "broad"
 
-        if (this.user != null && this.user?.preferences?.size != newSize) {
+        if (this.user?.isValid == true && this.user?.preferences?.size != newSize) {
             compositeSubscription.add(userRepository.updateUser(user, "preferences.size", newSize)
                     .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
index 473974ffb..98340420f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
@@ -48,8 +48,10 @@ class EquipmentOverviewFragment : BaseMainFragment() {
         costumeWeaponView.setOnClickListener { displayEquipmentDetailList("weapon", user?.items?.gear?.costume?.weapon, true) }
         costumeShieldView.setOnClickListener { displayEquipmentDetailList("shield", user?.items?.gear?.costume?.shield, true) }
 
+        autoEquipSwitch.isChecked = user?.preferences?.autoEquip ?: false
         costumeSwitch.isChecked = user?.preferences?.costume ?: false
 
+        autoEquipSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.autoEquip", isChecked).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
         costumeSwitch.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.costume", isChecked).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
 
         setImageNames()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 55517d23d..135f78ece 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -1,34 +1,30 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.items
 
-import android.graphics.Bitmap
-import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.widget.Button
-import android.widget.FrameLayout
 import android.widget.TextView
-import androidx.core.content.ContextCompat
-import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.events.ShareEvent
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.*
 import com.habitrpg.android.habitica.models.user.OwnedPet
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.*
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.functions.Consumer
-import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
 class ItemRecyclerFragment : BaseFragment() {
@@ -39,17 +35,17 @@ class ItemRecyclerFragment : BaseFragment() {
     lateinit var userRepository: UserRepository
     val recyclerView: RecyclerViewEmptySupport? by bindView(R.id.recyclerView)
     val emptyView: View? by bindView(R.id.emptyView)
-    val emptyTextView: TextView? by bindView(R.id.empty_text_view)
+    private val emptyTextView: TextView? by bindView(R.id.empty_text_view)
     val titleView: TextView? by bindView(R.id.titleTextView)
-    val footerView: TextView? by bindView(R.id.footerTextView)
-    val openMarketButton: Button? by bindView(R.id.openMarketButton)
-    val openEmptyMarketButton: Button? by bindView(R.id.openEmptyMarketButton)
+    private val footerView: TextView? by bindView(R.id.footerTextView)
+    private val openMarketButton: Button? by bindView(R.id.openMarketButton)
+    private val openEmptyMarketButton: Button? by bindView(R.id.openEmptyMarketButton)
     var adapter: ItemRecyclerAdapter? = null
     var itemType: String? = null
     var itemTypeText: String? = null
     var isHatching: Boolean = false
     var isFeeding: Boolean = false
-    var hatchingItem: Item? = null
+    private var hatchingItem: Item? = null
     var feedingPet: Pet? = null
     var user: User? = null
     internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null
@@ -78,13 +74,9 @@ class ItemRecyclerFragment : BaseFragment() {
 
         val context = activity
 
-        layoutManager = recyclerView?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager
+        layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
 
-        if (layoutManager == null) {
-            layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-
-            recyclerView?.layoutManager = layoutManager
-        }
+        recyclerView?.layoutManager = layoutManager
 
         adapter = recyclerView?.adapter as? ItemRecyclerAdapter
         if (adapter == null) {
@@ -111,6 +103,14 @@ class ItemRecyclerFragment : BaseFragment() {
                         .subscribe(Consumer { MainNavigationController.navigate(R.id.partyFragment) }, RxErrorHandler.handleEmptyError()))
                 compositeSubscription.add(adapter.getOpenMysteryItemFlowable()
                         .flatMap { inventoryRepository.openMysteryItem(user) }
+                        .doOnNext {
+                            val activity = activity as? MainActivity
+                            if (activity != null) {
+                                DataBindingUtils.loadImage("shop_${it.key}") {image ->
+                                    showSnackbar(activity.snackbarContainer, BitmapDrawable(context?.resources, image), null, getString(R.string.mystery_item_received, it.text), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+                                }
+                            }
+                        }
                         .flatMap { userRepository.retrieveUser(false) }
                         .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
                 compositeSubscription.add(adapter.startHatchingEvents.subscribeWithErrorHandler(Consumer { showHatchingDialog(it) }))
@@ -171,7 +171,7 @@ class ItemRecyclerFragment : BaseFragment() {
         }
         fragment.isHatching = true
         fragment.isFeeding = false
-        fragment.show(fragmentManager, "hatchingDialog")
+        fragmentManager?.let { fragment.show(it, "hatchingDialog") }
     }
 
     override fun onResume() {
@@ -191,33 +191,8 @@ class ItemRecyclerFragment : BaseFragment() {
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
-        compositeSubscription.add(this.inventoryRepository.hatchPet(egg, potion) {
-            dismiss()
-            val petWrapper = View.inflate(context, R.layout.pet_imageview, null) as? FrameLayout
-            val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView
-
-            DataBindingUtils.loadImage(petImageView, "Pet-" + egg.key + "-" + potion.key)
-            val potionName = potion.text
-            val eggName = egg.text
-            val dialog = context?.let { HabiticaAlertDialog(it) }
-            dialog?.setTitle(getString(R.string.hatched_pet_title, potionName, eggName))
-            dialog?.setAdditionalContentView(petWrapper)
-            dialog?.addButton(R.string.onwards, true) { hatchingDialog, _ -> hatchingDialog.dismiss() }
-            dialog?.addButton(R.string.share, false) { hatchingDialog, _ ->
-                val event1 = ShareEvent()
-                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName) + " https://habitica.com/social/hatch-pet"
-                val petImageSideLength = 140
-                val sharedImage = Bitmap.createBitmap(petImageSideLength, petImageSideLength, Bitmap.Config.ARGB_8888)
-                val canvas = Canvas(sharedImage)
-                context?.let { canvas.drawColor(ContextCompat.getColor(it, R.color.brand_300)) }
-                petImageView?.drawable?.setBounds(0, 0, petImageSideLength, petImageSideLength)
-                petImageView?.drawable?.draw(canvas)
-                event1.shareImage = sharedImage
-                EventBus.getDefault().post(event1)
-                hatchingDialog.dismiss()
-            }
-            dialog?.show()
-        }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        dismiss()
+        (activity as? MainActivity)?.hatchPet(potion, egg)
     }
 
     private fun loadItems() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 23c628c0c..22919645c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -155,14 +155,14 @@ class ShopFragment : BaseFragment() {
         compositeSubscription.add(this.inventoryRepository.getOwnedItems()
                 .subscribe(Consumer { adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(this.inventoryRepository.getInAppRewards()
-                .map<List<String>> { rewards -> rewards.map { it.key } }
+                .map { rewards -> rewards.map { it.key } }
                 .subscribe(Consumer { adapter?.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun formatTimeTravelersShop(shop: Shop): Shop {
         val newCategories = mutableListOf<ShopCategory>()
         for (category in shop.categories) {
-             if (category.identifier == "pets" || category.identifier == "mounts") {
+             if (category.pinType != "mystery_set") {
                  newCategories.add(category)
              } else {
                  val newCategory = newCategories.find { it.identifier == "mystery_sets" } ?: ShopCategory()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt
index d72eefe9f..4f2e1dbd5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/APIPreferenceFragment.kt
@@ -9,7 +9,6 @@ import androidx.preference.Preference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.HostConfig
-import java.util.*
 import javax.inject.Inject
 
 class APIPreferenceFragment: BasePreferencesFragment() {
@@ -17,7 +16,7 @@ class APIPreferenceFragment: BasePreferencesFragment() {
     lateinit var hostConfig: HostConfig
 
     private val apiPreferences: List<String>
-        get() = Arrays.asList(getString(R.string.SP_APIToken), getString(R.string.SP_userID))
+        get() = listOf(getString(R.string.SP_APIToken), getString(R.string.SP_userID))
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -27,11 +26,11 @@ class APIPreferenceFragment: BasePreferencesFragment() {
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        if (preference.key == getString(R.string.SP_APIToken)) {
-            clipMan?.primaryClip = ClipData.newPlainText(preference.key, hostConfig.apiKey)
+        clipMan?.setPrimaryClip(if (preference.key == getString(R.string.SP_APIToken)) {
+            ClipData.newPlainText(preference.key, hostConfig.apiKey)
         } else {
-            clipMan?.primaryClip = ClipData.newPlainText(preference.key, preference.summary)
-        }
+            ClipData.newPlainText(preference.key, preference.summary)
+        })
         Toast.makeText(activity, "Copied " + preference.key + " to clipboard.", Toast.LENGTH_SHORT).show()
         return super.onPreferenceTreeClick(preference)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
index 88d38862d..6b6fc4468 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
@@ -84,10 +84,10 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             }
             "reset_account" -> showAccountResetConfirmation()
             "delete_account" -> showAccountDeleteConfirmation()
-            "add_local_auth" -> showAddLocalNotificationDialog()
+            "add_local_auth" -> showAddLocalAuthDialog()
             else -> {
                 val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-                clipMan?.primaryClip = ClipData.newPlainText(preference.key, preference.summary)
+                clipMan?.setPrimaryClip(ClipData.newPlainText(preference.key, preference.summary))
                 Toast.makeText(activity, "Copied " + preference.key + " to clipboard.", Toast.LENGTH_SHORT).show()
             }
         }
@@ -186,10 +186,10 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         }
     }
 
-    private fun showAddLocalNotificationDialog() {
+    private fun showAddLocalAuthDialog() {
         val inflater = context?.layoutInflater
         val view = inflater?.inflate(R.layout.dialog_edittext_add_local_auth, null)
-        val emailEditText = view?.findViewById<EditText>(R.id.editText)
+        val emailEditText = view?.findViewById<EditText>(R.id.emailTitleTextView)
         val passwordEditText = view?.findViewById<EditText>(R.id.passwordEditText)
         val passwordRepeatEditText = view?.findViewById<EditText>(R.id.passwordRepeatEditText)
         context?.let { context ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
index b10261f38..bb0a6ac80 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
@@ -4,12 +4,12 @@ package com.habitrpg.android.habitica.ui.fragments.preferences
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import androidx.preference.PreferenceDialogFragmentCompat
-import androidx.preference.PreferenceFragmentCompat
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.TimePicker
+import androidx.preference.PreferenceDialogFragmentCompat
+import androidx.preference.PreferenceFragmentCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.prefs.TimePreference
 import java.text.DateFormat
@@ -55,7 +55,7 @@ class DayStartPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
 
     private fun updateDescriptionText(hour: Int) {
         val date = GregorianCalendar()
-        if (date.get(Calendar.HOUR) < hour) {
+        if (date.get(Calendar.HOUR) >= hour) {
             date.set(Calendar.DAY_OF_MONTH, date.get(Calendar.DAY_OF_MONTH) + 1)
         }
         date.set(Calendar.HOUR_OF_DAY, hour)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index 58b34d012..634185767 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -11,6 +11,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceScreen
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
@@ -23,6 +24,7 @@ import com.habitrpg.android.habitica.prefs.TimePreference
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.activities.PrefsActivity
 import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
@@ -68,6 +70,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         serverUrlPreference = findPreference("server_url") as? ListPreference
         serverUrlPreference?.isVisible = false
         serverUrlPreference?.summary = preferenceManager.sharedPreferences.getString("server_url", "")
+        val themePreference = findPreference("theme_name") as? ListPreference
+        themePreference?.isVisible = configManager.testingLevel() == AppTestingLevel.ALPHA || BuildConfig.DEBUG
+        themePreference?.summary = themePreference?.entry
     }
 
     override fun onResume() {
@@ -177,7 +182,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 }
                 @Suppress("DEPRECATION")
                 activity?.resources?.updateConfiguration(configuration, activity?.resources?.displayMetrics)
-                userRepository.updateLanguage(user, languageHelper.languageCode)
+                userRepository.updateLanguage(user, languageHelper.languageCode ?: "en")
                         .flatMap<ContentResult> { contentRepository.retrieveContent(context,true) }
                         .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
 
@@ -200,6 +205,10 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                     soundManager.preloadAllFiles()
                 }
             }
+            "theme_name" -> {
+                val activity = activity as? PrefsActivity ?: return
+                activity.reload()
+            }
             "dailyDueDefaultView" -> userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
                     .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
             "server_url" -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index f88903525..ed3a75a9d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.setup
 
-import android.os.Build
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -56,7 +55,6 @@ class AvatarSetupFragment : BaseFragment() {
     private val randomizeButton: Button? by bindOptionalView(R.id.randomize_button)
 
     internal var adapter: CustomizationSetupAdapter? = null
-    internal var layoutManager: LinearLayoutManager = LinearLayoutManager(activity)
 
     private var user: User? = null
     private var subcategories: List<String> = emptyList()
@@ -81,9 +79,9 @@ class AvatarSetupFragment : BaseFragment() {
         adapter?.equipGearEvents?.flatMap { inventoryRepository.equip(user, "equipped", it) }?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
 
         this.adapter?.user = this.user
-        this.layoutManager = LinearLayoutManager(activity)
-        this.layoutManager.orientation = LinearLayoutManager.HORIZONTAL
-        this.customizationList?.layoutManager = this.layoutManager
+        val layoutManager = LinearLayoutManager(activity)
+        layoutManager.orientation = LinearLayoutManager.HORIZONTAL
+        this.customizationList?.layoutManager = layoutManager
 
         this.customizationList?.adapter = this.adapter
 
@@ -96,13 +94,9 @@ class AvatarSetupFragment : BaseFragment() {
                 loadCustomizations()
             }
 
-            override fun onTabUnselected(tab: TabLayout.Tab) {
+            override fun onTabUnselected(tab: TabLayout.Tab) {}
 
-            }
-
-            override fun onTabReselected(tab: TabLayout.Tab) {
-
-            }
+            override fun onTabReselected(tab: TabLayout.Tab) {}
         })
 
         bodyButton?.setOnClickListener { selectedBodyCategory() }
@@ -153,12 +147,11 @@ class AvatarSetupFragment : BaseFragment() {
         }
     }
 
-
     private fun selectedBodyCategory() {
         activateButton(bodyButton)
         this.activeCategory = "body"
         this.subCategoryTabs?.removeAllTabs()
-        this.subcategories = Arrays.asList("size", "shirt")
+        this.subcategories = listOf("size", "shirt")
         subCategoryTabs?.newTab()?.setText(R.string.avatar_size)?.let { this.subCategoryTabs?.addTab(it) }
         subCategoryTabs?.newTab()?.setText(R.string.avatar_shirt)?.let { this.subCategoryTabs?.addTab(it) }
         loadCustomizations()
@@ -231,14 +224,9 @@ class AvatarSetupFragment : BaseFragment() {
         val location = IntArray(2)
         val params = this.caretView?.layoutParams as? RelativeLayout.LayoutParams
         this.activeButton?.getLocationOnScreen(location)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val r = resources
-            val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt()
-            params?.marginStart = location[0] + px
-            this.caretView?.layoutParams = params
-        } else {
-            caretView?.visibility = View.GONE
-        }
-
+        val r = resources
+        val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt()
+        params?.marginStart = location[0] + px
+        this.caretView?.layoutParams = params
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
index 97aa7be9d..2baf56528 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
@@ -1,29 +1,26 @@
 package com.habitrpg.android.habitica.ui.fragments.skills
 
 import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-
-import javax.inject.Inject
-import javax.inject.Named
-
-import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import io.reactivex.Flowable
 import io.reactivex.functions.Consumer
+import javax.inject.Inject
+import javax.inject.Named
 
 class SkillTasksRecyclerViewFragment : BaseFragment() {
     @Inject
@@ -52,16 +49,15 @@ class SkillTasksRecyclerViewFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        compositeSubscription.add(taskRepository.getTasks(taskType ?: "", userId).firstElement().subscribe(Consumer { tasks -> adapter.updateData(tasks) }, RxErrorHandler.handleEmptyError()))
+        var tasks = taskRepository.getTasks(taskType ?: "", userId)
+        if (taskType == Task.TYPE_TODO) {
+            tasks = tasks.map { it.where().equalTo("completed", false).findAll() }
+        }
+        compositeSubscription.add(tasks.firstElement().subscribe(Consumer { adapter.updateData(it) }, RxErrorHandler.handleEmptyError()))
         recyclerView?.adapter = adapter
 
-        layoutManager = recyclerView?.layoutManager as? LinearLayoutManager
-
-        if (layoutManager == null) {
-            layoutManager = LinearLayoutManager(context)
-
-            recyclerView?.layoutManager = layoutManager
-        }
+        val layoutManager = LinearLayoutManager(context)
+        recyclerView?.layoutManager = layoutManager
         recyclerView?.itemAnimator = SafeDefaultItemAnimator()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 2235b1250..428293f44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -44,7 +44,6 @@ class ChatFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
     @Inject
     lateinit var configManager: AppConfigManager
 
-    internal var layoutManager: LinearLayoutManager? = null
     private var chatAdapter: ChatRecyclerViewAdapter? = null
     private var navigatedOnceToFragment = false
     private var isScrolledToTop = true
@@ -64,12 +63,8 @@ class ChatFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
         super.onViewCreated(view, savedInstanceState)
         refreshLayout.setOnRefreshListener(this)
 
-        layoutManager = recyclerView.layoutManager as? LinearLayoutManager
-
-        if (layoutManager == null) {
-            layoutManager = LinearLayoutManager(context)
-            recyclerView.layoutManager = layoutManager
-        }
+        val layoutManager = LinearLayoutManager(context)
+        recyclerView.layoutManager = layoutManager
 
         chatAdapter = ChatRecyclerViewAdapter(null, true, null, true)
         chatAdapter?.let {adapter ->
@@ -94,7 +89,7 @@ class ChatFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
         recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
-                isScrolledToTop = layoutManager?.findFirstVisibleItemPosition() == 0
+                isScrolledToTop = layoutManager.findFirstVisibleItemPosition() == 0
             }
         })
 
@@ -191,7 +186,7 @@ class ChatFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
     private fun copyMessageToClipboard(chatMessage: ChatMessage) {
         val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
         val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.primaryClip = messageText
+        clipMan?.setPrimaryClip(messageText)
         val activity = activity as? MainActivity
         if (activity != null) {
             showSnackbar(activity.snackbarContainer, getString(R.string.chat_message_copied), SnackbarDisplayType.NORMAL)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
index d06c0243e..cb2d72c76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
@@ -55,7 +55,6 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
             chatBarView.autocompleteContext = value
         }
     }
-    internal var layoutManager: LinearLayoutManager? = null
     internal var groupId: String? = null
     private var user: User? = null
     private var userId: String? = null
@@ -111,12 +110,8 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
         super.onViewCreated(view, savedInstanceState)
         refreshLayout.setOnRefreshListener(this)
 
-        layoutManager = recyclerView.layoutManager as? LinearLayoutManager
-
-        if (layoutManager == null) {
-            layoutManager = LinearLayoutManager(context)
-            recyclerView.layoutManager = layoutManager
-        }
+        val layoutManager = LinearLayoutManager(context)
+        recyclerView.layoutManager = layoutManager
 
         chatAdapter = ChatRecyclerViewAdapter(null, true, user, true)
         chatAdapter?.let {adapter ->
@@ -164,7 +159,7 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
         recyclerView.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
-                isScrolledToTop = layoutManager?.findFirstVisibleItemPosition() == 0
+                isScrolledToTop = layoutManager.findFirstVisibleItemPosition() == 0
             }
         })
 
@@ -246,7 +241,7 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
     private fun copyMessageToClipboard(chatMessage: ChatMessage) {
         val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
         val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.primaryClip = messageText
+        clipMan?.setPrimaryClip(messageText)
         val activity = activity as? MainActivity
         if (activity != null) {
             showSnackbar(activity.snackbarContainer, getString(R.string.chat_message_copied), SnackbarDisplayType.NORMAL)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
index 74cfde02e..71b8690f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
@@ -37,6 +37,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_group_info.*
 import javax.inject.Inject
+import kotlin.math.roundToInt
 
 
 class GroupInformationFragment : BaseFragment() {
@@ -98,7 +99,7 @@ class GroupInformationFragment : BaseFragment() {
         username_textview.setOnClickListener {
             val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
             val clip = ClipData.newPlainText(context?.getString(R.string.username), user?.username)
-            clipboard?.primaryClip = clip
+            clipboard?.setPrimaryClip(clip)
             val activity = activity as? MainActivity
             if (activity != null) {
                 HabiticaSnackbar.showSnackbar(activity.snackbarContainer, getString(R.string.username_copied), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
@@ -119,18 +120,16 @@ class GroupInformationFragment : BaseFragment() {
             DataBindingUtils.loadImage("timeTravelersShop_background_fall") {bitmap ->
                 val aspectRatio = bitmap.width / bitmap.height.toFloat()
                 val height = context.resources.getDimension(R.dimen.shop_height).toInt()
-                val width = Math.round(height * aspectRatio)
+                val width = (height * aspectRatio).roundToInt()
                 val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
                 drawable.tileModeX = Shader.TileMode.REPEAT
-                if (drawable != null) {
-                    Observable.just(drawable)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer {
-                                if (no_party_background != null) {
-                                    no_party_background.background = it
-                                }
-                            }, RxErrorHandler.handleEmptyError())
-                }
+                Observable.just(drawable)
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(Consumer {
+                            if (no_party_background != null) {
+                                no_party_background.background = it
+                            }
+                        }, RxErrorHandler.handleEmptyError())
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
index 9eb5c8658..e26b1691d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt
@@ -19,11 +19,10 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -32,6 +31,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
 import java.util.*
 import javax.inject.Inject
@@ -77,12 +77,7 @@ class GuildDetailFragment : BaseFragment() {
         guildDescriptionView.movementMethod = LinkMovementMethod.getInstance()
         guildBankIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
         leaveGuildButton.setOnClickListener {
-            viewModel?.leaveGroup {
-                val activity = activity as? MainActivity
-                if (activity != null) {
-                    HabiticaSnackbar.showSnackbar(activity.snackbarContainer, getString(R.string.left_guild), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
-                }
-            }
+            leaveGuild()
         }
         joinGuildButton.setOnClickListener {
             viewModel?.joinGroup {
@@ -159,6 +154,29 @@ class GuildDetailFragment : BaseFragment() {
         }
     }
 
+    internal fun leaveGuild() {
+        val context = context
+        if (context != null) {
+            val alert = HabiticaAlertDialog(context)
+            alert.setMessage(R.string.leave_guild_confirmation)
+            alert.addButton(R.string.keep_challenges, true) { _, _ ->
+                viewModel?.leaveGroup(true) { showLeaveSnackbar() }
+            }
+            alert.addButton(R.string.leave_challenges, true) { _, _ ->
+                viewModel?.leaveGroup(false) { showLeaveSnackbar() }
+            }
+            alert.addButton(R.string.no, false)
+            alert.show()
+        }
+    }
+
+    private fun showLeaveSnackbar() {
+        val activity = activity as? MainActivity
+        if (activity != null) {
+            HabiticaSnackbar.showSnackbar(activity.snackbarContainer, getString(R.string.left_guild), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+        }
+    }
+
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -173,7 +191,7 @@ class GuildDetailFragment : BaseFragment() {
     }
 
     companion object {
-        fun newInstance(viewModel: GroupViewModel?, user: User?): GuildDetailFragment {
+        fun newInstance(viewModel: GroupViewModel?): GuildDetailFragment {
             val args = Bundle()
 
             val fragment = GuildDetailFragment()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
index 338462cee..08c514d70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
@@ -108,13 +108,17 @@ class GuildFragment : BaseMainFragment() {
                 return true
             }
             R.id.menu_guild_leave -> {
-                viewModel.leaveGroup { fragmentManager?.popBackStack() }
+                guildInformationFragment?.leaveGuild()
                 return true
             }
             R.id.menu_guild_edit -> {
                 this.displayEditForm()
                 return true
             }
+            R.id.action_reload -> {
+                viewModel.retrieveGroup { }
+                return true
+            }
         }
         return super.onOptionsItemSelected(item)
     }
@@ -130,7 +134,7 @@ class GuildFragment : BaseMainFragment() {
 
                 when (position) {
                     0 -> {
-                        guildInformationFragment = GuildDetailFragment.newInstance(viewModel, user)
+                        guildInformationFragment = GuildDetailFragment.newInstance(viewModel)
                         fragment = guildInformationFragment
                     }
                     1 -> {
@@ -186,7 +190,7 @@ class GuildFragment : BaseMainFragment() {
         bundle.putString("description", guild?.description)
         bundle.putString("privacy", guild?.privacy)
         bundle.putString("leader", guild?.leaderID)
-        bundle.putBoolean("leaderCreateChallenge", guild?.leaderOnlyChallenges ?: true)
+        bundle.putBoolean("leaderOnlyChallenges", guild?.leaderOnlyChallenges ?: true)
 
 
         val intent = Intent(activity, GroupFormActivity::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index 4254b0dbf..a494408e6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -8,6 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -18,10 +20,12 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.social.InboxAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModelFactory
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -39,10 +43,12 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
     @Inject
     lateinit var configManager: AppConfigManager
 
-    private var chatAdapter: ChatRecyclerViewAdapter? = null
+    private var chatAdapter: InboxAdapter? = null
     private var chatRoomUser: String? = null
     private var replyToUserUUID: String? = null
 
+    private var viewModel: InboxViewModel? = null
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
@@ -59,11 +65,13 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
             val args = InboxMessageListFragmentArgs.fromBundle(it)
             setReceivingUser(args.username, args.userID)
         }
+        viewModel = ViewModelProviders.of(this, InboxViewModelFactory(replyToUserUUID ?: "")).get(InboxViewModel::class.java)
 
         val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.getActivity())
         recyclerView.layoutManager = layoutManager
 
-        chatAdapter = ChatRecyclerViewAdapter(null, true, user, false)
+        chatAdapter = InboxAdapter(user)
+        viewModel?.messages?.observe(this, Observer { chatAdapter?.submitList(it) })
         recyclerView.adapter = chatAdapter
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
         chatAdapter?.let { adapter ->
@@ -78,8 +86,6 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         chatBarView.sendAction = { sendMessage(it) }
         chatBarView.maxChatLength = configManager.maxChatLength()
 
-        loadMessages()
-
         communityGuidelinesView.visibility = View.GONE
     }
 
@@ -90,14 +96,6 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         super.onAttach(context)
     }
 
-    private fun loadMessages() {
-        if (user?.isManaged == true) {
-            compositeSubscription.add(socialRepository.getInboxMessages(replyToUserUUID)
-                    .firstElement()
-                    .subscribe(Consumer { this.chatAdapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
-        }
-    }
-
     override fun onDestroy() {
         socialRepository.close()
         super.onDestroy()
@@ -107,16 +105,17 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         component.inject(this)
     }
 
-    private fun refreshUserInbox() {
-        this.swipeRefreshLayout?.isRefreshing = true
-        compositeSubscription.add(this.socialRepository.retrieveInboxMessages()
+    private fun refreshConversation() {
+        compositeSubscription.add(this.socialRepository.retrieveInboxMessages(replyToUserUUID ?: "", 0)
                 .subscribe(Consumer {}, RxErrorHandler.handleEmptyError(), Action {
                     swipeRefreshLayout?.isRefreshing = false
+                    viewModel?.invalidateDataSource()
                 }))
     }
 
     override fun onRefresh() {
-        this.refreshUserInbox()
+        this.swipeRefreshLayout?.isRefreshing = true
+        this.refreshConversation()
     }
 
     private fun sendMessage(chatText: String) {
@@ -139,7 +138,7 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
     private fun copyMessageToClipboard(chatMessage: ChatMessage) {
         val clipMan = getActivity()?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
         val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.primaryClip = messageText
+        clipMan?.setPrimaryClip(messageText)
         val activity = getActivity() as? MainActivity
         if (activity != null) {
             showSnackbar(activity.snackbarContainer, getString(R.string.chat_message_copied), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
similarity index 83%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index 7fb005941..204e61d1d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -11,10 +11,11 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
@@ -27,7 +28,7 @@ import kotlinx.android.synthetic.main.fragment_inbox.*
 import javax.inject.Inject
 import javax.inject.Named
 
-class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
+class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -54,10 +55,11 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi
         inbox_refresh_layout?.setOnRefreshListener(this)
 
         loadMessages()
+        retrieveMessages()
     }
 
     private fun loadMessages() {
-        compositeSubscription.add(socialRepository.getInboxOverviewList().subscribe(Consumer<RealmResults<ChatMessage>> {
+        compositeSubscription.add(socialRepository.getInboxConversations().subscribe(Consumer<RealmResults<InboxConversation>> {
             setInboxMessages(it)
         }, RxErrorHandler.handleEmptyError()))
     }
@@ -68,9 +70,7 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-
-        when (id) {
+        when (item.itemId) {
             R.id.send_message -> {
                 openNewMessageDialog()
                 return true
@@ -103,15 +103,20 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi
         component.inject(this)
     }
 
-    override fun onRefresh() {
-        inbox_refresh_layout.isRefreshing = true
-        compositeSubscription.add(this.socialRepository.retrieveInboxMessages()
-                .subscribe(Consumer<List<ChatMessage>> {
+
+    private fun retrieveMessages() {
+        compositeSubscription.add(this.socialRepository.retrieveInboxConversations()
+                .subscribe(Consumer<List<InboxConversation>> {
                     inbox_refresh_layout.isRefreshing = false
                 }, RxErrorHandler.handleEmptyError()))
     }
 
-    private fun setInboxMessages(messages: RealmResults<ChatMessage>) {
+    override fun onRefresh() {
+        inbox_refresh_layout.isRefreshing = true
+        retrieveMessages()
+    }
+
+    private fun setInboxMessages(messages: RealmResults<InboxConversation>) {
         if (inbox_messages == null) {
             return
         }
@@ -123,15 +128,14 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi
             for (message in messages) {
                 val entry = inflater?.inflate(R.layout.item_inbox_overview, inbox_messages, false)
                 val avatarView = entry?.findViewById(R.id.avatar_view) as? AvatarView
-                //message.userStyles?.let { avatarView?.setAvatar(it) }
-                avatarView?.visibility = View.GONE
+                message.userStyles?.let { avatarView?.setAvatar(it) }
                 val displayNameTextView = entry?.findViewById(R.id.display_name_textview) as? UsernameLabel
                 displayNameTextView?.username = message.user
                 displayNameTextView?.tier = message.contributor?.level ?: 0
                 val timestampTextView = entry?.findViewById(R.id.timestamp_textview) as? TextView
-                timestampTextView?.text = message.getAgoString(resources)
+                timestampTextView?.text = message.timestamp?.getAgoString(resources)
                 val usernameTextView = entry?.findViewById(R.id.username_textview) as? TextView
-                if (message.username != null) {
+                if (message.username?.isNotEmpty() == true) {
                     usernameTextView?.text = message.formattedUsername
                     usernameTextView?.visibility = View.VISIBLE
                 } else {
@@ -156,7 +160,7 @@ class InboxFragment : BaseMainFragment(), androidx.swiperefreshlayout.widget.Swi
     }
 
     private fun openInboxMessages(userID: String, username: String) {
-        MainNavigationController.navigate(InboxFragmentDirections.openInboxDetail(userID, username))
+        MainNavigationController.navigate(InboxOverviewFragmentDirections.openInboxDetail(userID, username))
     }
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index 1560a7034..1555b14a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
@@ -196,7 +196,7 @@ class QuestDetailFragment : BaseMainFragment() {
                     questParticipantList?.addView(participantView)
                 }
             }
-            if (quest?.active == true || participant.participatesInQuest == true) {
+            if (participant.participatesInQuest == true) {
                 participantCount += 1
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index 5aff178b3..38cdb1106 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -12,7 +12,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
@@ -168,7 +167,7 @@ class ChallengeDetailFragment: BaseMainFragment() {
         else if (item.itemId == R.id.action_share) {
             val shareGuildIntent = Intent().apply {
                 action = Intent.ACTION_SEND
-                putExtra(Intent.EXTRA_TEXT, "${BuildConfig.BASE_URL}/challenges/$challengeID")
+                putExtra(Intent.EXTRA_TEXT, "${context?.getString(R.string.base_url)}/challenges/$challengeID")
                 type = "text/plain"
             }
             startActivity(Intent.createChooser(shareGuildIntent, context?.getString(R.string.share_challenge_with)))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 466877c75..4a70e5f62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -13,6 +13,7 @@ import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -22,15 +23,18 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment
 import com.habitrpg.android.habitica.ui.helpers.*
 import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder.GroupMemberViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.social.OldQuestProgressView
 import io.reactivex.functions.Consumer
 import io.realm.RealmResults
+import net.pherth.android.emoji_library.EmojiEditText
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -39,6 +43,8 @@ class PartyDetailFragment : BaseFragment() {
 
     var viewModel: PartyViewModel? = null
 
+    @Inject
+    lateinit var socialRepository: SocialRepository
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
@@ -54,7 +60,7 @@ class PartyDetailFragment : BaseFragment() {
     private val questDetailButton: ViewGroup? by bindView(R.id.quest_detail_button)
     private val questScrollImageView: SimpleDraweeView? by bindView(R.id.quest_scroll_image_view)
     private val questTitleView: TextView? by bindOptionalView(R.id.quest_title_view)
-    private val questParticipationView: TextView? by bindView(R.id.quest_participation_view)
+    private val questParticipationView: TextView? by bindOptionalView(R.id.quest_participation_view)
     private val questImageWrapper: ViewGroup? by bindView(R.id.quest_image_wrapper)
     private val questImageView: SimpleDraweeView? by bindView(R.id.quest_image_view)
     private val questParticipantResponseWrapper: ViewGroup? by bindView(R.id.quest_participant_response_wrapper)
@@ -189,15 +195,83 @@ class PartyDetailFragment : BaseFragment() {
             for (member in members) {
                 val memberView = membersWrapper?.inflate(R.layout.party_member, false) ?: continue
                 val viewHolder = GroupMemberViewHolder(memberView)
-                viewHolder.bind(member, leaderID ?: "")
+                viewHolder.bind(member, leaderID ?: "", viewModel?.getUserData()?.value?.id)
                 viewHolder.onClickEvent = {
                     FullProfileActivity.open(member.id ?: "")
                 }
+                viewHolder.sendMessageEvent = {
+                    member.id?.let { showSendMessageToUserDialog(it, member.displayName) }
+                }
+                viewHolder.transferOwnershipEvent = {
+                    member.id?.let { showTransferOwnerShipDialog(it, member.displayName) }
+                }
+                viewHolder.removeMemberEvent = {
+                    member.id?.let { showRemoveMemberDialog(it, member.displayName) }
+                }
                 membersWrapper?.addView(memberView)
             }
         }
     }
 
+    private fun showSendMessageToUserDialog(userID: String, username: String) {
+        val factory = LayoutInflater.from(context)
+        val newMessageView = factory.inflate(R.layout.profile_new_message_dialog, null)
+
+        val emojiEditText = newMessageView.findViewById<EmojiEditText>(R.id.edit_new_message_text)
+
+        val newMessageTitle = newMessageView.findViewById<TextView>(R.id.new_message_title)
+        newMessageTitle.text = String.format(getString(R.string.profile_send_message_to), username)
+
+        val addMessageDialog = context?.let { HabiticaAlertDialog(it) }
+        addMessageDialog?.addButton(android.R.string.ok, true) { _, _ ->
+            socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
+                    .subscribe(Consumer {
+                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                            HabiticaSnackbar.showSnackbar(it1,
+                                    String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+                        }
+                    }, RxErrorHandler.handleEmptyError())
+            activity?.dismissKeyboard()
+        }
+        addMessageDialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
+        addMessageDialog?.setAdditionalContentView(newMessageView)
+        addMessageDialog?.show()
+    }
+
+    private fun showTransferOwnerShipDialog(userID: String, displayName: String) {
+        val dialog = context?.let { HabiticaAlertDialog(it) }
+        dialog?.addButton(R.string.transfer, true) { _, _ ->
+            socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
+                    .subscribe(Consumer {
+                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                            HabiticaSnackbar.showSnackbar(it1,
+                                    String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+                        }
+                    }, RxErrorHandler.handleEmptyError())
+            activity?.dismissKeyboard()
+        }
+        dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
+        dialog?.setTitle(context?.getString(R.string.transfer_ownership_confirm, displayName))
+        dialog?.show()
+    }
+
+    private fun showRemoveMemberDialog(userID: String, displayName: String) {
+        val dialog = context?.let { HabiticaAlertDialog(it) }
+        dialog?.addButton(R.string.remove, true) { _, _ ->
+            socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
+                    .subscribe(Consumer {
+                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                            HabiticaSnackbar.showSnackbar(it1,
+                                    String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+                        }
+                    }, RxErrorHandler.handleEmptyError())
+            activity?.dismissKeyboard()
+        }
+        dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
+        dialog?.setTitle(context?.getString(R.string.remove_member_confirm, displayName))
+        dialog?.show()
+    }
+
     private fun inviteNewQuest() {
         val fragment = ItemRecyclerFragment()
         fragment.itemType = "quests"
@@ -205,13 +279,16 @@ class PartyDetailFragment : BaseFragment() {
         fragmentManager?.let { fragment.show(it, "questDialog") }
     }
 
-    private fun leaveParty() {
+    internal fun leaveParty() {
         val context = context
         if (context != null) {
             val alert = HabiticaAlertDialog(context)
             alert.setMessage(R.string.leave_party_confirmation)
-            alert.addButton(R.string.yes, true) { _, _ ->
-                viewModel?.leaveGroup { }
+            alert.addButton(R.string.keep_challenges, true) { _, _ ->
+                viewModel?.leaveGroup(true) { }
+            }
+            alert.addButton(R.string.leave_challenges, true) { _, _ ->
+                viewModel?.leaveGroup(false) { }
             }
             alert.addButton(R.string.no, false)
             alert.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index c001777fd..7783692fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -22,7 +22,6 @@ import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.functions.Consumer
 import java.util.*
 
@@ -153,18 +152,7 @@ class PartyFragment : BaseMainFragment() {
                 return true
             }
             R.id.menu_guild_leave -> {
-                context?.let {
-                    val alert = HabiticaAlertDialog(it)
-                    alert.setTitle(context?.getString(R.string.leave_party))
-                    alert.setMessage(context?.getString(R.string.leave_party_confirmation))
-                    alert.addButton(R.string.yes, true) { _, _ ->
-                        viewModel.leaveGroup {
-                            fragmentManager?.popBackStack()
-                        }
-                    }
-                    alert.addButton(R.string.no, false)
-                    alert.show()
-                }
+                (firstFragment as? PartyDetailFragment)?.leaveParty()
                 return true
             }
         }
@@ -255,7 +243,7 @@ class PartyFragment : BaseMainFragment() {
             }
 
             override fun getCount(): Int {
-                return if (user?.hasParty() != true) {
+                return if (user?.isValid != true || user?.hasParty() != true) {
                     1
                 } else {
                     2
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt
deleted file mode 100644
index 28c57a4d6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.social.party
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
-import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
-import io.reactivex.functions.Consumer
-import javax.inject.Inject
-
-class PartyMemberListFragment : BaseFragment() {
-
-    var viewModel: PartyViewModel? = null
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(R.id.recyclerView)
-    private val refreshLayout: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? by bindView(R.id.refreshLayout)
-    private var adapter: PartyMemberRecyclerViewAdapter? = null
-    private var partyId: String? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_refresh_recyclerview)
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-        adapter = PartyMemberRecyclerViewAdapter(null, true)
-        adapter?.getUserClickedEvents()?.subscribe(Consumer { userId -> FullProfileActivity.open(userId) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-        recyclerView?.adapter = adapter
-        recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-        refreshLayout?.setOnRefreshListener { this.refreshMembers() }
-        getUsers()
-    }
-
-    private fun refreshMembers() {
-        setRefreshing(true)
-        compositeSubscription.add(socialRepository.retrieveGroupMembers(partyId ?: "", true).doOnComplete { setRefreshing(false) }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
-    }
-
-    private fun setRefreshing(isRefreshing: Boolean) {
-        refreshLayout?.isRefreshing = isRefreshing
-    }
-
-    fun setPartyId(id: String) {
-        this.partyId = id
-    }
-
-    private fun getUsers() {
-        if (partyId == null) {
-            return
-        }
-        compositeSubscription.add(socialRepository.getGroupMembers(partyId ?: "").firstElement().subscribe(Consumer { users ->
-            adapter?.updateData(users)
-        }, RxErrorHandler.handleEmptyError()))
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 5bfb350ba..319abed3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,17 +11,23 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_refresh_recyclerview.*
 import java.util.*
 
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
+    private var selectedCard: ShopItem? = null
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         return super.onCreateView(inflater, container, savedInstanceState)
@@ -47,10 +55,17 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe(Consumer {
             (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
         }, RxErrorHandler.handleEmptyError()))
+
+        (recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents?.subscribe(Consumer {
+            selectedCard = it
+            val intent = Intent(activity, SkillMemberActivity::class.java)
+            startActivityForResult(intent, 11)
+        }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
     }
 
-    override fun getLayoutManager(context: Context?): LinearLayoutManager =
-            GridLayoutManager(context, 4)
+    override fun getLayoutManager(context: Context?): LinearLayoutManager {
+        return GridLayoutManager(context, 4)
+    }
 
     override fun onRefresh() {
         refreshLayout.isRefreshing = true
@@ -72,7 +87,29 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         if (spanCount == 0) {
             spanCount = 1
         }
-        (layoutManager as GridLayoutManager).spanCount = spanCount
+        (layoutManager as? GridLayoutManager)?.spanCount = spanCount
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (data != null) {
+            when (requestCode) {
+                11 -> {
+                    if (resultCode == Activity.RESULT_OK) {
+                        userRepository.useSkill(user,
+                                selectedCard?.key ?: "",
+                                "member",
+                                data.getStringExtra("member_id"))
+                                .subscribeWithErrorHandler(Consumer {
+                                    val activity = (activity as? MainActivity) ?: return@Consumer
+                                    HabiticaSnackbar.showSnackbar(activity.snackbarContainer,
+                                            context?.getString(R.string.sent_card, selectedCard?.text),
+                                            HabiticaSnackbar.SnackbarDisplayType.BLUE)
+                                })
+                    }
+                }
+            }
+        }
     }
 
     companion object {
@@ -85,8 +122,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
             if (context != null) {
                 fragment.tutorialStepIdentifier = "rewards"
-                fragment.tutorialTexts = ArrayList(Arrays.asList(context.getString(R.string.tutorial_rewards_1),
-                        context.getString(R.string.tutorial_rewards_2)))
+                fragment.tutorialTexts = ArrayList(listOf(context.getString(R.string.tutorial_rewards_1), context.getString(R.string.tutorial_rewards_2)))
             }
             fragment.tutorialCanBeDeferred = false
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 666e8729f..301f44e1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -45,6 +45,7 @@ import javax.inject.Named
 
 open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
     var recyclerAdapter: TaskRecyclerViewAdapter? = null
+    var itemAnimator = SafeDefaultItemAnimator()
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userID: String
     @Inject
@@ -136,7 +137,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         super.onCreateView(inflater, container, savedInstanceState)
 
         if (Task.TYPE_DAILY == classType) {
-            if (user != null && user?.preferences?.dailyDueDefaultView == true) {
+            if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
                 taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE)
             }
         } else if (Task.TYPE_TODO == classType) {
@@ -187,11 +188,15 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                 val movingTaskID = movingTaskID
                 if (fromPosition != null && movingTaskID != null) {
                     recyclerAdapter?.ignoreUpdates = true
+                    itemAnimator.skipAnimations = true
                     compositeSubscription.add(taskRepository.updateTaskPosition(classType ?: "", movingTaskID, viewHolder.adapterPosition)
                             .delay(1, TimeUnit.SECONDS)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Consumer { recyclerAdapter?.ignoreUpdates = false
-                            recyclerAdapter?.notifyDataSetChanged()}, RxErrorHandler.handleEmptyError()))
+                            .subscribe(Consumer {
+                                recyclerAdapter?.ignoreUpdates = false
+                                recyclerAdapter?.notifyDataSetChanged()
+                                itemAnimator.skipAnimations = false
+                            }, RxErrorHandler.handleEmptyError()))
                 }
                 this.fromPosition = null
                 this.movingTaskID = null
@@ -204,7 +209,9 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         return inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false)
     }
 
-    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager {
+        return androidx.recyclerview.widget.LinearLayoutManager(context)
+    }
 
     override fun onDestroy() {
         userRepository.close()
@@ -222,18 +229,14 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         recyclerView.adapter = recyclerAdapter as? androidx.recyclerview.widget.RecyclerView.Adapter<*>
         recyclerAdapter?.filter()
 
-        layoutManager = recyclerView.layoutManager
+        layoutManager = getLayoutManager(context)
+        layoutManager?.isItemPrefetchEnabled = false
+        recyclerView.layoutManager = layoutManager
 
-        if (layoutManager == null) {
-            layoutManager = getLayoutManager(context)
-
-            recyclerView.layoutManager = layoutManager
-        }
         if (recyclerView.adapter == null) {
             this.setInnerAdapter()
         }
         if (this.classType != null) {
-            recyclerAdapter?.errorButtonEvents
             recyclerAdapter?.errorButtonEvents?.subscribe(Consumer {
                 taskRepository.syncErroredTasks().subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
             }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
@@ -242,9 +245,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
             })?.let { compositeSubscription.add(it) }
             recyclerAdapter?.taskScoreEvents
                     ?.doOnNext { playSound(it.second) }
-                    ?.flatMap { taskRepository.taskChecked(user, it.first, it.second == TaskDirection.UP, false) { result ->
-                        handleTaskResult(result, it.first.value.toInt())
-                    }}?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
+                    ?.subscribeWithErrorHandler(Consumer { scoreTask(it.first, it.second) })?.let { compositeSubscription.add(it) }
             recyclerAdapter?.checklistItemScoreEvents
                     ?.flatMap { taskRepository.scoreChecklistItem(it.first.id ?: "", it.second.id ?: "")
                     }?.subscribeWithErrorHandler(Consumer {})?.let { compositeSubscription.add(it) }
@@ -252,7 +253,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
 
         val bottomPadding = (recyclerView.paddingBottom + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60f, resources.displayMetrics)).toInt()
         recyclerView.setPadding(0, 0, 0, bottomPadding)
-        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        recyclerView.itemAnimator = itemAnimator
 
         refreshLayout.setOnRefreshListener(this)
 
@@ -291,6 +292,12 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         }
     }
 
+    private fun scoreTask(task: Task, direction: TaskDirection) {
+        compositeSubscription.add(taskRepository.taskChecked(user, task, direction == TaskDirection.UP, false) { result ->
+            handleTaskResult(result, task.value.toInt())
+        }.subscribeWithErrorHandler(Consumer {}))
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putString(CLASS_TYPE_KEY, this.classType)
@@ -317,13 +324,14 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     }
 
     private fun openTaskForm(task: Task) {
-        if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000) {
+        if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000 || !task.isValid) {
             return
         }
 
         val bundle = Bundle()
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, task.type)
         bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
+        bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
 
         val intent = Intent(activity, TaskFormActivity::class.java)
         intent.putExtras(bundle)
@@ -346,21 +354,15 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
                 when (fragment.classType) {
                     Task.TYPE_HABIT -> {
                         fragment.tutorialStepIdentifier = "habits"
-                        tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_overview),
-                                context.getString(R.string.tutorial_habits_1),
-                                context.getString(R.string.tutorial_habits_2),
-                                context.getString(R.string.tutorial_habits_3),
-                                context.getString(R.string.tutorial_habits_4))
+                        tutorialTexts = listOf(context.getString(R.string.tutorial_overview), context.getString(R.string.tutorial_habits_1), context.getString(R.string.tutorial_habits_2), context.getString(R.string.tutorial_habits_3), context.getString(R.string.tutorial_habits_4))
                     }
                     Task.FREQUENCY_DAILY -> {
                         fragment.tutorialStepIdentifier = "dailies"
-                        tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_dailies_1),
-                                context.getString(R.string.tutorial_dailies_2))
+                        tutorialTexts = listOf(context.getString(R.string.tutorial_dailies_1), context.getString(R.string.tutorial_dailies_2))
                     }
                     Task.TYPE_TODO -> {
                         fragment.tutorialStepIdentifier = "todos"
-                        tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_todos_1),
-                                context.getString(R.string.tutorial_todos_2))
+                        tutorialTexts = listOf(context.getString(R.string.tutorial_todos_1), context.getString(R.string.tutorial_todos_2))
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 617a8e282..b4914acdc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -2,13 +2,16 @@ package com.habitrpg.android.habitica.ui.fragments.tasks
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.*
+import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.FragmentPagerAdapter
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -23,7 +26,8 @@ import java.util.*
 import javax.inject.Inject
 import kotlin.collections.ArrayList
 
-class TasksFragment : BaseMainFragment() {
+
+class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
 
     var viewPager: androidx.viewpager.widget.ViewPager? = null
     @Inject
@@ -46,7 +50,15 @@ class TasksFragment : BaseMainFragment() {
         }
 
     private val activeFragment: TaskRecyclerViewFragment?
-        get() = viewFragmentsDictionary?.get(viewPager?.currentItem)
+        get() {
+            var fragment = viewFragmentsDictionary?.get(viewPager?.currentItem)
+            if (fragment == null) {
+                if (isAdded) {
+                    fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + viewPager?.currentItem) as? TaskRecyclerViewFragment)
+                }
+            }
+            return fragment
+        }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -98,13 +110,40 @@ class TasksFragment : BaseMainFragment() {
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_main_activity, menu)
 
-        filterMenuItem = menu.findItem(R.id.action_search)
+        filterMenuItem = menu.findItem(R.id.action_filter)
         updateFilterIcon()
+
+        val item = menu.findItem(R.id.action_search)
+        val sv = item.actionView as? SearchView
+        sv?.setOnQueryTextListener(this)
+        sv?.setIconifiedByDefault(false)
+        item.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                return true
+            }
+
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                // Do something when expanded
+                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+                return true
+            }
+        })
+    }
+
+    override fun onQueryTextSubmit(query: String?): Boolean {
+        return true
+    }
+
+    override fun onQueryTextChange(newText: String?): Boolean {
+        taskFilterHelper.searchQuery = newText
+        viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
+        return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.action_search -> {
+            R.id.action_filter -> {
                 showFilterDialog()
                 true
             }
@@ -135,14 +174,11 @@ class TasksFragment : BaseMainFragment() {
                     if (viewFragmentsDictionary == null) {
                         return
                     }
-                    val activePos = viewPager?.currentItem ?: 0
-                    viewFragmentsDictionary?.get(activePos - 1)?.recyclerAdapter?.filter()
-                    viewFragmentsDictionary?.get(activePos + 1)?.recyclerAdapter?.filter()
                     taskFilterHelper.tags = activeTags
                     if (activeTaskFilter != null) {
                         activeFragment?.setActiveFilter(activeTaskFilter)
                     }
-                    viewFragmentsDictionary?.values?.forEach { it.recyclerAdapter?.filter() }
+                    viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
                     updateFilterIcon()
                 }
             })
@@ -210,7 +246,11 @@ class TasksFragment : BaseMainFragment() {
         if (filterCount == 0) {
             filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
         } else {
-            filterMenuItem?.setIcon(R.drawable.ic_filters_active)
+            context?.let {
+                val filterIcon = it.getDrawable(R.drawable.ic_filters_active)
+                filterIcon?.setColorFilter(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
+                filterMenuItem?.setIcon(filterIcon)
+            }
         }
     }
 
@@ -218,7 +258,7 @@ class TasksFragment : BaseMainFragment() {
         if (bottomNavigation == null) {
             return
         }
-        compositeSubscription.add(tutorialRepository.getTutorialSteps(Arrays.asList("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
+        compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe(Consumer { tutorialSteps ->
             val activeTutorialFragments = ArrayList<String>()
             for (step in tutorialSteps) {
                 var id = -1
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 38d82621a..44998cad1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -2,13 +2,13 @@ package com.habitrpg.android.habitica.ui.helpers
 
 import android.graphics.Bitmap
 import android.graphics.PorterDuff
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.Transformation
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.net.toUri
 import com.facebook.common.executors.CallerThreadExecutor
 import com.facebook.common.references.CloseableReference
@@ -20,6 +20,11 @@ import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.habitrpg.android.habitica.R
 
+
+fun SimpleDraweeView.loadImage(imageName: String, imageFormat: String = "png") {
+    DataBindingUtils.loadImage(this, imageName, imageFormat)
+}
+
 object DataBindingUtils {
 
     fun loadImage(view: SimpleDraweeView?, imageName: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
index e765f8068..fc07af1f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
@@ -19,7 +19,7 @@ package com.habitrpg.android.habitica.ui.helpers
 import android.app.Activity
 import android.view.inputmethod.InputMethodManager
 
-class KeyboardUtil() {
+class KeyboardUtil {
     companion object {
         fun dismissKeyboard(act: Activity?) {
             if (act != null && act.currentFocus != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java
deleted file mode 100644
index 4a2c701d1..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import android.content.Context;
-import android.graphics.Rect;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
-
-import com.habitrpg.android.habitica.R;
-
-public class MarginDecoration extends RecyclerView.ItemDecoration {
-    private int margin;
-
-    public MarginDecoration(Context context) {
-        margin = context.getResources().getDimensionPixelSize(R.dimen.grid_item_margin);
-    }
-
-    @Override
-    public void getItemOffsets(
-            Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-        outRect.set(margin, margin, margin, margin);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
new file mode 100644
index 000000000..46302b14a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
@@ -0,0 +1,15 @@
+package com.habitrpg.android.habitica.ui.helpers
+
+import android.content.Context
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+
+class MarginDecoration(context: Context?) : RecyclerView.ItemDecoration() {
+    private val margin: Int = context?.resources?.getDimensionPixelSize(R.dimen.grid_item_margin) ?: 0
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.set(margin, margin, margin, margin)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
index 515521063..454261e3b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
@@ -34,11 +34,18 @@ object MarkdownParser {
         if (input == null) {
             return ""
         }
+        val html = try {
+            processor.markdownToHtml(EmojiParser.parseEmojis(input.trim { it <= ' ' }))
+        } catch (e: UnsatisfiedLinkError) {
+            return input
+        } catch (e: NoClassDefFoundError) {
+            return input
+        }
         val output: SpannableStringBuilder = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim { it <= ' ' })), FROM_HTML_MODE_LEGACY) as? SpannableStringBuilder
+            Html.fromHtml(html, FROM_HTML_MODE_LEGACY) as? SpannableStringBuilder
         } else {
             @Suppress("DEPRECATION")
-            (Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim { it <= ' ' }))) as? SpannableStringBuilder)
+            (Html.fromHtml(html) as? SpannableStringBuilder)
         } ?: SpannableStringBuilder()
 
         val matcher = regex.matcher(output)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt
deleted file mode 100644
index df492923b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/NavbarUtils.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers
-
-import android.content.Context
-import android.graphics.Point
-import android.os.Build
-import android.util.DisplayMetrics
-import android.view.KeyCharacterMap
-import android.view.KeyEvent
-import android.view.ViewConfiguration
-import android.view.WindowManager
-import androidx.annotation.IntRange
-import com.habitrpg.android.habitica.R
-
-object NavbarUtils {
-
-    @IntRange(from = 0)
-    fun getNavbarHeight(context: Context): Int {
-        val appUsableSize = getAppUsableScreenSize(context)
-        val realScreenSize = getRealScreenSize(context)
-
-        return when {
-            appUsableSize.x < realScreenSize.x -> realScreenSize.x - appUsableSize.x
-            appUsableSize.y < realScreenSize.y -> realScreenSize.y - appUsableSize.y
-            else -> 0
-        }
-    }
-
-    private fun getAppUsableScreenSize(context: Context): Point {
-        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as? WindowManager
-        val display = windowManager?.defaultDisplay
-        val size = Point()
-        display?.getSize(size)
-        return size
-    }
-
-    fun shouldDrawBehindNavbar(context: Context): Boolean {
-        return isPortrait(context) && hasSoftKeys(context)
-    }
-
-    private fun isPortrait(context: Context): Boolean {
-        val res = context.resources
-        return res.getBoolean(R.bool.is_portrait_mode)
-    }
-
-    private fun getRealScreenSize(context: Context): Point {
-        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as? WindowManager
-        val display = windowManager?.defaultDisplay
-        val size = Point()
-        if (Build.VERSION.SDK_INT >= 17) {
-            display?.getRealSize(size)
-        }
-        return size
-    }
-    /**
-     * http://stackoverflow.com/a/14871974
-     */
-    fun hasSoftKeys(context: Context): Boolean {
-        var hasSoftwareKeys = true
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            val d = (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
-
-            val realDisplayMetrics = DisplayMetrics()
-            d.getRealMetrics(realDisplayMetrics)
-
-            val realHeight = realDisplayMetrics.heightPixels
-            val realWidth = realDisplayMetrics.widthPixels
-
-            val displayMetrics = DisplayMetrics()
-            d.getMetrics(displayMetrics)
-
-            val displayHeight = displayMetrics.heightPixels
-            val displayWidth = displayMetrics.widthPixels
-
-            hasSoftwareKeys = realWidth - displayWidth > 0 || realHeight - displayHeight > 0
-        } else {
-            val hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey()
-            val hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK)
-            hasSoftwareKeys = !hasMenuKey && !hasBackKey
-        }
-
-        return hasSoftwareKeys
-    }
-
-    fun isBehindNavbar(parentLocation: IntArray, context: Context): Boolean {
-        val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-        val display = wm.defaultDisplay
-        val size = Point()
-        display.getSize(size)
-        return parentLocation[1] > size.y - getNavbarHeight(context)
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
index 4904f7eb5..b771fa8e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
@@ -36,7 +36,7 @@ class RecyclerViewEmptySupport : RecyclerView {
         }
     }
 
-    override fun setAdapter(adapter: RecyclerView.Adapter<*>?) {
+    override fun setAdapter(adapter: Adapter<*>?) {
         val oldAdapter = getAdapter()
         oldAdapter?.unregisterAdapterDataObserver(observer)
         super.setAdapter(adapter)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.java
deleted file mode 100644
index 15f5ac947..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.java
+++ /dev/null
@@ -1,657 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
-import androidx.annotation.NonNull;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.SimpleItemAnimator;
-import android.view.View;
-import android.view.ViewPropertyAnimator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by phillip on 02.10.17.
- */
-
-public class SafeDefaultItemAnimator extends SimpleItemAnimator {
-    private static final boolean DEBUG = false;
-
-    private static TimeInterpolator sDefaultInterpolator;
-
-    private ArrayList<RecyclerView.ViewHolder> mPendingRemovals = new ArrayList<>();
-    private ArrayList<RecyclerView.ViewHolder> mPendingAdditions = new ArrayList<>();
-    private ArrayList<SafeDefaultItemAnimator.MoveInfo> mPendingMoves = new ArrayList<>();
-    private ArrayList<SafeDefaultItemAnimator.ChangeInfo> mPendingChanges = new ArrayList<>();
-
-    ArrayList<ArrayList<RecyclerView.ViewHolder>> mAdditionsList = new ArrayList<>();
-    ArrayList<ArrayList<SafeDefaultItemAnimator.MoveInfo>> mMovesList = new ArrayList<>();
-    ArrayList<ArrayList<SafeDefaultItemAnimator.ChangeInfo>> mChangesList = new ArrayList<>();
-
-    ArrayList<RecyclerView.ViewHolder> mAddAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mMoveAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mRemoveAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mChangeAnimations = new ArrayList<>();
-
-    private static class MoveInfo {
-        public RecyclerView.ViewHolder holder;
-        public int fromX, fromY, toX, toY;
-
-        MoveInfo(RecyclerView.ViewHolder holder, int fromX, int fromY, int toX, int toY) {
-            this.holder = holder;
-            this.fromX = fromX;
-            this.fromY = fromY;
-            this.toX = toX;
-            this.toY = toY;
-        }
-    }
-
-    private static class ChangeInfo {
-        public RecyclerView.ViewHolder oldHolder, newHolder;
-        public int fromX, fromY, toX, toY;
-        private ChangeInfo(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder) {
-            this.oldHolder = oldHolder;
-            this.newHolder = newHolder;
-        }
-
-        ChangeInfo(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,
-                   int fromX, int fromY, int toX, int toY) {
-            this(oldHolder, newHolder);
-            this.fromX = fromX;
-            this.fromY = fromY;
-            this.toX = toX;
-            this.toY = toY;
-        }
-
-        @Override
-        public String toString() {
-            return "ChangeInfo{"
-                    + "oldHolder=" + oldHolder
-                    + ", newHolder=" + newHolder
-                    + ", fromX=" + fromX
-                    + ", fromY=" + fromY
-                    + ", toX=" + toX
-                    + ", toY=" + toY
-                    + '}';
-        }
-    }
-
-    @Override
-    public void runPendingAnimations() {
-        boolean removalsPending = !mPendingRemovals.isEmpty();
-        boolean movesPending = !mPendingMoves.isEmpty();
-        boolean changesPending = !mPendingChanges.isEmpty();
-        boolean additionsPending = !mPendingAdditions.isEmpty();
-        if (!removalsPending && !movesPending && !additionsPending && !changesPending) {
-            // nothing to animate
-            return;
-        }
-        // First, remove stuff
-        for (RecyclerView.ViewHolder holder : mPendingRemovals) {
-            animateRemoveImpl(holder);
-        }
-        mPendingRemovals.clear();
-        // Next, move stuff
-        if (movesPending) {
-            final ArrayList<SafeDefaultItemAnimator.MoveInfo> moves = new ArrayList<>();
-            moves.addAll(mPendingMoves);
-            mMovesList.add(moves);
-            mPendingMoves.clear();
-            Runnable mover = new Runnable() {
-                @Override
-                public void run() {
-                    for (SafeDefaultItemAnimator.MoveInfo moveInfo : moves) {
-                        animateMoveImpl(moveInfo.holder, moveInfo.fromX, moveInfo.fromY,
-                                moveInfo.toX, moveInfo.toY);
-                    }
-                    moves.clear();
-                    mMovesList.remove(moves);
-                }
-            };
-            if (removalsPending) {
-                RecyclerView.ViewHolder holder = moves.get(0).holder;
-                if (holder != null) {
-                    View view = holder.itemView;
-                    ViewCompat.postOnAnimationDelayed(view, mover, getRemoveDuration());
-                }
-            } else {
-                mover.run();
-            }
-        }
-        // Next, change stuff, to run in parallel with move animations
-        if (changesPending) {
-            final ArrayList<SafeDefaultItemAnimator.ChangeInfo> changes = new ArrayList<>();
-            changes.addAll(mPendingChanges);
-            mChangesList.add(changes);
-            mPendingChanges.clear();
-            Runnable changer = new Runnable() {
-                @Override
-                public void run() {
-                    for (SafeDefaultItemAnimator.ChangeInfo change : changes) {
-                        animateChangeImpl(change);
-                    }
-                    changes.clear();
-                    mChangesList.remove(changes);
-                }
-            };
-            if (removalsPending) {
-                RecyclerView.ViewHolder holder = changes.get(0).oldHolder;
-                if (holder != null) {
-                    ViewCompat.postOnAnimationDelayed(holder.itemView, changer, getRemoveDuration());
-                }
-            } else {
-                changer.run();
-            }
-        }
-        // Next, add stuff
-        if (additionsPending) {
-            final ArrayList<RecyclerView.ViewHolder> additions = new ArrayList<>();
-            additions.addAll(mPendingAdditions);
-            mAdditionsList.add(additions);
-            mPendingAdditions.clear();
-            Runnable adder = new Runnable() {
-                @Override
-                public void run() {
-                    for (RecyclerView.ViewHolder holder : additions) {
-                        animateAddImpl(holder);
-                    }
-                    additions.clear();
-                    mAdditionsList.remove(additions);
-                }
-            };
-            if (removalsPending || movesPending || changesPending) {
-                long removeDuration = removalsPending ? getRemoveDuration() : 0;
-                long moveDuration = movesPending ? getMoveDuration() : 0;
-                long changeDuration = changesPending ? getChangeDuration() : 0;
-                long totalDelay = removeDuration + Math.max(moveDuration, changeDuration);
-                if (additions.get(0) != null) {
-                    View view = additions.get(0).itemView;
-                    ViewCompat.postOnAnimationDelayed(view, adder, totalDelay);
-                }
-            } else {
-                adder.run();
-            }
-        }
-    }
-
-    @Override
-    public boolean animateRemove(final RecyclerView.ViewHolder holder) {
-        resetAnimation(holder);
-        mPendingRemovals.add(holder);
-        return true;
-    }
-
-    private void animateRemoveImpl(final RecyclerView.ViewHolder holder) {
-        final View view = holder.itemView;
-        final ViewPropertyAnimator animation = view.animate();
-        mRemoveAnimations.add(holder);
-        animation.setDuration(getRemoveDuration()).alpha(0).setListener(
-                new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animator) {
-                        dispatchRemoveStarting(holder);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animator) {
-                        animation.setListener(null);
-                        view.setAlpha(1);
-                        dispatchRemoveFinished(holder);
-                        mRemoveAnimations.remove(holder);
-                        dispatchFinishedWhenDone();
-                    }
-                }).start();
-    }
-
-    @Override
-    public boolean animateAdd(final RecyclerView.ViewHolder holder) {
-        resetAnimation(holder);
-        holder.itemView.setAlpha(0);
-        mPendingAdditions.add(holder);
-        return true;
-    }
-
-    void animateAddImpl(final RecyclerView.ViewHolder holder) {
-        final View view = holder.itemView;
-        final ViewPropertyAnimator animation = view.animate();
-        mAddAnimations.add(holder);
-        animation.alpha(1).setDuration(getAddDuration())
-                .setListener(new AnimatorListenerAdapter() {
-                    @Override
-                    public void onAnimationStart(Animator animator) {
-                        dispatchAddStarting(holder);
-                    }
-
-                    @Override
-                    public void onAnimationCancel(Animator animator) {
-                        view.setAlpha(1);
-                    }
-
-                    @Override
-                    public void onAnimationEnd(Animator animator) {
-                        animation.setListener(null);
-                        dispatchAddFinished(holder);
-                        mAddAnimations.remove(holder);
-                        dispatchFinishedWhenDone();
-                    }
-                }).start();
-    }
-
-    @Override
-    public boolean animateMove(final RecyclerView.ViewHolder holder, int fromX, int fromY,
-                               int toX, int toY) {
-        final View view = holder.itemView;
-        fromX += (int) holder.itemView.getTranslationX();
-        fromY += (int) holder.itemView.getTranslationY();
-        resetAnimation(holder);
-        int deltaX = toX - fromX;
-        int deltaY = toY - fromY;
-        if (deltaX == 0 && deltaY == 0) {
-            dispatchMoveFinished(holder);
-            return false;
-        }
-        if (deltaX != 0) {
-            view.setTranslationX(-deltaX);
-        }
-        if (deltaY != 0) {
-            view.setTranslationY(-deltaY);
-        }
-        mPendingMoves.add(new SafeDefaultItemAnimator.MoveInfo(holder, fromX, fromY, toX, toY));
-        return true;
-    }
-
-    void animateMoveImpl(final RecyclerView.ViewHolder holder, int fromX, int fromY, int toX, int toY) {
-        final View view = holder.itemView;
-        final int deltaX = toX - fromX;
-        final int deltaY = toY - fromY;
-        if (deltaX != 0) {
-            view.animate().translationX(0);
-        }
-        if (deltaY != 0) {
-            view.animate().translationY(0);
-        }
-        // TODO: make EndActions end listeners instead, since end actions aren't called when
-        // vpas are canceled (and can't end them. why?)
-        // need listener functionality in VPACompat for this. Ick.
-        final ViewPropertyAnimator animation = view.animate();
-        mMoveAnimations.add(holder);
-        animation.setDuration(getMoveDuration()).setListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animator) {
-                dispatchMoveStarting(holder);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animator) {
-                if (deltaX != 0) {
-                    view.setTranslationX(0);
-                }
-                if (deltaY != 0) {
-                    view.setTranslationY(0);
-                }
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animator) {
-                animation.setListener(null);
-                dispatchMoveFinished(holder);
-                mMoveAnimations.remove(holder);
-                dispatchFinishedWhenDone();
-            }
-        }).start();
-    }
-
-    @Override
-    public boolean animateChange(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,
-                                 int fromX, int fromY, int toX, int toY) {
-        if (oldHolder == newHolder) {
-            // Don't know how to run change animations when the same view holder is re-used.
-            // run a move animation to handle position changes.
-            return animateMove(oldHolder, fromX, fromY, toX, toY);
-        }
-        final float prevTranslationX = oldHolder.itemView.getTranslationX();
-        final float prevTranslationY = oldHolder.itemView.getTranslationY();
-        final float prevAlpha = oldHolder.itemView.getAlpha();
-        resetAnimation(oldHolder);
-        int deltaX = (int) (toX - fromX - prevTranslationX);
-        int deltaY = (int) (toY - fromY - prevTranslationY);
-        // recover prev translation state after ending animation
-        oldHolder.itemView.setTranslationX(prevTranslationX);
-        oldHolder.itemView.setTranslationY(prevTranslationY);
-        oldHolder.itemView.setAlpha(prevAlpha);
-        if (newHolder != null) {
-            // carry over translation values
-            resetAnimation(newHolder);
-            newHolder.itemView.setTranslationX(-deltaX);
-            newHolder.itemView.setTranslationY(-deltaY);
-            newHolder.itemView.setAlpha(0);
-        }
-        mPendingChanges.add(new SafeDefaultItemAnimator.ChangeInfo(oldHolder, newHolder, fromX, fromY, toX, toY));
-        return true;
-    }
-
-    void animateChangeImpl(final SafeDefaultItemAnimator.ChangeInfo changeInfo) {
-        final RecyclerView.ViewHolder holder = changeInfo.oldHolder;
-        final View view = holder == null ? null : holder.itemView;
-        final RecyclerView.ViewHolder newHolder = changeInfo.newHolder;
-        final View newView = newHolder != null ? newHolder.itemView : null;
-        if (view != null) {
-            final ViewPropertyAnimator oldViewAnim = view.animate().setDuration(
-                    getChangeDuration());
-            mChangeAnimations.add(changeInfo.oldHolder);
-            oldViewAnim.translationX(changeInfo.toX - changeInfo.fromX);
-            oldViewAnim.translationY(changeInfo.toY - changeInfo.fromY);
-            oldViewAnim.alpha(0).setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animator) {
-                    dispatchChangeStarting(changeInfo.oldHolder, true);
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    oldViewAnim.setListener(null);
-                    view.setAlpha(1);
-                    view.setTranslationX(0);
-                    view.setTranslationY(0);
-                    dispatchChangeFinished(changeInfo.oldHolder, true);
-                    mChangeAnimations.remove(changeInfo.oldHolder);
-                    dispatchFinishedWhenDone();
-                }
-            }).start();
-        }
-        if (newView != null) {
-            final ViewPropertyAnimator newViewAnimation = newView.animate();
-            mChangeAnimations.add(changeInfo.newHolder);
-            newViewAnimation.translationX(0).translationY(0).setDuration(getChangeDuration())
-                    .alpha(1).setListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animator) {
-                    dispatchChangeStarting(changeInfo.newHolder, false);
-                }
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    newViewAnimation.setListener(null);
-                    newView.setAlpha(1);
-                    newView.setTranslationX(0);
-                    newView.setTranslationY(0);
-                    dispatchChangeFinished(changeInfo.newHolder, false);
-                    mChangeAnimations.remove(changeInfo.newHolder);
-                    dispatchFinishedWhenDone();
-                }
-            }).start();
-        }
-    }
-
-    private void endChangeAnimation(List<SafeDefaultItemAnimator.ChangeInfo> infoList, RecyclerView.ViewHolder item) {
-        for (int i = infoList.size() - 1; i >= 0; i--) {
-            SafeDefaultItemAnimator.ChangeInfo changeInfo = infoList.get(i);
-            if (endChangeAnimationIfNecessary(changeInfo, item)) {
-                if (changeInfo.oldHolder == null && changeInfo.newHolder == null) {
-                    infoList.remove(changeInfo);
-                }
-            }
-        }
-    }
-
-    private void endChangeAnimationIfNecessary(SafeDefaultItemAnimator.ChangeInfo changeInfo) {
-        if (changeInfo.oldHolder != null) {
-            endChangeAnimationIfNecessary(changeInfo, changeInfo.oldHolder);
-        }
-        if (changeInfo.newHolder != null) {
-            endChangeAnimationIfNecessary(changeInfo, changeInfo.newHolder);
-        }
-    }
-    private boolean endChangeAnimationIfNecessary(SafeDefaultItemAnimator.ChangeInfo changeInfo, RecyclerView.ViewHolder item) {
-        boolean oldItem = false;
-        if (changeInfo.newHolder == item) {
-            changeInfo.newHolder = null;
-        } else if (changeInfo.oldHolder == item) {
-            changeInfo.oldHolder = null;
-            oldItem = true;
-        } else {
-            return false;
-        }
-        item.itemView.setAlpha(1);
-        item.itemView.setTranslationX(0);
-        item.itemView.setTranslationY(0);
-        dispatchChangeFinished(item, oldItem);
-        return true;
-    }
-
-    @Override
-    public void endAnimation(RecyclerView.ViewHolder item) {
-        final View view = item.itemView;
-        // this will trigger end callback which should set properties to their target values.
-        view.animate().cancel();
-        // TODO if some other animations are chained to end, how do we cancel them as well?
-        for (int i = mPendingMoves.size() - 1; i >= 0; i--) {
-            SafeDefaultItemAnimator.MoveInfo moveInfo = mPendingMoves.get(i);
-            if (moveInfo.holder == item) {
-                view.setTranslationY(0);
-                view.setTranslationX(0);
-                dispatchMoveFinished(item);
-                mPendingMoves.remove(i);
-            }
-        }
-        endChangeAnimation(mPendingChanges, item);
-        if (mPendingRemovals.remove(item)) {
-            view.setAlpha(1);
-            dispatchRemoveFinished(item);
-        }
-        if (mPendingAdditions.remove(item)) {
-            view.setAlpha(1);
-            dispatchAddFinished(item);
-        }
-
-        for (int i = mChangesList.size() - 1; i >= 0; i--) {
-            ArrayList<SafeDefaultItemAnimator.ChangeInfo> changes = mChangesList.get(i);
-            endChangeAnimation(changes, item);
-            if (changes.isEmpty()) {
-                mChangesList.remove(i);
-            }
-        }
-        for (int i = mMovesList.size() - 1; i >= 0; i--) {
-            ArrayList<SafeDefaultItemAnimator.MoveInfo> moves = mMovesList.get(i);
-            for (int j = moves.size() - 1; j >= 0; j--) {
-                SafeDefaultItemAnimator.MoveInfo moveInfo = moves.get(j);
-                if (moveInfo.holder == item) {
-                    view.setTranslationY(0);
-                    view.setTranslationX(0);
-                    dispatchMoveFinished(item);
-                    moves.remove(j);
-                    if (moves.isEmpty()) {
-                        mMovesList.remove(i);
-                    }
-                    break;
-                }
-            }
-        }
-        for (int i = mAdditionsList.size() - 1; i >= 0; i--) {
-            ArrayList<RecyclerView.ViewHolder> additions = mAdditionsList.get(i);
-            if (additions.remove(item)) {
-                view.setAlpha(1);
-                dispatchAddFinished(item);
-                if (additions.isEmpty()) {
-                    mAdditionsList.remove(i);
-                }
-            }
-        }
-
-        // animations should be ended by the cancel above.
-        //noinspection PointlessBooleanExpression,ConstantConditions
-        if (mRemoveAnimations.remove(item) && DEBUG) {
-            throw new IllegalStateException("after animation is cancelled, item should not be in "
-                    + "mRemoveAnimations list");
-        }
-
-        //noinspection PointlessBooleanExpression,ConstantConditions
-        if (mAddAnimations.remove(item) && DEBUG) {
-            throw new IllegalStateException("after animation is cancelled, item should not be in "
-                    + "mAddAnimations list");
-        }
-
-        //noinspection PointlessBooleanExpression,ConstantConditions
-        if (mChangeAnimations.remove(item) && DEBUG) {
-            throw new IllegalStateException("after animation is cancelled, item should not be in "
-                    + "mChangeAnimations list");
-        }
-
-        //noinspection PointlessBooleanExpression,ConstantConditions
-        if (mMoveAnimations.remove(item) && DEBUG) {
-            throw new IllegalStateException("after animation is cancelled, item should not be in "
-                    + "mMoveAnimations list");
-        }
-        dispatchFinishedWhenDone();
-    }
-
-    private void resetAnimation(RecyclerView.ViewHolder holder) {
-        if (sDefaultInterpolator == null) {
-            sDefaultInterpolator = new ValueAnimator().getInterpolator();
-        }
-        holder.itemView.animate().setInterpolator(sDefaultInterpolator);
-        endAnimation(holder);
-    }
-
-    @Override
-    public boolean isRunning() {
-        return (!mPendingAdditions.isEmpty()
-                || !mPendingChanges.isEmpty()
-                || !mPendingMoves.isEmpty()
-                || !mPendingRemovals.isEmpty()
-                || !mMoveAnimations.isEmpty()
-                || !mRemoveAnimations.isEmpty()
-                || !mAddAnimations.isEmpty()
-                || !mChangeAnimations.isEmpty()
-                || !mMovesList.isEmpty()
-                || !mAdditionsList.isEmpty()
-                || !mChangesList.isEmpty());
-    }
-
-    /**
-     * Check the state of currently pending and running animations. If there are none
-     * pending/running, call {@link #dispatchAnimationsFinished()} to notify any
-     * listeners.
-     */
-    void dispatchFinishedWhenDone() {
-        if (!isRunning()) {
-            dispatchAnimationsFinished();
-        }
-    }
-
-    @Override
-    public void endAnimations() {
-        int count = mPendingMoves.size();
-        for (int i = count - 1; i >= 0; i--) {
-            SafeDefaultItemAnimator.MoveInfo item = mPendingMoves.get(i);
-            View view = item.holder.itemView;
-            view.setTranslationY(0);
-            view.setTranslationX(0);
-            dispatchMoveFinished(item.holder);
-            mPendingMoves.remove(i);
-        }
-        count = mPendingRemovals.size();
-        for (int i = count - 1; i >= 0; i--) {
-            RecyclerView.ViewHolder item = mPendingRemovals.get(i);
-            dispatchRemoveFinished(item);
-            mPendingRemovals.remove(i);
-        }
-        count = mPendingAdditions.size();
-        for (int i = count - 1; i >= 0; i--) {
-            RecyclerView.ViewHolder item = mPendingAdditions.get(i);
-            item.itemView.setAlpha(1);
-            dispatchAddFinished(item);
-            mPendingAdditions.remove(i);
-        }
-        count = mPendingChanges.size();
-        for (int i = count - 1; i >= 0; i--) {
-            endChangeAnimationIfNecessary(mPendingChanges.get(i));
-        }
-        mPendingChanges.clear();
-        if (!isRunning()) {
-            return;
-        }
-
-        int listCount = mMovesList.size();
-        for (int i = listCount - 1; i >= 0; i--) {
-            ArrayList<SafeDefaultItemAnimator.MoveInfo> moves = mMovesList.get(i);
-            count = moves.size();
-            for (int j = count - 1; j >= 0; j--) {
-                SafeDefaultItemAnimator.MoveInfo moveInfo = moves.get(j);
-                RecyclerView.ViewHolder item = moveInfo.holder;
-                View view = item.itemView;
-                view.setTranslationY(0);
-                view.setTranslationX(0);
-                dispatchMoveFinished(moveInfo.holder);
-                moves.remove(j);
-                if (moves.isEmpty()) {
-                    mMovesList.remove(moves);
-                }
-            }
-        }
-        listCount = mAdditionsList.size();
-        for (int i = listCount - 1; i >= 0; i--) {
-            ArrayList<RecyclerView.ViewHolder> additions = mAdditionsList.get(i);
-            count = additions.size();
-            for (int j = count - 1; j >= 0; j--) {
-                RecyclerView.ViewHolder item = additions.get(j);
-                View view = item.itemView;
-                view.setAlpha(1);
-                dispatchAddFinished(item);
-                additions.remove(j);
-                if (additions.isEmpty()) {
-                    mAdditionsList.remove(additions);
-                }
-            }
-        }
-        listCount = mChangesList.size();
-        for (int i = listCount - 1; i >= 0; i--) {
-            ArrayList<SafeDefaultItemAnimator.ChangeInfo> changes = mChangesList.get(i);
-            count = changes.size();
-            for (int j = count - 1; j >= 0; j--) {
-                endChangeAnimationIfNecessary(changes.get(j));
-                if (changes.isEmpty()) {
-                    mChangesList.remove(changes);
-                }
-            }
-        }
-
-        cancelAll(mRemoveAnimations);
-        cancelAll(mMoveAnimations);
-        cancelAll(mAddAnimations);
-        cancelAll(mChangeAnimations);
-
-        dispatchAnimationsFinished();
-    }
-
-    void cancelAll(List<RecyclerView.ViewHolder> viewHolders) {
-        for (int i = viewHolders.size() - 1; i >= 0; i--) {
-            viewHolders.get(i).itemView.animate().cancel();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * If the payload list is not empty, SafeDefaultItemAnimator returns <code>true</code>.
-     * When this is the case:
-     * <ul>
-     * <li>If you override {@link #animateChange(RecyclerView.ViewHolder, RecyclerView.ViewHolder, int, int, int, int)}, both
-     * ViewHolder arguments will be the same instance.
-     * </li>
-     * <li>
-     * If you are not overriding {@link #animateChange(RecyclerView.ViewHolder, RecyclerView.ViewHolder, int, int, int, int)},
-     * then SafeDefaultItemAnimator will call {@link #animateMove(RecyclerView.ViewHolder, int, int, int, int)} and
-     * run a move animation instead.
-     * </li>
-     * </ul>
-     */
-    @Override
-    public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder,
-                                             @NonNull List<Object> payloads) {
-        return !payloads.isEmpty() || super.canReuseUpdatedViewHolder(viewHolder, payloads);
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
new file mode 100644
index 000000000..8495528fa
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
@@ -0,0 +1,609 @@
+package com.habitrpg.android.habitica.ui.helpers
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.TimeInterpolator
+import android.animation.ValueAnimator
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
+import java.util.*
+
+/**
+ * Created by phillip on 02.10.17.
+ */
+
+class SafeDefaultItemAnimator : SimpleItemAnimator() {
+
+    private val pendingRemovals = ArrayList<RecyclerView.ViewHolder>()
+    private val pendingAdditions = ArrayList<RecyclerView.ViewHolder>()
+    private val pendingMoves = ArrayList<MoveInfo>()
+    private val pendingChanges = ArrayList<ChangeInfo>()
+
+    private val additionsList = ArrayList<ArrayList<RecyclerView.ViewHolder>>()
+    private val movesList = ArrayList<ArrayList<MoveInfo>>()
+    private val changesList = ArrayList<ArrayList<ChangeInfo>>()
+
+    private val addAnimations = ArrayList<RecyclerView.ViewHolder>()
+    private val moveAnimations = ArrayList<RecyclerView.ViewHolder>()
+    private val removeAnimations = ArrayList<RecyclerView.ViewHolder>()
+    private val changeAnimations = ArrayList<RecyclerView.ViewHolder>()
+
+    var skipAnimations: Boolean = false
+
+    private class MoveInfo internal constructor(var holder: RecyclerView.ViewHolder?, internal var fromX: Int, internal var fromY: Int, internal var toX: Int, internal var toY: Int)
+
+    private class ChangeInfo private constructor(internal var oldHolder: RecyclerView.ViewHolder?, internal var newHolder: RecyclerView.ViewHolder?) {
+        internal var fromX: Int = 0
+        internal var fromY: Int = 0
+        internal var toX: Int = 0
+        internal var toY: Int = 0
+
+        internal constructor(oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder,
+                             fromX: Int, fromY: Int, toX: Int, toY: Int) : this(oldHolder, newHolder) {
+            this.fromX = fromX
+            this.fromY = fromY
+            this.toX = toX
+            this.toY = toY
+        }
+
+        override fun toString(): String {
+            return ("ChangeInfo{"
+                    + "oldHolder=" + oldHolder
+                    + ", newHolder=" + newHolder
+                    + ", fromX=" + fromX
+                    + ", fromY=" + fromY
+                    + ", toX=" + toX
+                    + ", toY=" + toY
+                    + '}'.toString())
+        }
+    }
+
+    override fun runPendingAnimations() {
+        val removalsPending = pendingRemovals.isNotEmpty()
+        val movesPending = pendingMoves.isNotEmpty()
+        val changesPending = pendingChanges.isNotEmpty()
+        val additionsPending = pendingAdditions.isNotEmpty()
+        if (!removalsPending && !movesPending && !additionsPending && !changesPending) {
+            // nothing to animate
+            return
+        }
+        if (skipAnimations) {
+            return
+        }
+        // First, remove stuff
+        for (holder in pendingRemovals) {
+            animateRemoveImpl(holder)
+        }
+        pendingRemovals.clear()
+        // Next, move stuff
+        if (movesPending) {
+            val moves = ArrayList(pendingMoves)
+            movesList.add(moves)
+            pendingMoves.clear()
+            val mover = Runnable {
+                for (moveInfo in moves) {
+                    moveInfo.holder?.let { animateMoveImpl(it, moveInfo.fromX, moveInfo.fromY,
+                            moveInfo.toX, moveInfo.toY) }
+                }
+                moves.clear()
+                movesList.remove(moves)
+            }
+            if (removalsPending) {
+                val holder = moves[0].holder
+                if (holder != null) {
+                    val view = holder.itemView
+                    ViewCompat.postOnAnimationDelayed(view, mover, removeDuration)
+                }
+            } else {
+                mover.run()
+            }
+        }
+        // Next, change stuff, to run in parallel with move animations
+        if (changesPending) {
+
+            val changes = ArrayList(pendingChanges)
+            changesList.add(changes)
+            pendingChanges.clear()
+            val changer = Runnable {
+                for (change in changes) {
+                    animateChangeImpl(change)
+                }
+                changes.clear()
+                changesList.remove(changes)
+            }
+            if (removalsPending) {
+                val holder = changes[0].oldHolder
+                if (holder != null) {
+                    ViewCompat.postOnAnimationDelayed(holder.itemView, changer, removeDuration)
+                }
+            } else {
+                changer.run()
+            }
+        }
+        // Next, add stuff
+        if (additionsPending) {
+            val additions = ArrayList(pendingAdditions)
+            additionsList.add(additions)
+            pendingAdditions.clear()
+            val adder = Runnable {
+                for (holder in additions) {
+                    animateAddImpl(holder)
+                }
+                additions.clear()
+                additionsList.remove(additions)
+            }
+            if (removalsPending || movesPending || changesPending) {
+                val removeDuration = if (removalsPending) removeDuration else 0
+                val moveDuration = if (movesPending) moveDuration else 0
+                val changeDuration = if (changesPending) changeDuration else 0
+                val totalDelay = removeDuration + moveDuration.coerceAtLeast(changeDuration)
+                if (additions[0] != null) {
+                    val view = additions[0].itemView
+                    ViewCompat.postOnAnimationDelayed(view, adder, totalDelay)
+                }
+            } else {
+                adder.run()
+            }
+        }
+    }
+
+    override fun animateRemove(holder: RecyclerView.ViewHolder): Boolean {
+        resetAnimation(holder)
+        pendingRemovals.add(holder)
+        return true
+    }
+
+    private fun animateRemoveImpl(holder: RecyclerView.ViewHolder) {
+        val view = holder.itemView
+        val animation = view.animate()
+        removeAnimations.add(holder)
+        animation.setDuration(removeDuration).alpha(0f).setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationStart(animator: Animator) {
+                        dispatchRemoveStarting(holder)
+                    }
+
+                    override fun onAnimationEnd(animator: Animator) {
+                        animation.setListener(null)
+                        view.alpha = 1f
+                        dispatchRemoveFinished(holder)
+                        removeAnimations.remove(holder)
+                        dispatchFinishedWhenDone()
+                    }
+                }).start()
+    }
+
+    override fun animateAdd(holder: RecyclerView.ViewHolder): Boolean {
+        resetAnimation(holder)
+        holder.itemView.alpha = 0f
+        pendingAdditions.add(holder)
+        return true
+    }
+
+    private fun animateAddImpl(holder: RecyclerView.ViewHolder) {
+        val view = holder.itemView
+        val animation = view.animate()
+        addAnimations.add(holder)
+        animation.alpha(1f).setDuration(addDuration)
+                .setListener(object : AnimatorListenerAdapter() {
+                    override fun onAnimationStart(animator: Animator) {
+                        dispatchAddStarting(holder)
+                    }
+
+                    override fun onAnimationCancel(animator: Animator) {
+                        view.alpha = 1f
+                    }
+
+                    override fun onAnimationEnd(animator: Animator) {
+                        animation.setListener(null)
+                        dispatchAddFinished(holder)
+                        addAnimations.remove(holder)
+                        dispatchFinishedWhenDone()
+                    }
+                }).start()
+    }
+
+    override fun animateMove(holder: RecyclerView.ViewHolder, fromX: Int, fromY: Int,
+                             toX: Int, toY: Int): Boolean {
+        var newFromX = fromX
+        var newFromY = fromY
+        val view = holder.itemView
+        newFromX += holder.itemView.translationX.toInt()
+        newFromY += holder.itemView.translationY.toInt()
+        resetAnimation(holder)
+        val deltaX = toX - newFromX
+        val deltaY = toY - newFromY
+        if (deltaX == 0 && deltaY == 0) {
+            dispatchMoveFinished(holder)
+            return false
+        }
+        if (deltaX != 0) {
+            view.translationX = (-deltaX).toFloat()
+        }
+        if (deltaY != 0) {
+            view.translationY = (-deltaY).toFloat()
+        }
+        HLogger.log(LogLevel.INFO, "Moving1", "$toX, $fromX, $deltaX")
+        HLogger.log(LogLevel.INFO, "Moving1", "$toX, $fromX, $deltaX")
+        pendingMoves.add(MoveInfo(holder, newFromX, newFromY, toX, toY))
+        return true
+    }
+
+    private fun animateMoveImpl(holder: RecyclerView.ViewHolder, fromX: Int, fromY: Int, toX: Int, toY: Int) {
+        val view = holder.itemView
+        val deltaX = toX - fromX
+        val deltaY = toY - fromY
+        if (deltaX != 0) {
+            view.animate().translationX(0f)
+        }
+        if (deltaY != 0) {
+            view.animate().translationY(0f)
+        }
+        HLogger.log(LogLevel.INFO, "Moving", "$toX, $fromX, $deltaX")
+        HLogger.log(LogLevel.INFO, "Moving", "$toX, $fromX, $deltaX")
+        // vpas are canceled (and can't end them. why?)
+        // need listener functionality in VPACompat for this. Ick.
+        val animation = view.animate()
+        moveAnimations.add(holder)
+        animation.setDuration(moveDuration).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationStart(animator: Animator) {
+                dispatchMoveStarting(holder)
+            }
+
+            override fun onAnimationCancel(animator: Animator) {
+                if (deltaX != 0) {
+                    view.translationX = 0f
+                }
+                if (deltaY != 0) {
+                    view.translationY = 0f
+                }
+            }
+
+            override fun onAnimationEnd(animator: Animator) {
+                animation.setListener(null)
+                dispatchMoveFinished(holder)
+                moveAnimations.remove(holder)
+                dispatchFinishedWhenDone()
+            }
+        }).start()
+    }
+
+    override fun animateChange(oldHolder: RecyclerView.ViewHolder, newHolder: RecyclerView.ViewHolder?,
+                               fromX: Int, fromY: Int, toX: Int, toY: Int): Boolean {
+        if (oldHolder === newHolder) {
+            // Don't know how to run change animations when the same view holder is re-used.
+            // run a move animation to handle position changes.
+            return animateMove(oldHolder, fromX, fromY, toX, toY)
+        }
+        val prevTranslationX = oldHolder.itemView.translationX
+        val prevTranslationY = oldHolder.itemView.translationY
+        val prevAlpha = oldHolder.itemView.alpha
+        resetAnimation(oldHolder)
+        val deltaX = (toX.toFloat() - fromX.toFloat() - prevTranslationX).toInt()
+        val deltaY = (toY.toFloat() - fromY.toFloat() - prevTranslationY).toInt()
+        // recover prev translation state after ending animation
+        oldHolder.itemView.translationX = prevTranslationX
+        oldHolder.itemView.translationY = prevTranslationY
+        oldHolder.itemView.alpha = prevAlpha
+        if (newHolder != null) {
+            // carry over translation values
+            resetAnimation(newHolder)
+            newHolder.itemView.translationX = (-deltaX).toFloat()
+            newHolder.itemView.translationY = (-deltaY).toFloat()
+            newHolder.itemView.alpha = 0f
+        }
+        HLogger.log(LogLevel.INFO, "Changing", "$toX, $fromX, $deltaX")
+        HLogger.log(LogLevel.INFO, "Changing", "$toX, $fromX, $deltaX")
+        newHolder?.let { pendingChanges.add(ChangeInfo(oldHolder, it, fromX, fromY, toX, toY)) }
+        return true
+    }
+
+    private fun animateChangeImpl(changeInfo: ChangeInfo) {
+        val holder = changeInfo.oldHolder
+        val view = holder?.itemView
+        val newHolder = changeInfo.newHolder
+        val newView = newHolder?.itemView
+        if (view != null) {
+            val oldViewAnim = view.animate().setDuration(
+                    changeDuration)
+            changeInfo.oldHolder?.let { changeAnimations.add(it) }
+            oldViewAnim.translationX((changeInfo.toX - changeInfo.fromX).toFloat())
+            oldViewAnim.translationY((changeInfo.toY - changeInfo.fromY).toFloat())
+            oldViewAnim.alpha(0f).setListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationStart(animator: Animator) {
+                    dispatchChangeStarting(changeInfo.oldHolder, true)
+                }
+
+                override fun onAnimationEnd(animator: Animator) {
+                    oldViewAnim.setListener(null)
+                    view.alpha = 1f
+                    view.translationX = 0f
+                    view.translationY = 0f
+                    dispatchChangeFinished(changeInfo.oldHolder, true)
+                    changeInfo.oldHolder?.let { changeAnimations.add(it) }
+                    dispatchFinishedWhenDone()
+                }
+            }).start()
+        }
+        if (newView != null) {
+            val newViewAnimation = newView.animate()
+            changeInfo.newHolder?.let { changeAnimations.add(it) }
+            newViewAnimation.translationX(0f).translationY(0f).setDuration(changeDuration)
+                    .alpha(1f).setListener(object : AnimatorListenerAdapter() {
+                        override fun onAnimationStart(animator: Animator) {
+                            dispatchChangeStarting(changeInfo.newHolder, false)
+                        }
+
+                        override fun onAnimationEnd(animator: Animator) {
+                            newViewAnimation.setListener(null)
+                            newView.alpha = 1f
+                            newView.translationX = 0f
+                            newView.translationY = 0f
+                            dispatchChangeFinished(changeInfo.newHolder, false)
+                            changeInfo.newHolder?.let { changeAnimations.add(it) }
+                            dispatchFinishedWhenDone()
+                        }
+                    }).start()
+        }
+    }
+
+    private fun endChangeAnimation(infoList: MutableList<ChangeInfo>, item: RecyclerView.ViewHolder) {
+        for (i in infoList.indices.reversed()) {
+            val changeInfo = infoList[i]
+            if (endChangeAnimationIfNecessary(changeInfo, item)) {
+                if (changeInfo.oldHolder == null && changeInfo.newHolder == null) {
+                    infoList.remove(changeInfo)
+                }
+            }
+        }
+    }
+
+    private fun endChangeAnimationIfNecessary(changeInfo: ChangeInfo) {
+        if (changeInfo.oldHolder != null) {
+            endChangeAnimationIfNecessary(changeInfo, changeInfo.oldHolder)
+        }
+        if (changeInfo.newHolder != null) {
+            endChangeAnimationIfNecessary(changeInfo, changeInfo.newHolder)
+        }
+    }
+
+    private fun endChangeAnimationIfNecessary(changeInfo: ChangeInfo, item: RecyclerView.ViewHolder?): Boolean {
+        var oldItem = false
+        when {
+            changeInfo.newHolder === item -> changeInfo.newHolder = null
+            changeInfo.oldHolder === item -> {
+                changeInfo.oldHolder = null
+                oldItem = true
+            }
+            else -> return false
+        }
+        item?.itemView?.alpha = 1f
+        item?.itemView?.translationX = 0f
+        item?.itemView?.translationY = 0f
+        dispatchChangeFinished(item, oldItem)
+        return true
+    }
+
+    override fun endAnimation(item: RecyclerView.ViewHolder) {
+        val view = item.itemView
+        // this will trigger end callback which should set properties to their target values.
+        view.animate().cancel()
+        // TODO if some other animations are chained to end, how do we cancel them as well?
+        for (i in pendingMoves.indices.reversed()) {
+            val moveInfo = pendingMoves[i]
+            if (moveInfo.holder === item) {
+                view.translationY = 0f
+                view.translationX = 0f
+                dispatchMoveFinished(item)
+                pendingMoves.removeAt(i)
+            }
+        }
+        endChangeAnimation(pendingChanges, item)
+        if (pendingRemovals.remove(item)) {
+            view.alpha = 1f
+            dispatchRemoveFinished(item)
+        }
+        if (pendingAdditions.remove(item)) {
+            view.alpha = 1f
+            dispatchAddFinished(item)
+        }
+
+        for (i in changesList.indices.reversed()) {
+            val changes = changesList[i]
+            endChangeAnimation(changes, item)
+            if (changes.isEmpty()) {
+                changesList.removeAt(i)
+            }
+        }
+        for (i in movesList.indices.reversed()) {
+            val moves = movesList[i]
+            for (j in moves.indices.reversed()) {
+                val moveInfo = moves[j]
+                if (moveInfo.holder === item) {
+                    view.translationY = 0f
+                    view.translationX = 0f
+                    dispatchMoveFinished(item)
+                    moves.removeAt(j)
+                    if (moves.isEmpty()) {
+                        movesList.removeAt(i)
+                    }
+                    break
+                }
+            }
+        }
+        for (i in additionsList.indices.reversed()) {
+            val additions = additionsList[i]
+            if (additions.remove(item)) {
+                view.alpha = 1f
+                dispatchAddFinished(item)
+                if (additions.isEmpty()) {
+                    additionsList.removeAt(i)
+                }
+            }
+        }
+
+        // animations should be ended by the cancel above.
+        check(!(removeAnimations.remove(item) && DEBUG)) { "after animation is cancelled, item should not be in " + "removeAnimations list" }
+
+        check(!(addAnimations.remove(item) && DEBUG)) { "after animation is cancelled, item should not be in " + "addAnimations list" }
+
+        check(!(changeAnimations.remove(item) && DEBUG)) { "after animation is cancelled, item should not be in " + "changeAnimations list" }
+
+        check(!(moveAnimations.remove(item) && DEBUG)) { "after animation is cancelled, item should not be in " + "moveAnimations list" }
+        dispatchFinishedWhenDone()
+    }
+
+    private fun resetAnimation(holder: RecyclerView.ViewHolder) {
+        if (sDefaultInterpolator == null) {
+            sDefaultInterpolator = ValueAnimator().interpolator
+        }
+        holder.itemView.animate().interpolator = sDefaultInterpolator
+        endAnimation(holder)
+    }
+
+    override fun isRunning(): Boolean {
+        return (pendingAdditions.isNotEmpty()
+                || pendingChanges.isNotEmpty()
+                || pendingMoves.isNotEmpty()
+                || pendingRemovals.isNotEmpty()
+                || moveAnimations.isNotEmpty()
+                || removeAnimations.isNotEmpty()
+                || addAnimations.isNotEmpty()
+                || changeAnimations.isNotEmpty()
+                || movesList.isNotEmpty()
+                || additionsList.isNotEmpty()
+                || changesList.isNotEmpty())
+    }
+
+    /**
+     * Check the state of currently pending and running animations. If there are none
+     * pending/running, call [.dispatchAnimationsFinished] to notify any
+     * listeners.
+     */
+    private fun dispatchFinishedWhenDone() {
+        if (!isRunning) {
+            dispatchAnimationsFinished()
+        }
+    }
+
+    override fun endAnimations() {
+        var count = pendingMoves.size
+        for (i in count - 1 downTo 0) {
+            val item = pendingMoves[i]
+            val view = item.holder?.itemView
+            view?.translationY = 0f
+            view?.translationX = 0f
+            dispatchMoveFinished(item.holder)
+            pendingMoves.removeAt(i)
+        }
+        count = pendingRemovals.size
+        for (i in count - 1 downTo 0) {
+            val item = pendingRemovals[i]
+            dispatchRemoveFinished(item)
+            pendingRemovals.removeAt(i)
+        }
+        count = pendingAdditions.size
+        for (i in count - 1 downTo 0) {
+            val item = pendingAdditions[i]
+            item.itemView.alpha = 1f
+            dispatchAddFinished(item)
+            pendingAdditions.removeAt(i)
+        }
+        count = pendingChanges.size
+        for (i in count - 1 downTo 0) {
+            endChangeAnimationIfNecessary(pendingChanges[i])
+        }
+        pendingChanges.clear()
+        if (!isRunning) {
+            return
+        }
+
+        var listCount = movesList.size
+        for (i in listCount - 1 downTo 0) {
+            val moves = movesList[i]
+            count = moves.size
+            for (j in count - 1 downTo 0) {
+                val moveInfo = moves[j]
+                val item = moveInfo.holder
+                val view = item?.itemView
+                view?.translationY = 0f
+                view?.translationX = 0f
+                dispatchMoveFinished(moveInfo.holder)
+                moves.removeAt(j)
+                if (moves.isEmpty()) {
+                    movesList.remove(moves)
+                }
+            }
+        }
+        listCount = additionsList.size
+        for (i in listCount - 1 downTo 0) {
+            val additions = additionsList[i]
+            count = additions.size
+            for (j in count - 1 downTo 0) {
+                val item = additions[j]
+                val view = item.itemView
+                view.alpha = 1f
+                dispatchAddFinished(item)
+                additions.removeAt(j)
+                if (additions.isEmpty()) {
+                    additionsList.remove(additions)
+                }
+            }
+        }
+        listCount = changesList.size
+        for (i in listCount - 1 downTo 0) {
+            val changes = changesList[i]
+            count = changes.size
+            for (j in count - 1 downTo 0) {
+                endChangeAnimationIfNecessary(changes[j])
+                if (changes.isEmpty()) {
+                    changesList.remove(changes)
+                }
+            }
+        }
+
+        cancelAll(removeAnimations)
+        cancelAll(moveAnimations)
+        cancelAll(addAnimations)
+        cancelAll(changeAnimations)
+
+        dispatchAnimationsFinished()
+    }
+
+    private fun cancelAll(viewHolders: List<RecyclerView.ViewHolder>) {
+        for (i in viewHolders.indices.reversed()) {
+            viewHolders[i].itemView.animate().cancel()
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     *
+     * If the payload list is not empty, SafeDefaultItemAnimator returns `true`.
+     * When this is the case:
+     *
+     *  * If you override [.animateChange], both
+     * ViewHolder arguments will be the same instance.
+     *
+     *  *
+     * If you are not overriding [.animateChange],
+     * then SafeDefaultItemAnimator will call [.animateMove] and
+     * run a move animation instead.
+     *
+     *
+     */
+    override fun canReuseUpdatedViewHolder(viewHolder: RecyclerView.ViewHolder,
+                                           payloads: List<Any>): Boolean {
+        return payloads.isNotEmpty() || super.canReuseUpdatedViewHolder(viewHolder, payloads)
+    }
+
+    companion object {
+        private const val DEBUG = false
+
+        private var sDefaultInterpolator: TimeInterpolator? = null
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java
deleted file mode 100644
index e68f3f340..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import android.annotation.TargetApi;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.widget.AppCompatButton;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-
-public class ViewHelper {
-
-    public static void SetBackgroundTint(Button b, int tint) {
-        if (b instanceof AppCompatButton) {
-            ColorStateList csl = new ColorStateList(new int[][]{new int[0]}, new int[]{tint});
-            AppCompatButton compatButton = (AppCompatButton) b;
-            ViewCompat.setBackgroundTintList(compatButton, csl);
-            return;
-        }
-
-        if (android.os.Build.VERSION.SDK_INT >= 21) {
-            SetBackgroundTintV21(b, tint);
-        }
-    }
-
-    @TargetApi(21)
-    private static void SetBackgroundTintV21(Button b, int tint) {
-
-        ColorStateList csl = new ColorStateList(new int[][]{new int[0]}, new int[]{tint});
-
-        b.setBackgroundTintList(csl);
-    }
-
-    public static void SetBackgroundTint(ImageView v, int tint) {
-        v.setColorFilter(tint, PorterDuff.Mode.SRC);
-    }
-
-    public static void SetBackgroundTint(View v, int tint) {
-        v.getBackground().setColorFilter(tint, PorterDuff.Mode.SRC_OVER);
-    }
-
-    static void SetBackgroundTint(CheckBox c, int tint) {
-        if (c != null) {
-            c.setBackgroundColor(tint);
-        }
-    }
-
-    public static void SetBackground(View v, Drawable d) {
-        if (android.os.Build.VERSION.SDK_INT >= 16) {
-            setBackgroundV16Plus(v, d);
-        } else {
-            setBackgroundV16Minus(v, d);
-        }
-    }
-
-    @TargetApi(16)
-    private static void setBackgroundV16Plus(View view, Drawable drawable) {
-        view.setBackground(drawable);
-
-    }
-
-    @SuppressWarnings("deprecation")
-    private static void setBackgroundV16Minus(View view, Drawable drawable) {
-        view.setBackgroundDrawable(drawable);
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java
deleted file mode 100644
index 0de6ea7ea..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import android.content.Context;
-import androidx.core.content.ContextCompat;
-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;
-
-public class BottomSheetMenuItem {
-
-    private String title;
-    private Boolean isDestructive;
-
-    public BottomSheetMenuItem(String title) {
-        this.title = title;
-        this.isDestructive = false;
-    }
-
-    public BottomSheetMenuItem(String title, Boolean isDestructive) {
-        this.title = title;
-        this.isDestructive = isDestructive;
-    }
-
-    public View inflate(Context context, LayoutInflater inflater, ViewGroup contentView) {
-        LinearLayout menuItemView = (LinearLayout) inflater.inflate(R.layout.menu_bottom_sheet_item, contentView, false);
-        TextView textView = menuItemView.findViewById(R.id.textView);
-        textView.setText(this.title);
-        if (this.isDestructive) {
-            textView.setTextColor(ContextCompat.getColor(context, R.color.red_50));
-        }
-        return menuItemView;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt
new file mode 100644
index 000000000..e03355a25
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt
@@ -0,0 +1,36 @@
+package com.habitrpg.android.habitica.ui.menu
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+
+class BottomSheetMenuItem {
+
+    private var title: String? = null
+    private var isDestructive: Boolean? = null
+
+    constructor(title: String) {
+        this.title = title
+        this.isDestructive = false
+    }
+
+    constructor(title: String, isDestructive: Boolean?) {
+        this.title = title
+        this.isDestructive = isDestructive
+    }
+
+    fun inflate(context: Context, inflater: LayoutInflater, contentView: ViewGroup): View {
+        val menuItemView = inflater.inflate(R.layout.menu_bottom_sheet_item, contentView, false) as? LinearLayout
+        val textView = menuItemView?.findViewById<TextView>(R.id.textView)
+        textView?.text = this.title
+        if (this.isDestructive == true) {
+            textView?.setTextColor(ContextCompat.getColor(context, R.color.red_50))
+        }
+        return menuItemView ?: View(context)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
index 04baf59dc..59f26bd7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.menu
 class HabiticaDrawerItem(val transitionId: Int,val identifier: String, val text: String, val isHeader: Boolean = false, var additionalInfoAsPill: Boolean = true) {
 
     var additionalInfo: String? = null
+    var showBubble: Boolean = false
     var isVisible: Boolean = true
     var isEnabled: Boolean = true
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
new file mode 100644
index 000000000..2f29d743b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -0,0 +1,214 @@
+package com.habitrpg.android.habitica.ui.viewHolders
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.drawable.BitmapDrawable
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getAgoString
+import com.habitrpg.android.habitica.extensions.setScaledPadding
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+import io.reactivex.Maybe
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+class ChatRecyclerViewHolder(itemView: View, private var userId: String, private val isTavern: Boolean) : RecyclerView.ViewHolder(itemView) {
+
+    private val messageWrapper: ViewGroup by bindView(R.id.message_wrapper)
+    private val avatarView: AvatarView by bindView(R.id.avatar_view)
+    private val userLabel: UsernameLabel by bindView(R.id.user_label)
+    private val messageText: HabiticaEmojiTextView by bindView(R.id.message_text)
+    private val sublineTextView: TextView by bindView(R.id.subline_textview)
+    private val likeBackground: LinearLayout by bindView(R.id.like_background_layout)
+    private val tvLikes: TextView by bindView(R.id.tvLikes)
+    private val buttonsWrapper: ViewGroup by bindView(R.id.buttons_wrapper)
+    private val replyButton: Button by bindView(R.id.reply_button)
+    private val copyButton: Button by bindView(R.id.copy_button)
+    private val reportButton: Button by bindView(R.id.report_button)
+    private val deleteButton: Button by bindView(R.id.delete_button)
+    private val modView: TextView by bindView(R.id.mod_view)
+
+    val context: Context = itemView.context
+    val res: Resources = itemView.resources
+    private var chatMessage: ChatMessage? = null
+    private var user: User? = null
+
+    var onShouldExpand: (() -> Unit)? = null
+    var onLikeMessage: ((ChatMessage) -> Unit)? = null
+    var onOpenProfile: ((String) -> Unit)? = null
+    var onReply: ((String) -> Unit)? = null
+    var onCopyMessage: ((ChatMessage) -> Unit)? = null
+    var onFlagMessage: ((ChatMessage) -> Unit)? = null
+    var onDeleteMessage: ((ChatMessage) -> Unit)? = null
+
+    init {
+        itemView.setOnClickListener {
+            onShouldExpand?.invoke()
+        }
+        tvLikes.setOnClickListener { chatMessage?.let { onLikeMessage?.invoke(it) } }
+        messageText.setOnClickListener { onShouldExpand?.invoke() }
+        messageText.movementMethod = LinkMovementMethod.getInstance()
+        userLabel.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
+        avatarView.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
+        replyButton.setOnClickListener {
+            if (chatMessage?.username != null) {
+                chatMessage?.username?.let { onReply?.invoke(it) }
+            } else {
+                chatMessage?.user?.let { onReply?.invoke(it) }
+            }
+        }
+        replyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReplyIcon()),
+                null, null, null)
+        copyButton.setOnClickListener { chatMessage?.let { onCopyMessage?.invoke(it) } }
+        copyButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatCopyIcon()),
+                null, null, null)
+        reportButton.setOnClickListener { chatMessage?.let { onFlagMessage?.invoke(it) } }
+        reportButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReportIcon()),
+                null, null, null)
+        deleteButton.setOnClickListener { chatMessage?.let { onDeleteMessage?.invoke(it) } }
+        deleteButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(res, HabiticaIconsHelper.imageOfChatDeleteIcon()),
+                null, null, null)
+    }
+
+    fun bind(msg: ChatMessage, uuid: String, user: User?, isExpanded: Boolean) {
+        chatMessage = msg
+        this.user = user
+        userId = uuid
+
+        setLikeProperties()
+
+        val wasSent = messageWasSent()
+
+        val name = user?.profile?.name
+        if (wasSent) {
+            userLabel.tier = user?.contributor?.level ?: 0
+            userLabel.username = name
+            if (user?.username != null) {
+                @SuppressLint("SetTextI18n")
+                sublineTextView.text = "${user.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+            } else {
+                sublineTextView.text = msg.timestamp?.getAgoString(res)
+            }
+        } else {
+            userLabel.tier = msg.contributor?.level ?: 0
+            userLabel.username = msg.user
+            if (msg.username != null) {
+                @SuppressLint("SetTextI18n")
+                sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+            } else {
+                sublineTextView.text = msg.timestamp?.getAgoString(res)
+            }
+        }
+        when {
+            userLabel.tier == 8 -> {
+                modView.visibility = View.VISIBLE
+                modView.text = context.getString(R.string.moderator)
+                modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
+                modView.setScaledPadding(context, 12, 4, 12, 4)
+            }
+            userLabel.tier == 9 -> {
+                modView.visibility = View.VISIBLE
+                modView.text = context.getString(R.string.staff)
+                modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
+                modView.setScaledPadding(context, 12, 4, 12, 4)
+            }
+            else -> modView.visibility = View.GONE
+        }
+
+        if (wasSent) {
+            avatarView.visibility = View.GONE
+            itemView.setPadding(64.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
+        } else {
+            val displayMetrics = res.displayMetrics
+            val dpWidth = displayMetrics.widthPixels / displayMetrics.density
+            if (dpWidth > 350) {
+                avatarView.visibility = View.VISIBLE
+                msg.userStyles?.let {
+                    avatarView.setAvatar(it)
+                }
+            } else {
+                avatarView.visibility = View.GONE
+            }
+            itemView.setPadding(16.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
+        }
+
+        messageText.text = chatMessage?.parsedText
+        if (msg.parsedText == null) {
+            messageText.text = chatMessage?.text
+            Maybe.just(chatMessage?.text ?: "")
+                    .map { MarkdownParser.parseMarkdown(it) }
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe({ parsedText ->
+                        chatMessage?.parsedText = parsedText
+                        messageText.text = chatMessage?.parsedText
+                    }, { it.printStackTrace() })
+        }
+
+        val username = user?.formattedUsername
+        messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
+            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
+        } else {
+            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg)
+        }
+        messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
+
+        if (isExpanded) {
+            buttonsWrapper.visibility = View.VISIBLE
+            deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE
+            replyButton.visibility = if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
+        } else {
+            buttonsWrapper.visibility = View.GONE
+        }
+    }
+
+    private fun messageWasSent(): Boolean {
+        return chatMessage?.sent == true || chatMessage?.uuid == userId
+    }
+
+    private fun setLikeProperties() {
+        likeBackground.visibility = if (isTavern) View.VISIBLE else View.INVISIBLE
+        @SuppressLint("SetTextI18n")
+        tvLikes.text = "+" + chatMessage?.likeCount
+
+        val backgroundColorRes: Int
+        val foregroundColorRes: Int
+
+        if (chatMessage?.likeCount != 0) {
+            if (chatMessage?.userLikesMessage(userId) == true) {
+                backgroundColorRes = R.color.tavern_userliked_background
+                foregroundColorRes = R.color.tavern_userliked_foreground
+            } else {
+                backgroundColorRes = R.color.tavern_somelikes_background
+                foregroundColorRes = R.color.tavern_somelikes_foreground
+            }
+        } else {
+            backgroundColorRes = R.color.tavern_nolikes_background
+            foregroundColorRes = R.color.tavern_nolikes_foreground
+        }
+
+        DataBindingUtils.setRoundedBackground(likeBackground, ContextCompat.getColor(context, backgroundColorRes))
+        tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes))
+    }
+
+    private fun shouldShowDelete(): Boolean {
+        return chatMessage?.isSystemMessage != true && (chatMessage?.uuid == userId || user?.contributor?.admin == true || chatMessage?.isInboxMessage == true)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt
index 4026cf78b..60c9b0c48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder/MemberViewHolder.kt
@@ -1,8 +1,11 @@
 package com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
 
+import android.view.MenuItem
 import android.view.View
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.widget.PopupMenu
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.Stats
@@ -12,8 +15,11 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
 
-class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
+class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
+
+    private var currentUserID: String? = null
+    private var leaderID: String? = null
     private val avatarView: AvatarView by bindView(R.id.avatarView)
     private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
     private val sublineTextView: TextView by bindView(R.id.subline_textview)
@@ -25,25 +31,57 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
     private val healthTextView: TextView by bindView(R.id.health_textview)
     private val experienceTextView: TextView by bindView(R.id.experience_textview)
     private val manaTextView: TextView by bindView(R.id.mana_textview)
+    private val moreButton: ImageButton by bindView(R.id.more_button)
     //private val leaderTextView: TextView by bindView(R.id.leader_textview)
 
     var onClickEvent: (() -> Unit)? = null
+    var sendMessageEvent: (() -> Unit)? = null
+    var removeMemberEvent: (() -> Unit)? = null
+    var transferOwnershipEvent: (() -> Unit)? = null
 
     init {
         buffIconView.setImageBitmap(HabiticaIconsHelper.imageOfBuffIcon())
         itemView.setOnClickListener { onClickEvent?.invoke() }
+        moreButton.setOnClickListener { showOptionsPopup() }
     }
 
-    fun bind(user: Member, leaderID: String?) {
+    private fun showOptionsPopup() {
+        val popup = PopupMenu(itemView.context, moreButton)
+        popup.setOnMenuItemClickListener(this)
+        val inflater = popup.menuInflater
+        inflater.inflate(R.menu.party_member_menu, popup.menu)
+        popup.menu.findItem(R.id.transfer_ownership).isVisible = currentUserID == leaderID
+        popup.menu.findItem(R.id.remove).isVisible = currentUserID == leaderID
+        popup.show()
+    }
+
+    override fun onMenuItemClick(item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            R.id.send_message -> { sendMessageEvent?.invoke() }
+            R.id.transfer_ownership -> { transferOwnershipEvent?.invoke() }
+            R.id.remove -> { removeMemberEvent?.invoke() }
+        }
+        return true
+    }
+
+    fun bind(user: Member, leaderID: String?, userID: String?) {
         avatarView.setAvatar(user)
+        this.leaderID = leaderID
+        this.currentUserID = userID
+
+        if (user.id == userID) {
+            moreButton.visibility = View.GONE
+        } else {
+            moreButton.visibility = View.VISIBLE
+        }
 
         user.stats?.let {
             healthBar.set(it.hp ?: 0.0, it.maxHealth?.toDouble() ?: 50.0)
-            healthTextView.text = "${it.hp?.toInt()} / ${it.maxHealth?.toInt()}"
+            healthTextView.text = "${it.hp?.toInt()} / ${it.maxHealth}"
             experienceBar.set(it.exp ?: 0.0, it.toNextLevel?.toDouble() ?: 0.0)
-            experienceTextView.text = "${it.exp?.toInt()} / ${it.toNextLevel?.toInt()}"
+            experienceTextView.text = "${it.exp?.toInt()} / ${it.toNextLevel}"
             manaBar.set(it.mp ?: 0.0, it.maxMP?.toDouble() ?: 0.0)
-            manaTextView.text = "${it.mp?.toInt()} / ${it.maxMP?.toInt()}"
+            manaTextView.text = "${it.mp?.toInt()} / ${it.maxMP}"
         }
         displayNameTextView.username = user.profile?.name
         displayNameTextView.tier = user.contributor?.level ?: 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index c5db84829..1424da989 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica.ui.viewHolders
 
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
@@ -34,6 +34,8 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
     private var limitedDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
     private var countDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorNumber())
 
+    var purchaseCardAction: ((ShopItem) -> Unit)? = null
+
     var itemCount = 0
     set(value) {
         field = value
@@ -92,10 +94,13 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
 
     override fun onClick(view: View) {
         val item = item
-        if (item != null) {
+        if (item != null && item.isValid) {
             val dialog = PurchaseDialog(context, HabiticaBaseApplication.userComponent, item)
             dialog.shopIdentifier = shopIdentifier
             dialog.isPinned = isPinned
+            dialog.purchaseCardAction = {
+                purchaseCardAction?.invoke(it)
+            }
             dialog.show()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
index 374a4be26..7ed396bc8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
@@ -7,10 +7,14 @@ import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.bindView
+import java.text.DateFormat
+import java.util.*
 
 class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Unit), scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit), openTaskFunc: ((Task) -> Unit)) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc) {
 
     private val streakTextView: TextView by bindView(itemView, R.id.streakTextView)
+    private val reminderTextView: TextView by bindView(itemView, R.id.reminder_textview)
+
 
     override val taskIconWrapperIsVisible: Boolean
         get() {
@@ -28,6 +32,29 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         } else {
             this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray)
         }
+
+        if (newTask.reminders?.size == 0) {
+            reminderTextView.visibility = View.GONE
+        } else {
+            reminderTextView.visibility = View.VISIBLE
+            val now = Date()
+            val calendar = Calendar.getInstance()
+            val nextReminder = newTask.reminders?.firstOrNull {
+                calendar.time = now
+                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), it.time?.hours ?: 0, it.time?.minutes ?: 0, 0)
+                now < calendar.time
+            } ?: newTask.reminders?.first()
+
+            var reminderString = ""
+            if (nextReminder?.time != null) {
+                reminderString += formatter.format(nextReminder.time)
+            }
+            if ((newTask.reminders?.size ?: 0) > 1) {
+                reminderString = "$reminderString (+${(newTask.reminders?.size ?: 0)-1})"
+            }
+            reminderTextView.text = reminderString
+        }
+
         super.bind(newTask, position)
     }
 
@@ -44,4 +71,11 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
             this.streakTextView.visibility = View.GONE
         }
     }
+
+    companion object {
+        private val formatter: DateFormat
+            get() {
+                return DateFormat.getTimeInstance(DateFormat.SHORT)
+            }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
index 2319ef8d5..0b18e4923 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
@@ -34,11 +34,11 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         btnMinus.setOnClickListener { onMinusButtonClicked() }
     }
 
-    override fun bind(newTask: Task, position: Int) {
-        this.task = newTask
-        if (newTask.up == true) {
-            this.btnPlusWrapper.setBackgroundResource(newTask.lightTaskColor)
-            if (newTask.lightTaskColor == R.color.yellow_100) {
+    override fun bind(data: Task, position: Int) {
+        this.task = data
+        if (data.up == true) {
+            this.btnPlusWrapper.setBackgroundResource(data.lightTaskColor)
+            if (data.lightTaskColor == R.color.yellow_100) {
                 this.btnPlusIconView.setImageResource(R.drawable.habit_plus_yellow)
             } else {
                 this.btnPlusIconView.setImageResource(R.drawable.habit_plus)
@@ -52,9 +52,9 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
             this.btnPlus.isClickable = false
         }
 
-        if (newTask.down == true) {
-            this.btnMinusWrapper.setBackgroundResource(newTask.lightTaskColor)
-            if (newTask.lightTaskColor == R.color.yellow_100) {
+        if (data.down == true) {
+            this.btnMinusWrapper.setBackgroundResource(data.lightTaskColor)
+            if (data.lightTaskColor == R.color.yellow_100) {
                 this.btnMinusIconView.setImageResource(R.drawable.habit_minus_yellow)
             } else {
                 this.btnMinusIconView.setImageResource(R.drawable.habit_minus)
@@ -69,12 +69,12 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         }
 
         var streakString = ""
-        if (newTask.counterUp != null && newTask.counterUp ?: 0 > 0 && newTask.counterDown != null && newTask.counterDown ?: 0 > 0) {
-            streakString = streakString + "+" + newTask.counterUp.toString() + " | -" + newTask.counterDown?.toString()
-        } else if (newTask.counterUp != null && newTask.counterUp ?: 0 > 0) {
-            streakString = streakString + "+" + newTask.counterUp.toString()
-        } else if (newTask.counterDown != null && newTask.counterDown ?: 0 > 0) {
-            streakString = streakString + "-" + newTask.counterDown.toString()
+        if (data.counterUp != null && data.counterUp ?: 0 > 0 && data.counterDown != null && data.counterDown ?: 0 > 0) {
+            streakString = streakString + "+" + data.counterUp.toString() + " | -" + data.counterDown?.toString()
+        } else if (data.counterUp != null && data.counterUp ?: 0 > 0) {
+            streakString = streakString + "+" + data.counterUp.toString()
+        } else if (data.counterDown != null && data.counterDown ?: 0 > 0) {
+            streakString = streakString + "-" + data.counterDown.toString()
         }
         if (streakString.isNotEmpty()) {
             streakTextView.text = streakString
@@ -82,7 +82,7 @@ class HabitViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
         } else {
             streakTextView.visibility = View.GONE
         }
-        super.bind(newTask, position)
+        super.bind(data, position)
     }
 
     private fun onPlusButtonClicked() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index 33154d94c..22a2216e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -36,7 +36,7 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) ->
     }
 
     private fun buyReward() {
-        task?.let { scoreTaskFunc(it, TaskDirection.UP) }
+        task?.let { scoreTaskFunc(it, TaskDirection.DOWN) }
     }
 
     override fun onClick(v: View) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
index 5d3dff991..de945038e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -160,9 +160,9 @@ open class GroupViewModel : BaseViewModel() {
         }
     }
 
-    fun leaveGroup(function: (() -> Unit)? = null) {
-        disposable.add(socialRepository.leaveGroup(this.group.value?.id ?: "")
-                .flatMap { userRepository.retrieveUser(false, true) }
+    fun leaveGroup(keepChallenges: Boolean = true, function: (() -> Unit)? = null) {
+        disposable.add(socialRepository.leaveGroup(this.group.value?.id ?: "", keepChallenges)
+                .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
                 .subscribe(Consumer {
                     function?.invoke()
                 }, RxErrorHandler.handleEmptyError()))
@@ -220,7 +220,7 @@ open class GroupViewModel : BaseViewModel() {
                 bundle?.getString("name"),
                 bundle?.getString("description"),
                 bundle?.getString("leader"),
-                bundle?.getBoolean("leaderCreateChallenge"))
+                bundle?.getBoolean("leaderOnlyChallenges"))
                 .subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
new file mode 100644
index 000000000..ba16da99d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -0,0 +1,102 @@
+package com.habitrpg.android.habitica.ui.viewmodels
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.paging.DataSource
+import androidx.paging.PagedList
+import androidx.paging.PositionalDataSource
+import androidx.paging.toLiveData
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import io.reactivex.Flowable
+import io.reactivex.functions.Consumer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.math.ceil
+
+
+class InboxViewModel(recipientID: String) : BaseViewModel() {
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    private val config = PagedList.Config.Builder()
+            .setPageSize(10)
+            .setEnablePlaceholders(false)
+            .build()
+
+    private val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID)
+    val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
+
+    override fun inject(component: UserComponent) {
+        component.inject(this)
+    }
+
+    fun invalidateDataSource() {
+        dataSourceFactory.sourceLiveData.value?.invalidate()
+    }
+}
+
+private class MessagesDataSource(val socialRepository: SocialRepository, val recipientID: String):
+        PositionalDataSource<ChatMessage>() {
+    private var lastFetchWasEnd = false
+    override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<ChatMessage>) {
+        if (lastFetchWasEnd) {
+            callback.onResult(emptyList())
+            return
+        }
+        GlobalScope.launch(Dispatchers.Main.immediate) {
+            val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
+            socialRepository.retrieveInboxMessages(recipientID, page)
+                    .subscribe(Consumer {
+                        if (it.size != 10) lastFetchWasEnd = true
+                        callback.onResult(it)
+                    }, RxErrorHandler.handleEmptyError())
+        }
+    }
+
+    override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<ChatMessage>) {
+        lastFetchWasEnd = false
+        GlobalScope.launch(Dispatchers.Main.immediate) {
+            socialRepository.getInboxMessages(recipientID)
+                    .map { socialRepository.getUnmanagedCopy(it) }
+                    .firstElement()
+                    .flatMapPublisher {
+                        if (it.isEmpty()) {
+                            socialRepository.retrieveInboxMessages(recipientID, 0)
+                                    .doOnNext {
+                                        messages -> if (messages.size != 10) lastFetchWasEnd = true
+                                    }
+                        } else {
+                            Flowable.just(it)
+                        }
+                    }
+                    .subscribe(Consumer {
+                        callback.onResult(it, 0)
+                    }, RxErrorHandler.handleEmptyError())
+        }
+    }
+}
+
+private class MessagesDataSourceFactory(val socialRepository: SocialRepository, val recipientID: String) :
+        DataSource.Factory<Int, ChatMessage>() {
+    val sourceLiveData = MutableLiveData<MessagesDataSource>()
+    var latestSource: MessagesDataSource = MessagesDataSource(socialRepository, recipientID)
+    override fun create(): DataSource<Int, ChatMessage> {
+        latestSource = MessagesDataSource(socialRepository, recipientID)
+        sourceLiveData.postValue(latestSource)
+        return latestSource
+    }
+}
+
+class InboxViewModelFactory(private val recipientID: String) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return InboxViewModel(recipientID) as T
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index b3b949587..35276b008 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -72,7 +72,16 @@ open class NotificationsViewModel : BaseViewModel() {
         disposable.add(userRepository.getUser()
                 .subscribe(Consumer {
                     party = it.party
-                    customNotifications.onNext(convertInvitationsToNotifications(it))
+                    var notifications = convertInvitationsToNotifications(it)
+                    if (it.flags?.newStuff == true) {
+                        val notification = Notification()
+                        notification.id = "new-stuff-notification"
+                        notification.type = Notification.Type.NEW_STUFF.type
+                        val data = NewStuffData()
+                        notification.data = data
+                        notifications.add(notification)
+                    }
+                    customNotifications.onNext(notifications)
                 }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -85,9 +94,15 @@ open class NotificationsViewModel : BaseViewModel() {
                 serverNotifications,
                 customNotifications.toFlowable(BackpressureStrategy.LATEST),
                 BiFunction<List<Notification>, List<Notification>, List<Notification>> {
-                    serverNotificationsList, customNotificationsList -> serverNotificationsList + customNotificationsList
+                    serverNotificationsList, customNotificationsList ->
+                    if (serverNotificationsList.firstOrNull { notification -> notification.type == Notification.Type.NEW_STUFF.type } != null) {
+                        return@BiFunction serverNotificationsList + customNotificationsList.filter { notification -> notification.type != Notification.Type.NEW_STUFF.type }
+                    }
+                    return@BiFunction serverNotificationsList + customNotificationsList
                 }
-        ).observeOn(AndroidSchedulers.mainThread())
+        )
+                .map { it.sortedBy { notification -> notification.priority } }
+                .observeOn(AndroidSchedulers.mainThread())
     }
 
     fun getNotificationCount(): Flowable<Int> {
@@ -121,8 +136,8 @@ open class NotificationsViewModel : BaseViewModel() {
         return notifications.filter { supportedNotificationTypes.contains(it.type) }
     }
 
-    private fun convertInvitationsToNotifications(user: User): List<Notification> {
-        val notifications = arrayListOf<Notification>()
+    private fun convertInvitationsToNotifications(user: User): MutableList<Notification> {
+        val notifications = mutableListOf<Notification>()
 
         notifications.addAll(user.invitations?.parties?.map {
             val notification = Notification()
@@ -160,7 +175,7 @@ open class NotificationsViewModel : BaseViewModel() {
     }
 
     fun isPartyMessage(data: NewChatMessageData?): Boolean {
-        if (party == null || data?.group?.id == null) {
+        if (party?.isValid != true || data?.group?.id == null) {
             return false
         }
 
@@ -172,7 +187,7 @@ open class NotificationsViewModel : BaseViewModel() {
      * instead of one of the ones coming from server.
      */
     private fun isCustomNotification(notification: Notification): Boolean {
-        return notification.id.startsWith("custom-")
+        return notification.id.startsWith("custom-") || notification.id == "new-stuff-notification"
     }
 
     fun dismissNotification(notification: Notification) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index 5d3979f4a..0e7db3a04 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -11,6 +11,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
@@ -145,7 +146,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         }
 
         if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
-            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(ContextCompat.getColor(context, R.color.brand_200)))
+            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
         } else {
             infoIconView.visibility = View.GONE
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
index db56d3199..6106117fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
@@ -22,6 +22,9 @@ import android.widget.ScrollView
 import androidx.core.content.ContextCompat
 import androidx.core.view.MotionEventCompat
 import com.habitrpg.android.habitica.R
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
 
 // Adapted from https://github.com/justasm/DragLinearLayout
 
@@ -296,8 +299,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
      * A linear relationship b/w distance and duration, bounded.
      */
     private fun getTranslateAnimationDuration(distance: Float): Long {
-        return Math.min(MAX_SWITCH_DURATION, Math.max(MIN_SWITCH_DURATION,
-                (NOMINAL_SWITCH_DURATION * Math.abs(distance) / nominalDistanceScaled).toLong()))
+        return min(MAX_SWITCH_DURATION, max(MIN_SWITCH_DURATION, (NOMINAL_SWITCH_DURATION * abs(distance) / nominalDistanceScaled).toLong()))
     }
 
     /**
@@ -565,7 +567,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
                 if (INVALID_POINTER_ID == activePointerId) return false
                 val y = event.y
                 val dy = y - downY
-                if (Math.abs(dy) > slop) {
+                if (abs(dy) > slop) {
                     startDrag()
                     return true
                 }
@@ -688,9 +690,9 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
          * By Ken Perlin. See [Smoothstep - Wikipedia](http://en.wikipedia.org/wiki/Smoothstep).
          */
         private fun smootherStep(edge1: Float, edge2: Float, `val`: Float): Float {
-            var `val` = `val`
-            `val` = Math.max(0f, Math.min((`val` - edge1) / (edge2 - edge1), 1f))
-            return `val` * `val` * `val` * (`val` * (`val` * 6 - 15) + 10)
+            var value = `val`
+            value = max(0f, min((value - edge1) / (edge2 - edge1), 1f))
+            return value * value * value * (value * (value * 6 - 15) + 10)
         }
 
         /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
index 67b541840..8e50fe6bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
@@ -5,7 +5,6 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import kotlinx.android.synthetic.main.item_image_row.view.*
 
@@ -14,7 +13,7 @@ class EquipmentItemRow(context: Context?, attrs: AttributeSet?) : LinearLayout(c
     var equipmentIdentifier: String? = null
     set(value) {
         field = value
-        val imageName = if (equipmentIdentifier?.isNotEmpty() == true && equipmentIdentifier?.endsWith("base_0") == false) "shop_"+equipmentIdentifier else "head_0"
+        val imageName = if (equipmentIdentifier?.isNotEmpty() == true && equipmentIdentifier?.endsWith("base_0") == false) "shop_$equipmentIdentifier" else "head_0"
         DataBindingUtils.loadImage(imageView, imageName)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.kt
index ea3275654..a3f634a45 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FadingViewPager.kt
@@ -5,6 +5,7 @@ import androidx.viewpager.widget.ViewPager
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
+import kotlin.math.abs
 
 
 class FadingViewPager : ViewPager {
@@ -34,7 +35,7 @@ class FadingViewPager : ViewPager {
                 }
                 page.visibility = View.VISIBLE
                 // position is between -1.0F & 0.0F OR 0.0F & 1.0F
-                page.alpha = 1.0f - Math.abs(position)
+                page.alpha = 1.0f - abs(position)
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
index 9c86f505d..d13d7b5d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
@@ -1,13 +1,12 @@
 package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
-import android.util.AttributeSet
-import android.widget.MultiAutoCompleteTextView
 import android.text.InputType
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView
 
 
-
-class HabiticaAutocompleteTextView(context: Context?, attrs: AttributeSet?) : MultiAutoCompleteTextView(context, attrs) {
+class HabiticaAutocompleteTextView(context: Context?, attrs: AttributeSet?) : AppCompatMultiAutoCompleteTextView(context, attrs) {
 
     init {
         val removed = this.inputType and (this.inputType xor InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
index e357bfe89..949c6d712 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
@@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.TextView
+import androidx.appcompat.widget.AppCompatTextView
 
-open class HabiticaEmojiTextView : TextView {
+open class HabiticaEmojiTextView : AppCompatTextView {
 
     constructor(context: Context) : super(context)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 030303e6b..0221edf7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -1,27 +1,27 @@
 package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Matrix;
-import android.graphics.PointF;
-import android.graphics.RectF;
-import android.graphics.Shader;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapShader;
 import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Path;
 import android.graphics.DashPathEffect;
-import android.graphics.Typeface;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.RectF;
+import android.graphics.Shader;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
-import java.util.Stack;
+
 import java.lang.ref.WeakReference;
+import java.util.Stack;
 
 
 
@@ -10324,7 +10324,6 @@ public class HabiticaIcons {
         labelTextPaint.reset();
         labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
         labelTextPaint.setColor(crestColor5);
-        labelTextPaint.setTypeface(Typeface.createFromAsset(context.getAssets(), "HelveticaNeue.ttc"));
         labelTextPaint.setTextSize(12f);
         StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), Layout.Alignment.ALIGN_CENTER, memberCountLabel, labelTextPaint);
         canvas.save();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
index e3ae19851..75b602aee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
@@ -6,11 +6,12 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.bindView
+import kotlin.math.min
 
 
-class HabiticaProgressBar(context: Context?, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
 
     private val barView: View by bindView(R.id.bar)
     private val pendingBarView: View by bindView(R.id.pendingBar)
@@ -60,9 +61,9 @@ class HabiticaProgressBar(context: Context?, attrs: AttributeSet?) : FrameLayout
         val remainingPercent = if (remainingValue < 0) {
             0.0
         } else {
-            Math.min(1.0, remainingValue / maxValue)
+            min(1.0, remainingValue / maxValue)
         }
-        val pendingPercent = Math.min(1.0, currentValue / maxValue)
+        val pendingPercent = min(1.0, currentValue / maxValue)
         this.setBarWeight(remainingPercent)
         this.setPendingBarWeight(pendingPercent)
     }
@@ -70,7 +71,7 @@ class HabiticaProgressBar(context: Context?, attrs: AttributeSet?) : FrameLayout
     init {
         View.inflate(context, R.layout.progress_bar, this)
 
-        val attributes = context?.theme?.obtainStyledAttributes(
+        val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.HabiticaProgressBar,
                 0, 0)
@@ -98,11 +99,11 @@ class HabiticaProgressBar(context: Context?, attrs: AttributeSet?) : FrameLayout
 
     private fun setLayoutWeight(view: View, weight: Double) {
         view.clearAnimation()
-        val layout = view.layoutParams as LinearLayout.LayoutParams
+        val layout = view.layoutParams as? LinearLayout.LayoutParams
         if (weight == 0.0 || weight == 1.0) {
-            layout.weight = weight.toFloat()
+            layout?.weight = weight.toFloat()
             view.layoutParams = layout
-        } else if (layout.weight.toDouble() != weight) {
+        } else if (layout?.weight?.toDouble() != weight) {
             val anim = DataBindingUtils.LayoutWeightAnimation(view, weight.toFloat())
             anim.duration = 300
             view.startAnimation(anim)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
index 6b7f9cfde..1a3333ae8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
@@ -13,7 +13,6 @@ import androidx.core.view.ViewCompat
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.NavbarUtils
 
 class HabiticaSnackbar
 /**
@@ -54,11 +53,9 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
     }
 
     fun setLeftIcon(image: Drawable?): HabiticaSnackbar {
-        if (image == null) {
-            return this
-        }
         val imageView = view.findViewById<ImageView>(R.id.leftImageView)
         imageView.setImageDrawable(image)
+        imageView.visibility = if (image != null) View.VISIBLE else View.GONE
         return this
     }
 
@@ -112,13 +109,6 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
         private fun make(parent: ViewGroup, duration: Int): HabiticaSnackbar {
             val inflater = LayoutInflater.from(parent.context)
             val content = inflater.inflate(R.layout.snackbar_view, parent, false)
-            if (NavbarUtils.hasSoftKeys(parent.context)) {
-                val parentLocation = IntArray(2)
-                parent.getLocationInWindow(parentLocation)
-                if (NavbarUtils.isBehindNavbar(parentLocation, parent.context)) {
-                    content.setPadding(0, 0, 0, NavbarUtils.getNavbarHeight(parent.context))
-                }
-            }
             val viewCallback = ContentViewCallback(content)
             val customSnackbar = HabiticaSnackbar(parent, content, viewCallback)
             customSnackbar.duration = duration
@@ -130,7 +120,7 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
             showSnackbar(container, null, null, content, null, null, 0, null, displayType)
         }
 
-        fun showSnackbar(container: ViewGroup, leftImage: Drawable, title: CharSequence, content: CharSequence, displayType: SnackbarDisplayType) {
+        fun showSnackbar(container: ViewGroup, leftImage: Drawable, title: CharSequence?, content: CharSequence?, displayType: SnackbarDisplayType) {
             showSnackbar(container, leftImage, title, content, null, null, 0, null, displayType)
         }
 
@@ -144,7 +134,7 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
         }
 
         fun showSnackbar(container: ViewGroup, leftImage: Drawable?, title: CharSequence?, content: CharSequence?, specialView: View?, rightIcon: Drawable?, rightTextColor: Int, rightText: String?, displayType: SnackbarDisplayType) {
-            val snackbar = HabiticaSnackbar.make(container, Snackbar.LENGTH_LONG)
+            val snackbar = make(container, Snackbar.LENGTH_LONG)
                     .setTitle(title)
                     .setText(content)
                     .setSpecialView(specialView)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
index 5dedb1017..631956268 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -9,15 +9,16 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.bindView
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
+import kotlin.math.roundToInt
 
-class NPCBannerView(context: Context?, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
 
     private val backgroundView: ImageView by bindView(R.id.backgroundView)
     private val sceneView: SimpleDraweeView by bindView(R.id.sceneView)
@@ -51,7 +52,7 @@ class NPCBannerView(context: Context?, attrs: AttributeSet?) : FrameLayout(conte
         DataBindingUtils.loadImage(identifier + "_background" + shopSpriteSuffix) {
             val aspectRatio = it.width / it.height.toFloat()
             val height = context.resources.getDimension(R.dimen.shop_height).toInt()
-            val width = Math.round(height * aspectRatio)
+            val width = (height * aspectRatio).roundToInt()
             val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(it, width, height, false))
             drawable.tileModeX = Shader.TileMode.REPEAT
             Observable.just(drawable)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt
deleted file mode 100644
index 244ababbd..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PaddedLinearLayout.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.habitrpg.android.habitica.ui.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.LinearLayout
-import com.habitrpg.android.habitica.ui.helpers.NavbarUtils
-
-open class PaddedLinearLayout : LinearLayout {
-    private var navBarAccountedHeightCalculated = false
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val navbarHeight = NavbarUtils.getNavbarHeight(context)
-        val params = layoutParams as? MarginLayoutParams
-        params?.setMargins(0, 0, 0, navbarHeight)
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt
index 5ec567078..2834d6830 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt
@@ -48,7 +48,7 @@ class RoundedCornerLayout : FrameLayout {
             maskBitmap = createMask(width, height)
         }
 
-        offscreenCanvas.drawBitmap(maskBitmap, 0f, 0f, maskPaint)
+        maskBitmap?.let { offscreenCanvas.drawBitmap(it, 0f, 0f, maskPaint) }
         canvas.drawBitmap(offscreenBitmap, 0f, 0f, paint)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
new file mode 100644
index 000000000..e38193d9c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
@@ -0,0 +1,52 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.models.Notification
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+
+class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
+
+    private var iconView: SimpleDraweeView?
+    private var titleView: TextView?
+    private var descriptionView: TextView?
+
+    init {
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
+        val view = inflater?.inflate(R.layout.dialog_achievement_detail, null)
+        iconView = view?.findViewById(R.id.icon_view)
+        titleView = view?.findViewById(R.id.title_view)
+        titleView?.visibility = View.VISIBLE
+        descriptionView = view?.findViewById(R.id.description_view)
+        setAdditionalContentView(view)
+    }
+
+    fun setType(type: String) {
+        when (type) {
+            Notification.Type.ACHIEVEMENT_PARTY_UP.type -> configure(R.string.partyUpTitle, R.string.partyUpDescription, "partyUp")
+            Notification.Type.ACHIEVEMENT_PARTY_ON.type -> configure(R.string.partyOnTitle, R.string.partyOnDescription, "partyOn")
+            Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -> configure(R.string.beastMasterTitle, R.string.beastMasterDescription, "rat")
+            Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> configure(R.string.mountMasterTitle, R.string.mountMasterDescription, "wolf")
+            Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> configure(R.string.triadBingoTitle, R.string.triadBingoDescription, "triadbingo")
+            Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> configure(R.string.joinedGuildTitle, R.string.joinedGuildDescription, "guild")
+            Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> configure(R.string.joinedChallengeTitle, R.string.joinedChallengeDescription, "challenge")
+            Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> configure(R.string.inviteFriendTitle, R.string.inviteFriendDescription, "friends")
+        }
+    }
+
+    private fun configure(titleID: Int, descriptionID: Int, iconName: String) {
+        titleView?.text = context.getString(titleID)
+        descriptionView?.text = context.getString(descriptionID)
+        DataBindingUtils.loadImage(iconView, "achievement-${iconName}2x")
+        setTitle(R.string.achievement_title)
+        addButton(R.string.onwards, true)
+        addButton(R.string.view_achievements, isPrimary = false, isDestructive = false) { _, _ ->
+            MainNavigationController.navigate(R.id.achievementsFragment)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
index 9224d3daa..d1086dc49 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.dialogs
 
+import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
@@ -152,17 +153,17 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     fun addButton(string: String, isPrimary: Boolean, isDestructive: Boolean = false, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
         val button: Button = if (isPrimary) {
             if (isDestructive) {
-                buttonsWrapper.inflate(R.layout.dialog_habitica_primary_destructive_button) as Button
+                buttonsWrapper.inflate(R.layout.dialog_habitica_primary_destructive_button) as? Button
             } else {
-                buttonsWrapper.inflate(R.layout.dialog_habitica_primary_button) as Button
+                buttonsWrapper.inflate(R.layout.dialog_habitica_primary_button) as? Button
             }
         } else {
-            val button = buttonsWrapper.inflate(R.layout.dialog_habitica_secondary_button) as Button
+            val button = buttonsWrapper.inflate(R.layout.dialog_habitica_secondary_button) as? Button
             if (isDestructive) {
-                button.setTextColor(ContextCompat.getColor(context, R.color.red_100))
+                button?.setTextColor(ContextCompat.getColor(context, R.color.red_100))
             }
             button
-        }
+        } ?: Button(context)
         button.text = string
         button.minWidth = 147.dpToPx(context)
         button.setScaledPadding(context, 20, 0, 20, 0)
@@ -197,4 +198,35 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
         buttonView.layoutParams = layoutParams
         buttonView.elevation = 10f
     }
+
+    fun enqueue() {
+        addToQueue(this)
+    }
+
+    override fun dismiss() {
+        showNextInQueue(this)
+        super.dismiss()
+    }
+
+    companion object {
+        private var dialogQueue = mutableListOf<HabiticaAlertDialog>()
+
+        private fun showNextInQueue(currentDialog: HabiticaAlertDialog) {
+            if (dialogQueue.firstOrNull() == currentDialog) {
+                dialogQueue.removeAt(0)
+            }
+            if (dialogQueue.size > 0) {
+                if ((dialogQueue[0].context as? Activity)?.isFinishing == false) {
+                    dialogQueue[0].show()
+                }
+            }
+        }
+
+        private fun addToQueue(dialog: HabiticaAlertDialog) {
+            if (dialogQueue.isEmpty()) {
+                dialog.show()
+            }
+            dialogQueue.add(dialog)
+        }
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
index 8530a45ef..10c172624 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
@@ -106,7 +106,7 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
         val starView = StarView(context)
         starView.setStarSize(size)
         if (random.nextInt(10) > 2) {
-            starView.setBlinkDurations(Arrays.asList(blinkDuration, blinkDuration, blinkDuration))
+            starView.setBlinkDurations(listOf(blinkDuration, blinkDuration, blinkDuration))
         }
         starViews?.add(starView)
         if (viewWidth > 0 && viewHeight > 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
index 1e31ab513..7cd9acd0d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
@@ -9,6 +9,7 @@ import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
@@ -31,7 +32,7 @@ class BottomNavigationItem @JvmOverloads constructor(
         } else {
             selectedTitleView.visibility = View.GONE
             titleView.visibility = View.VISIBLE
-            iconView.drawable.setColorFilter(ContextCompat.getColor(context, R.color.brand_500), PorterDuff.Mode.MULTIPLY )
+            iconView.drawable.setColorFilter(context.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY )
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
index ad9b46e0e..bad8e4afc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.views.navigation
 
 import android.animation.ObjectAnimator
 import android.content.Context
+import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.ViewGroup
@@ -10,11 +11,13 @@ import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import android.widget.ImageButton
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -52,6 +55,10 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
         onTabSelectedListener?.invoke(value)
     }
 
+    val barHeight: Int
+        get() = itemWrapper.measuredHeight
+
+    private val cutoutBackgroundView: ImageView by bindView(R.id.cutout_background)
     private val habitsTab: BottomNavigationItem by bindView(R.id.tab_habits)
     private val dailiesTab: BottomNavigationItem by bindView(R.id.tab_dailies)
     private val todosTab: BottomNavigationItem by bindView(R.id.tab_todos)
@@ -59,6 +66,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
     private val addButton: ImageButton by bindView(R.id.add)
     private val addButtonBackground: ViewGroup by bindView(R.id.add_wrapper)
     private val submenuWrapper: LinearLayout by bindView(R.id.submenu_wrapper)
+    private val itemWrapper: ViewGroup by bindView(R.id.item_wrapper)
 
     init {
         inflate(R.layout.main_navigation_view, true)
@@ -110,6 +118,13 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
         }
         submenuWrapper.setOnClickListener { hideSubmenu() }
         updateItemSelection()
+
+        val cutout = context.getDrawable(R.drawable.bottom_navigation_inset)
+        cutout?.setColorFilter(context.getThemeColor(R.attr.barColor), PorterDuff.Mode.MULTIPLY)
+        cutoutBackgroundView.setImageDrawable(cutout)
+        val fabBackground = context.getDrawable(R.drawable.fab_background)
+        fabBackground?.setColorFilter(context.getThemeColor(R.attr.colorAccent), PorterDuff.Mode.MULTIPLY)
+        addButtonBackground.background = fabBackground
     }
 
     private fun animateButtonTap() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 36ef95826..41c71dbe4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -59,6 +59,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
     private val buyLabel: TextView
     private val pinButton: Button by bindView(customHeader, R.id.pin_button)
 
+    var purchaseCardAction: ((ShopItem) -> Unit)? = null
+
     private var shopItem: ShopItem = item
         set(value) {
             field = value
@@ -122,9 +124,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             field = value
             if (isPinned) {
                 pinButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfUnpinItem()), null, null, null)
+                pinButton.setTextColor(ContextCompat.getColor(context, R.color.red_10))
                 pinButton.text = context.getText(R.string.unpin)
             } else {
                 pinButton.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfPinItem()), null, null, null)
+                pinButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300))
                 pinButton.text = context.getText(R.string.pin)
             }
         }
@@ -143,7 +147,6 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         priceLabel = buyButton.findViewById(R.id.priceLabel)
         buyLabel = buyButton.findViewById(R.id.buy_label)
         pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe(Consumer { isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) }
-        pinButton.visibility = View.GONE
 
         shopItem = item
 
@@ -172,6 +175,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             }
         }
 
+        buyButton.elevation = 0f
         if (shopItem.canAfford(user)) {
             buyButton.background = context.getDrawable(R.drawable.button_background_primary)
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
@@ -213,6 +217,10 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     }
                 } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
                     observable = inventoryRepository.purchaseQuest(shopItem.key)
+                } else if (shopItem.purchaseType == "card") {
+                    purchaseCardAction?.invoke(shopItem)
+                    dismiss()
+                    return
                 } else if ("gold" == shopItem.currency && "gem" != shopItem.key) {
                     observable = inventoryRepository.buyItem(user, shopItem.key, shopItem.value.toDouble()).map { buyResponse ->
                         if (shopItem.key == "armoire") {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
index 9c22c825e..caadbdec0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
@@ -11,10 +11,10 @@ import android.widget.RatingBar
 import android.widget.TextView
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class PurchaseDialogQuestContent : PurchaseDialogContent {
@@ -51,7 +51,7 @@ class PurchaseDialogQuestContent : PurchaseDialogContent {
         } else {
             questTypeTextView.setText(R.string.collection_quest)
             val collectionList = questContent.collect?.map { it.count.toString() + " " + it.text }
-            questCollectTextView.text = TextUtils.join(", ", collectionList)
+            questCollectTextView.text = TextUtils.join(", ", collectionList ?: listOf<String>())
 
             bossHealthView.visibility = View.GONE
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index 02a970854..1d66da404 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
@@ -105,7 +106,7 @@ class ChatBarView : LinearLayout {
 
     private fun setSendButtonEnabled(enabled: Boolean) {
         val tintColor: Int = if (enabled) {
-            ContextCompat.getColor(context, R.color.brand_400)
+            context.getThemeColor(R.attr.colorAccent)
         } else {
             ContextCompat.getColor(context, R.color.gray_400)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
index d53bbb4c9..0c612634b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.social
 
 import android.content.Context
-import android.os.Build
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.Gravity
@@ -10,6 +9,7 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.widget.TextViewCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.members.PlayerTier
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -48,11 +48,7 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont
         val padding = context?.resources?.getDimension(R.dimen.spacing_small)?.toInt() ?: 0
         textView.setPadding(0, 0, padding, 0)
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            textView.setTextAppearance(R.style.Body1)
-        } else {
-            textView.setTextAppearance(context, R.style.Body1)
-        }
+        TextViewCompat.setTextAppearance(textView, R.style.Body1)
         val iconViewParams = LayoutParams(
                 FrameLayout.LayoutParams.WRAP_CONTENT,
                 FrameLayout.LayoutParams.WRAP_CONTENT)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index 38cfc9b0e..965e46731 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -9,6 +9,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.disposables.Disposable
@@ -144,7 +145,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     private fun updateTitle() {
         allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
         if (allocatedPoints > 0) {
-            titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_400))
+            titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
         } else {
             titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_400))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index 6143ff7e5..d87021c85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica.ui.views.stats
 
 import android.content.Context
 import android.graphics.PorterDuff
-import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import kotlinx.android.synthetic.main.stats_view.view.*
@@ -75,12 +75,7 @@ class StatsView(context: Context?, attrs: AttributeSet?) : LinearLayout(context,
                 backgroundDrawable?.setColorFilter(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
                 titleTextView.text = attributes.getString(R.styleable.StatsView_statsTitle)
             }
-            if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-                @Suppress("DEPRECATION")
-                titleWrapper.setBackgroundDrawable(backgroundDrawable)
-            } else {
-                titleWrapper.background = backgroundDrawable
-            }
+            titleWrapper.background = backgroundDrawable
         }
 
         allocateButton.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
index a1b7d86b6..0f1aa028b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan
@@ -98,7 +97,7 @@ class SubscriptionDetailsView : LinearLayout {
             val url = if (plan?.paymentMethod == "Google") {
                 "https://play.google.com/store/account/subscriptions"
             } else {
-                BuildConfig.BASE_URL + "/"
+                context.getString(R.string.base_url) + "/"
             }
             context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index a761cfcfc..8fe8aa7b7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -116,7 +117,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
                         intArrayOf(android.R.attr.state_checked) //enabled
                 ),
                 intArrayOf(Color.LTGRAY, //disabled
-                        ContextCompat.getColor(context, R.color.brand_400) //enabled
+                        context.getThemeColor(R.attr.colorAccent) //enabled
                 )
         )
         val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics).toInt()
@@ -133,12 +134,12 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
             CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList)
             tagCheckbox.setOnCheckedChangeListener { _, isChecked ->
                 if (isChecked) {
-                    if (!activeTags.contains(tag.getId())) {
-                        activeTags.add(tag.getId())
+                    if (!activeTags.contains(tag.id)) {
+                        activeTags.add(tag.id)
                     }
                 } else {
-                    if (activeTags.contains(tag.getId())) {
-                        activeTags.remove(tag.getId())
+                    if (activeTags.contains(tag.id)) {
+                        activeTags.remove(tag.id)
                     }
                 }
                 filtersChanged()
@@ -162,7 +163,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         val tag = Tag()
         tag.id = UUID.randomUUID().toString()
         tags.add(tag)
-        createdTags[tag.getId()] = tag
+        createdTags[tag.id] = tag
         startEditing()
     }
 
@@ -181,7 +182,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
         tagsEditButton.setText(R.string.edit_tag_btn_edit)
         this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         repository.updateTags(editedTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe(Consumer { tag -> editedTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
-        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe(Consumer { tag -> createdTags.remove(tag.getId()) }, RxErrorHandler.handleEmptyError())
+        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe(Consumer { tag -> createdTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
         repository.deleteTags(deletedTags).subscribe(Consumer { deletedTags.clear() }, RxErrorHandler.handleEmptyError())
     }
 
@@ -204,21 +205,21 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
                 }
                 val changedTag = tags[index]
                 changedTag.name = s.toString()
-                if (createdTags.containsKey(changedTag.getId())) {
-                    createdTags[changedTag.getId()] = changedTag
+                if (createdTags.containsKey(changedTag.id)) {
+                    createdTags[changedTag.id] = changedTag
                 } else {
-                    editedTags[changedTag.getId()] = changedTag
+                    editedTags[changedTag.id] = changedTag
                 }
                 tags[index] = changedTag
         })
         val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as? Button
         deleteButton?.setOnClickListener {
-            deletedTags.add(tag.getId())
-            if (createdTags.containsKey(tag.getId())) {
-                createdTags.remove(tag.getId())
+            deletedTags.add(tag.id)
+            if (createdTags.containsKey(tag.id)) {
+                createdTags.remove(tag.id)
             }
-            if (editedTags.containsKey(tag.getId())) {
-                editedTags.remove(tag.getId())
+            if (editedTags.containsKey(tag.id)) {
+                editedTags.remove(tag.id)
             }
             tags.remove(tag)
             tagsList.removeView(wrapper)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
index 069a81c85..23fa0deb2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -35,7 +36,7 @@ class ChecklistItemFormView @JvmOverloads constructor(
         editText.setText(item.text)
     }
 
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
+    var tintColor: Int = context.getThemeColor(R.attr.taskFormTint)
     var textChangedListener: ((String) -> Unit)? = null
     var animDuration = 0L
     var isAddButton: Boolean = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
index bc22e26d8..aa8591097 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
@@ -13,6 +13,7 @@ import android.widget.*
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -45,7 +46,7 @@ class ReminderItemFormView @JvmOverloads constructor(
             textView.text = formatter.format(item.time)
         }
 
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
+    var tintColor: Int = context.getThemeColor(R.attr.taskFormTint)
     var valueChangedListener: ((Date) -> Unit)? = null
     var animDuration = 0L
     var isAddButton: Boolean = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
index eda51ed14..38c4ea077 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
@@ -3,6 +3,8 @@ package com.habitrpg.android.habitica.ui.views.tasks.form
 import android.app.DatePickerDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.icu.text.MessageFormat
+import android.os.Build
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
@@ -47,6 +49,9 @@ class TaskSchedulingControls @JvmOverloads constructor(
     set(value) {
         field = value
         configureViewsForType()
+        if (value == Task.TYPE_TODO) {
+            dueDate = null
+        }
     }
     var startDate = Date()
     set(value) {
@@ -59,7 +64,11 @@ class TaskSchedulingControls @JvmOverloads constructor(
     var dueDate: Date? = null
     set(value) {
         field = value
-        value?.let { startDateTextView.text = dateFormatter.format(it) }
+        if (value != null) {
+            startDateTextView.text = dateFormatter.format(value)
+        } else {
+            startDateTextView.text = null
+        }
     }
     var frequency = Task.FREQUENCY_DAILY
     set(value) {
@@ -288,52 +297,62 @@ class TaskSchedulingControls @JvmOverloads constructor(
         var frequencyQualifier = ""
 
         when (frequency) {
-            "daily" -> frequencyQualifier = "day(s)"
-            "weekly" -> frequencyQualifier = "week(s)"
-            "monthly" -> frequencyQualifier = "month(s)"
-            "yearly" -> frequencyQualifier = "year(s)"
+            "daily" ->  frequencyQualifier = if (everyX == 1) "day" else "days"
+            "weekly" -> frequencyQualifier = if (everyX == 1) "week" else "weeks"
+            "monthly" -> frequencyQualifier = if (everyX == 1) "month" else "months"
+            "yearly" -> frequencyQualifier = if (everyX == 1) "year" else "years"
         }
 
-        var weekdays: String
-        val weekdayStrings = ArrayList<String>()
-        if (weeklyRepeat.m) {
-            weekdayStrings.add("Monday")
-        }
-        if (weeklyRepeat.t) {
-            weekdayStrings.add("Tuesday")
-        }
-        if (weeklyRepeat.w) {
-            weekdayStrings.add("Wednesday")
-        }
-        if (weeklyRepeat.th) {
-            weekdayStrings.add("Thursday")
-        }
-        if (weeklyRepeat.f) {
-            weekdayStrings.add("Friday")
-        }
-        if (weeklyRepeat.s) {
-            weekdayStrings.add("Saturday")
-        }
-        if (weeklyRepeat.su) {
-            weekdayStrings.add("Sunday")
-        }
-        weekdays = " on " + TextUtils.join(", ", weekdayStrings)
-        if (frequency != "weekly") {
-            weekdays = ""
+        var weekdays = if (frequency == "weekly") {
+            val weekdayStrings = ArrayList<String>()
+            if (weeklyRepeat.m) {
+                weekdayStrings.add("Monday")
+            }
+            if (weeklyRepeat.t) {
+                weekdayStrings.add("Tuesday")
+            }
+            if (weeklyRepeat.w) {
+                weekdayStrings.add("Wednesday")
+            }
+            if (weeklyRepeat.th) {
+                weekdayStrings.add("Thursday")
+            }
+            if (weeklyRepeat.f) {
+                weekdayStrings.add("Friday")
+            }
+            if (weeklyRepeat.s) {
+                weekdayStrings.add("Saturday")
+            }
+            if (weeklyRepeat.su) {
+                weekdayStrings.add("Sunday")
+            }
+            " on " + TextUtils.join(", ", weekdayStrings)
+        } else {
+            ""
         }
 
         if (frequency == "monthly") {
-            weekdays = if (daysOfMonth != null) {
+            weekdays = if (daysOfMonth?.isNotEmpty() == true) {
                 val date = startDateCalendar.get(Calendar.DATE)
-                " on the $date"
+                val formattedDate = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
+                    formatter.format(arrayOf(date))
+                } else date.toString()
+                " on the $formattedDate"
             } else {
                 val week = startDateCalendar.get(Calendar.WEEK_OF_MONTH)
+                val formattedWeek = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
+                    formatter.format(arrayOf(week))
+                } else week.toString()
                 val dayLongName = startDateCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.getDefault())
-                " on the $week week on $dayLongName"
+                " on the $formattedWeek week on $dayLongName"
             }
         }
 
-        val summary = resources.getString(R.string.repeat_summary, frequency, everyX.toString(), frequencyQualifier, weekdays)
+        val everyXString = if (everyX == 1) "" else "$everyX "
+
+        val summary = resources.getString(R.string.repeat_summary, frequency, everyXString, frequencyQualifier, weekdays)
         summaryTextView.text = summary
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index 5cdfb994c..46bf1431f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -25,6 +25,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
+import kotlin.math.abs
 
 class YesterdailyDialog private constructor(context: Context, private val userRepository: UserRepository, private val taskRepository: TaskRepository, private val tasks: List<Task>) : HabiticaAlertDialog(context) {
 
@@ -155,11 +156,13 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
                         .flatMapMaybe {
                             val cal = Calendar.getInstance()
                             cal.add(Calendar.DATE, -1)
-                            taskRepository.updateDailiesIsDue(cal.time).firstElement()
+                            taskRepository.retrieveDailiesFromDate(cal.time).firstElement()
+                        }
+                        .map {
+                            it.tasks.values.filter { task ->
+                                return@filter task.type == Task.TYPE_DAILY && task.isDue == true && !task.completed && task.yesterDaily
+                            }
                         }
-                        .flatMapMaybe { taskRepository.getTasks(Task.TYPE_DAILY, userId).firstElement() }
-                        .map { tasks -> tasks.where().equalTo("isDue", true).notEqualTo("completed", true).notEqualTo("yesterDaily", false).findAll() }
-                        .flatMapMaybe<List<Task>> { tasks -> taskRepository.getTaskCopies(tasks).firstElement() }
                         .retry(1)
                         .throttleFirst(2, TimeUnit.SECONDS)
                         .subscribe(Consumer { tasks ->
@@ -167,7 +170,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
                                 return@Consumer
                             }
 
-                            if (Math.abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
+                            if (abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
                                 return@Consumer
                             }
                             val additionalData = HashMap<String, Any>()
@@ -190,7 +193,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
             dialog.setCancelable(false)
             dialog.setCanceledOnTouchOutside(false)
             if (!activity.isFinishing) {
-                dialog.show()
+                dialog.enqueue()
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.java
deleted file mode 100644
index 56e15eebb..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.habitrpg.android.habitica.userpicture;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Environment;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class BitmapUtils {
-    public static String getSavePath() {
-        String path;
-        if (hasSDCard()) {
-            path = Environment.getExternalStorageDirectory().getAbsolutePath();
-        } else {
-            path = Environment.getDownloadCacheDirectory().getAbsolutePath();
-        }
-        return path + "/HabiticaImageCache";
-    }
-
-    public static Bitmap loadFromFile(String filename) {
-        try {
-            filename = getSavePath() + "/" + filename;
-
-            File f = new File(filename);
-            if (!f.exists()) {
-                return null;
-            }
-            return BitmapFactory.decodeFile(filename);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public static void saveToFile(String filename, Bitmap bmp) {
-        try {
-            createNomedia();
-            filename = getSavePath() + "/" + filename;
-
-            FileOutputStream out = new FileOutputStream(filename);
-            bmp.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-        } catch (Exception e) {
-        }
-    }
-
-    public static File saveToShareableFile(String directory, String filename, Bitmap bmp) {
-        try {
-            filename = directory + "/" + filename;
-
-            FileOutputStream out = new FileOutputStream(filename);
-            bmp.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-            return new File(filename);
-        } catch (Exception ignored) {
-        }
-        return null;
-    }
-
-    public static boolean hasSDCard() {
-        String status = Environment.getExternalStorageState();
-        return status.equals(Environment.MEDIA_MOUNTED);
-    }
-
-    private static boolean createNomedia() {
-        //Returns true if .nomedia was created/already existed and false if not
-        try {
-            File cacheDir = new File(getSavePath());
-            cacheDir.mkdirs();
-            File nomediaFile = new File(getSavePath() + "/.nomedia");
-            if (!nomediaFile.isFile()) return nomediaFile.createNewFile();
-        } catch (IOException ignored) {
-        }
-        return false;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
new file mode 100644
index 000000000..fb7ccbfb2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
@@ -0,0 +1,23 @@
+package com.habitrpg.android.habitica.userpicture
+
+import android.graphics.Bitmap
+import java.io.File
+import java.io.FileOutputStream
+
+object BitmapUtils {
+    fun saveToShareableFile(directory: String, filename: String, bmp: Bitmap): File? {
+        var filename = filename
+        try {
+            filename = "$directory/$filename"
+
+            val out = FileOutputStream(filename)
+            bmp.compress(Bitmap.CompressFormat.PNG, 100, out)
+            out.flush()
+            out.close()
+            return File(filename)
+        } catch (ignored: Exception) {
+        }
+
+        return null
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
deleted file mode 100644
index 63c78e8ee..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-public class BooleanAsIntAdapter extends TypeAdapter<Boolean> {
-
-    @Override
-    public void write(JsonWriter out, Boolean value) throws IOException {
-        if (value == null) {
-            out.nullValue();
-        } else {
-            out.value(value);
-        }
-    }
-
-    @Override
-    public Boolean read(JsonReader in) throws IOException {
-        JsonToken peek = in.peek();
-        switch (peek) {
-            case BOOLEAN:
-                return in.nextBoolean();
-            case NULL:
-                in.nextNull();
-                return null;
-            case NUMBER:
-                return in.nextInt() != 0;
-            case STRING:
-                return Boolean.parseBoolean(in.nextString());
-            default:
-                throw new IllegalStateException("Expected BOOLEAN or NUMBER but was " + peek);
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt
new file mode 100644
index 000000000..347e67921
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt
@@ -0,0 +1,34 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
+
+import java.io.IOException
+
+class BooleanAsIntAdapter : TypeAdapter<Boolean>() {
+
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter, value: Boolean?) {
+        if (value == null) {
+            out.nullValue()
+        } else {
+            out.value(value)
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(`in`: JsonReader): Boolean? {
+        return when (val peek = `in`.peek()) {
+            JsonToken.BOOLEAN -> `in`.nextBoolean()
+            JsonToken.NULL -> {
+                `in`.nextNull()
+                null
+            }
+            JsonToken.NUMBER -> `in`.nextInt() != 0
+            JsonToken.STRING -> java.lang.Boolean.parseBoolean(`in`.nextString())
+            else -> throw IllegalStateException("Expected BOOLEAN or NUMBER but was $peek")
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
index 84e816f0b..eb002c423 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
@@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.inventory.*
 import io.realm.RealmList
 import java.lang.reflect.Type
-import java.util.*
 
 class ContentDeserializer : JsonDeserializer<ContentResult> {
 
@@ -29,25 +28,20 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
         result.armoire = context.deserialize(obj.get("armoire"), Equipment::class.java)
         result.gear = context.deserialize(obj.get("gear"), ContentGear::class.java)
 
-        result.quests = RealmList()
         for (entry in obj.get("quests").asJsonObject.entrySet()) {
             result.quests.add(context.deserialize(entry.value, QuestContent::class.java))
             result.quests.forEach { it.key = it.key }
         }
-        result.eggs = RealmList()
         for (entry in obj.get("eggs").asJsonObject.entrySet()) {
             result.eggs.add(context.deserialize(entry.value, Egg::class.java))
         }
-        result.food = RealmList()
         for (entry in obj.get("food").asJsonObject.entrySet()) {
             result.food.add(context.deserialize(entry.value, Food::class.java))
         }
-        result.hatchingPotions = RealmList()
         for (entry in obj.get("hatchingPotions").asJsonObject.entrySet()) {
             result.hatchingPotions.add(context.deserialize(entry.value, HatchingPotion::class.java))
         }
 
-        result.pets = RealmList()
         val pets = obj.getAsJsonObject("petInfo")
         for (key in pets.keySet()) {
             val pet = Pet()
@@ -67,7 +61,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             result.pets.add(pet)
         }
 
-        result.mounts = RealmList()
         val mounts = obj.getAsJsonObject("mountInfo")
         for (key in mounts.keySet()) {
             val mount = Mount()
@@ -85,7 +78,6 @@ class ContentDeserializer : JsonDeserializer<ContentResult> {
             }
             result.mounts.add(mount)
         }
-        result.spells = ArrayList<Skill>()
         for ((classname, value) in obj.getAsJsonObject("spells").entrySet()) {
             val classObject = value.asJsonObject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
deleted file mode 100644
index e4167fb7f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import android.annotation.SuppressLint;
-import androidx.annotation.Nullable;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-
-import java.lang.reflect.Type;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import io.realm.Realm;
-import io.realm.RealmList;
-
-public class CustomizationDeserializer implements JsonDeserializer<List<Customization>> {
-
-    @Override
-    public List<Customization> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        JsonObject object = json.getAsJsonObject();
-        RealmList<Customization> customizations = new RealmList<>();
-        Realm realm = Realm.getDefaultInstance();
-
-        if (object.has("shirt")) {
-            List<Customization> existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
-
-            for (Customization customization : existingCustomizations) {
-                if (object.has(customization.getType())) {
-                    JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
-                    if (customization.getCategory() != null) {
-                        if (nestedObject.has(customization.getCategory())) {
-                            nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
-                        } else {
-                            continue;
-                        }
-                    }
-                    if (nestedObject.has(customization.getIdentifier())) {
-                        customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
-                        nestedObject.remove(customization.getIdentifier());
-                    }
-                }
-            }
-
-            for (String type : Arrays.asList("shirt", "skin", "chair")) {
-                for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
-                for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-        } else {
-            List<Customization> existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
-
-            for (Customization customization : existingCustomizations) {
-                if (object.has(customization.getCustomizationSet())) {
-                    JsonObject nestedObject = object.get(customization.getCustomizationSet()).getAsJsonObject();
-                    if (nestedObject.has(customization.getIdentifier())) {
-                        customizations.add(this.parseBackground(customization, customization.getCustomizationSet(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
-                        nestedObject.remove(customization.getIdentifier());
-                    }
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> setEntry : object.entrySet()) {
-                for (Map.Entry<String, JsonElement> entry : setEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseBackground(null, setEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-        }
-
-        realm.close();
-
-        return customizations;
-    }
-
-    private Customization parseCustomization(@Nullable Customization existingCustomizaion, String type, @Nullable String category, String key, JsonObject entry) {
-        Customization customization = existingCustomizaion;
-        if (customization == null) {
-            customization = new Customization();
-            customization.setIdentifier(key);
-            customization.setType(type);
-            if (category != null) {
-                customization.setCategory(category);
-            }
-        }
-        if (entry.has("price")) {
-            customization.setPrice(entry.get("price").getAsInt());
-        }
-
-        if (entry.has("set")) {
-            JsonObject setInfo = entry.get("set").getAsJsonObject();
-            customization.setCustomizationSet(setInfo.get("key").getAsString());
-            if (setInfo.has("setPrice")) {
-                customization.setSetPrice(setInfo.get("setPrice").getAsInt());
-            }
-            if (setInfo.has("text")) {
-                customization.setCustomizationSetName(setInfo.get("text").getAsString());
-            }
-            @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            try {
-                if (setInfo.has("availableFrom")) {
-                    customization.setAvailableFrom(format.parse(setInfo.get("availableFrom").getAsString()));
-                }
-                if (setInfo.has("availableUntil")) {
-                    customization.setAvailableUntil(format.parse(setInfo.get("availableUntil").getAsString()));
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return customization;
-    }
-
-    private Customization parseBackground(@Nullable Customization existingCustomization, String setName, String key, JsonObject entry) {
-        Customization customization = existingCustomization;
-
-        if (customization == null) {
-            customization = new Customization();
-            customization.setCustomizationSet(setName);
-            String readableSetName = setName.substring(13, 17) + "." + setName.substring(11, 13);
-            customization.setCustomizationSetName(readableSetName);
-            customization.setType("background");
-            customization.setIdentifier(key);
-        }
-        if ("incentiveBackgrounds".equals(setName)) {
-            customization.setCustomizationSetName("Login Incentive");
-            customization.setPrice(0);
-            customization.setSetPrice(0);
-            customization.setIsBuyable(false);
-        } else {
-            customization.setPrice(7);
-            customization.setSetPrice(15);
-        }
-
-        customization.setText(entry.get("text").getAsString());
-        customization.setNotes(entry.getAsJsonObject().get("notes").getAsString());
-
-        return customization;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
new file mode 100644
index 000000000..9eec59b8b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -0,0 +1,141 @@
+package com.habitrpg.android.habitica.utils
+
+import android.annotation.SuppressLint
+import com.google.gson.*
+import com.habitrpg.android.habitica.models.inventory.Customization
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.text.SimpleDateFormat
+
+class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<Customization> {
+        val jsonObject = json.asJsonObject
+        val customizations = RealmList<Customization>()
+        val realm = Realm.getDefaultInstance()
+
+        if (jsonObject.has("shirt")) {
+            val existingCustomizations = realm.copyFromRealm(realm.where(Customization::class.java).findAll())
+
+            for (customization in existingCustomizations) {
+                if (jsonObject.has(customization.type)) {
+                    var nestedObject = jsonObject.get(customization.type).asJsonObject
+                    if (customization.category != null) {
+                        if (nestedObject.has(customization.category)) {
+                            nestedObject = nestedObject.get(customization.category).asJsonObject
+                        } else {
+                            continue
+                        }
+                    }
+                    if (nestedObject.has(customization.identifier)) {
+                        customizations.add(this.parseCustomization(customization, customization.type, customization.category, customization.identifier, nestedObject.get(customization.identifier).asJsonObject))
+                        nestedObject.remove(customization.identifier)
+                    }
+                }
+            }
+
+            for (type in listOf("shirt", "skin", "chair")) {
+                for ((key, value) in jsonObject.get(type).asJsonObject.entrySet()) {
+                    customizations.add(this.parseCustomization(null, type, null, key, value.asJsonObject))
+                }
+            }
+
+            for ((key, value) in jsonObject.get("hair").asJsonObject.entrySet()) {
+                for ((key1, value1) in value.asJsonObject.entrySet()) {
+                    customizations.add(this.parseCustomization(null, "hair", key, key1, value1.asJsonObject))
+                }
+            }
+        } else {
+            val existingCustomizations = realm.copyFromRealm(realm.where(Customization::class.java).findAll())
+
+            for (customization in existingCustomizations) {
+                if (jsonObject.has(customization.customizationSet)) {
+                    val nestedObject = jsonObject.get(customization.customizationSet).asJsonObject
+                    if (nestedObject.has(customization.identifier)) {
+                        customizations.add(this.parseBackground(customization, customization.customizationSet, customization.identifier, nestedObject.get(customization.identifier).asJsonObject))
+                        nestedObject.remove(customization.identifier)
+                    }
+                }
+            }
+
+            for ((key, value) in jsonObject.entrySet()) {
+                for ((key1, value1) in value.asJsonObject.entrySet()) {
+                    customizations.add(this.parseBackground(null, key, key1, value1.asJsonObject))
+                }
+            }
+        }
+
+        realm.close()
+
+        return customizations
+    }
+
+    private fun parseCustomization(existingCustomizaion: Customization?, type: String?, category: String?, key: String?, entry: JsonObject): Customization {
+        var customization = existingCustomizaion
+        if (customization == null) {
+            customization = Customization()
+            customization.identifier = key
+            customization.type = type
+            if (category != null) {
+                customization.category = category
+            }
+        }
+        if (entry.has("price")) {
+            customization.price = entry.get("price").asInt
+        }
+
+        if (entry.has("set")) {
+            val setInfo = entry.get("set").asJsonObject
+            customization.customizationSet = setInfo.get("key").asString
+            if (setInfo.has("setPrice")) {
+                customization.setPrice = setInfo.get("setPrice").asInt
+            }
+            if (setInfo.has("text")) {
+                customization.customizationSetName = setInfo.get("text").asString
+            }
+            @SuppressLint("SimpleDateFormat") val format = SimpleDateFormat("yyyy-MM-dd")
+            try {
+                if (setInfo.has("availableFrom")) {
+                    customization.availableFrom = format.parse(setInfo.get("availableFrom").asString)
+                }
+                if (setInfo.has("availableUntil")) {
+                    customization.availableUntil = format.parse(setInfo.get("availableUntil").asString)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+        }
+
+        return customization
+    }
+
+    private fun parseBackground(existingCustomization: Customization?, setName: String, key: String?, entry: JsonObject): Customization {
+        var customization = existingCustomization
+
+        if (customization == null) {
+            customization = Customization()
+            customization.customizationSet = setName
+            val readableSetName = setName.substring(13, 17) + "." + setName.substring(11, 13)
+            customization.customizationSetName = readableSetName
+            customization.type = "background"
+            customization.identifier = key
+        }
+        if ("incentiveBackgrounds" == setName) {
+            customization.customizationSetName = "Login Incentive"
+            customization.price = 0
+            customization.setPrice = 0
+            customization.isBuyable = false
+        } else {
+            customization.price = 7
+            customization.setPrice = 15
+        }
+
+        customization.text = entry.get("text").asString
+        customization.notes = entry.asJsonObject.get("notes").asString
+
+        return customization
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
deleted file mode 100644
index 960845a47..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
-import java.util.Date;
-
-/**
- * Created by keithholliday on 6/19/16.
- */
-public class DateSerializer implements JsonSerializer<Date> {
-    @Override
-    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(src.getTime());
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
deleted file mode 100644
index 501acd0e2..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.FAQArticle;
-
-import java.lang.reflect.Type;
-import java.util.List;
-
-import io.realm.RealmList;
-
-/**
- * Created by viirus on 22/01/16.
- */
-public class FAQArticleListDeserilializer implements JsonDeserializer<List<FAQArticle>> {
-
-
-    @Override
-    public List<FAQArticle> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<FAQArticle> vals = new RealmList<>();
-        int position = 0;
-        for (JsonElement e : json.getAsJsonObject().get("questions").getAsJsonArray()) {
-            JsonObject obj = e.getAsJsonObject();
-            FAQArticle article = new FAQArticle();
-            article.setPosition(position);
-            article.setQuestion(obj.get("question").getAsString());
-            if (obj.has("android")) {
-                article.setAnswer(obj.get("android").getAsString());
-            } else {
-                article.setAnswer(obj.get("web").getAsString());
-            }
-            vals.add(article);
-            position++;
-        }
-
-        return vals;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt
new file mode 100644
index 000000000..e59a935ab
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt
@@ -0,0 +1,35 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.FAQArticle
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+/**
+ * Created by viirus on 22/01/16.
+ */
+class FAQArticleListDeserilializer : JsonDeserializer<List<FAQArticle>> {
+
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<FAQArticle> {
+        val articles = RealmList<FAQArticle>()
+        for ((position, e) in json.asJsonObject.get("questions").asJsonArray.withIndex()) {
+            val obj = e.asJsonObject
+            val article = FAQArticle()
+            article.position = position
+            article.question = obj.get("question").asString
+            if (obj.has("android")) {
+                article.answer = obj.get("android").asString
+            } else {
+                article.answer = obj.get("web").asString
+            }
+            articles.add(article)
+        }
+
+        return articles
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
deleted file mode 100644
index 67c3bf47e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-
-import java.lang.reflect.Type;
-
-public class FeedResponseDeserializer implements JsonDeserializer<FeedResponse> {
-    @Override
-    public FeedResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        FeedResponse response = new FeedResponse();
-        response.value = json.getAsInt();
-        return response;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt
new file mode 100644
index 000000000..8672282cb
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt
@@ -0,0 +1,18 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.responses.FeedResponse
+
+import java.lang.reflect.Type
+
+class FeedResponseDeserializer : JsonDeserializer<FeedResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): FeedResponse {
+        val response = FeedResponse()
+        response.value = json.asInt
+        return response
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
deleted file mode 100644
index b67ca27a8..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.members.Member;
-import com.habitrpg.android.habitica.models.members.MemberPreferences;
-import com.habitrpg.android.habitica.models.social.UserParty;
-import com.habitrpg.android.habitica.models.user.Authentication;
-import com.habitrpg.android.habitica.models.user.ContributorInfo;
-import com.habitrpg.android.habitica.models.user.Inbox;
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.user.Outfit;
-import com.habitrpg.android.habitica.models.user.Profile;
-import com.habitrpg.android.habitica.models.user.Stats;
-
-import java.lang.reflect.Type;
-
-import io.realm.Realm;
-
-public class MemberSerialization implements JsonDeserializer<Member> {
-    @Override
-    public Member deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        JsonObject obj = json.getAsJsonObject();
-        String id = obj.get("_id").getAsString();
-
-        Realm realm = Realm.getDefaultInstance();
-        Member member = realm.where(Member.class).equalTo("id", id).findFirst();
-        if (member == null) {
-            member = new Member();
-            member.setId(id);
-        } else {
-            member = realm.copyFromRealm(member);
-        }
-
-        if (obj.has("stats")) {
-            member.setStats(context.deserialize(obj.get("stats"), Stats.class));
-        }
-        if (obj.has("inbox")) {
-            member.setInbox(context.deserialize(obj.get("inbox"), Inbox.class));
-        }
-        if (obj.has("preferences")) {
-            member.setPreferences(context.deserialize(obj.get("preferences"), MemberPreferences.class));
-        }
-        if (obj.has("profile")) {
-            member.setProfile(context.deserialize(obj.get("profile"), Profile.class));
-        }
-        if (obj.has("party")) {
-            member.setParty(context.deserialize(obj.get("party"), UserParty.class));
-            if (member.getParty() != null && member.getParty().getQuest() != null) {
-                member.getParty().getQuest().setId(member.getId());
-                if (!obj.get("party").getAsJsonObject().get("quest").getAsJsonObject().has("RSVPNeeded")) {
-                    Quest quest = realm.where(Quest.class).equalTo("id", member.getId()).findFirst();
-                    if (quest != null && quest.isValid()) {
-                        member.getParty().getQuest().setRSVPNeeded(quest.getRSVPNeeded());
-                    }
-                }
-            }
-        }
-
-        if (obj.has("items")) {
-            JsonObject items = obj.getAsJsonObject("items");
-            if (items.has("currentMount") && items.get("currentMount").isJsonPrimitive()) {
-                member.setCurrentMount(items.get("currentMount").getAsString());
-            }
-            if (items.has("currentPet") && items.get("currentPet").isJsonPrimitive()) {
-                member.setCurrentPet(items.get("currentPet").getAsString());
-            }
-            if (items.has("gear")) {
-                JsonObject gear = items.getAsJsonObject("gear");
-                if (gear.has("costume")) {
-                    member.setCostume(context.deserialize(gear.get("costume"), Outfit.class));
-                }
-                if (gear.has("equipped")) {
-                    member.setEquipped(context.deserialize(gear.get("equipped"), Outfit.class));
-                }
-            }
-        }
-        if (obj.has("contributor")) {
-            member.setContributor(context.deserialize(obj.get("contributor"), ContributorInfo.class));
-        }
-        if (obj.has("auth")) {
-            member.setAuthentication(context.deserialize(obj.get("auth"), Authentication.class));
-        }
-        if (obj.has("loginIncentives")) {
-            member.setLoginIncentives(obj.get("loginIncentives").getAsInt());
-        }
-
-        /*
-        TODO: Fix ownership storage
-        Right now ownership is a boolean field on the item/pet/mount/equipment itself.
-        Storing this data for the user can overwrite the ownership for the logged in user. The fix
-        is to properly store ownership of these things in a different object, similar to how the
-        iOS app handles it.
-        if (obj.has("items")) {
-            member.setItems(context.deserialize(obj.get("items"), Items.class));
-        }
-        */
-        member.setId(member.getId());
-
-        realm.close();
-        return member;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
new file mode 100644
index 000000000..5af02e7e9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
@@ -0,0 +1,93 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.members.MemberPreferences
+import com.habitrpg.android.habitica.models.social.UserParty
+import com.habitrpg.android.habitica.models.user.*
+import io.realm.Realm
+import java.lang.reflect.Type
+
+
+
+class MemberSerialization : JsonDeserializer<Member> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Member {
+        val obj = json.asJsonObject
+        val id = obj.get("_id").asString
+
+        val realm = Realm.getDefaultInstance()
+        var member = realm.where(Member::class.java).equalTo("id", id).findFirst() ?: Member()
+        if (member.id == null) {
+            member.id = id
+        } else {
+            member = realm.copyFromRealm(member)
+        }
+
+        if (obj.has("stats")) {
+            member.stats = context.deserialize<Stats>(obj.get("stats"), Stats::class.java)
+        }
+        if (obj.has("inbox")) {
+            member.inbox = context.deserialize<Inbox>(obj.get("inbox"), Inbox::class.java)
+        }
+        if (obj.has("preferences")) {
+            member.preferences = context.deserialize<MemberPreferences>(obj.get("preferences"), MemberPreferences::class.java)
+        }
+        if (obj.has("profile")) {
+            member.profile = context.deserialize<Profile>(obj.get("profile"), Profile::class.java)
+        }
+        if (obj.has("party")) {
+            member.party = context.deserialize<UserParty>(obj.get("party"), UserParty::class.java)
+            if (member.party != null && member.party?.quest != null) {
+                member.party?.quest?.id = member.id
+                if (!obj.get("party").asJsonObject.get("quest").asJsonObject.has("RSVPNeeded")) {
+                    val quest = realm.where(Quest::class.java).equalTo("id", member.id).findFirst()
+                    if (quest != null && quest.isValid) {
+                        member.party?.quest?.RSVPNeeded = quest.RSVPNeeded
+                    }
+                }
+            }
+        }
+
+        if (obj.has("items")) {
+            member.items = context.deserialize(obj.get("items"), Items::class.java)
+            member.items?.gear = null
+            member.items?.special = null
+
+            val items = obj.getAsJsonObject("items")
+            if (items.has("currentMount") && items.get("currentMount").isJsonPrimitive) {
+                member.setCurrentMount(items.get("currentMount").asString)
+            }
+            if (items.has("currentPet") && items.get("currentPet").isJsonPrimitive) {
+                member.setCurrentPet(items.get("currentPet").asString)
+            }
+            if (items.has("gear")) {
+                val gear = items.getAsJsonObject("gear")
+                if (gear.has("costume")) {
+                    member.costume = context.deserialize(gear.get("costume"), Outfit::class.java)
+                }
+                if (gear.has("equipped")) {
+                    member.equipped = context.deserialize(gear.get("equipped"), Outfit::class.java)
+                }
+            }
+        }
+        if (obj.has("contributor")) {
+            member.contributor = context.deserialize<ContributorInfo>(obj.get("contributor"), ContributorInfo::class.java)
+        }
+        if (obj.has("auth")) {
+            member.authentication = context.deserialize<Authentication>(obj.get("auth"), Authentication::class.java)
+        }
+        if (obj.has("loginIncentives")) {
+            member.loginIncentives = obj.get("loginIncentives").asInt
+        }
+
+        member.id = member.id
+
+        realm.close()
+        return member
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java
deleted file mode 100644
index 7a3789e53..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.QuestCollect;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-import io.realm.RealmList;
-
-public class QuestCollectDeserializer implements JsonDeserializer<RealmList<QuestCollect>> {
-    @Override
-    public RealmList<QuestCollect> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<QuestCollect> items = new RealmList<>();
-
-        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-            QuestCollect questCollect = new QuestCollect();
-            questCollect.key = entry.getKey();
-            JsonObject jsonObject = entry.getValue().getAsJsonObject();
-            questCollect.count = jsonObject.get("count").getAsInt();
-            questCollect.text = jsonObject.get("text").getAsString();
-            items.add(questCollect);
-        }
-
-        return items;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt
new file mode 100644
index 000000000..20b6ff9b1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt
@@ -0,0 +1,27 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.inventory.QuestCollect
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class QuestCollectDeserializer : JsonDeserializer<RealmList<QuestCollect>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList<QuestCollect> {
+        val items = RealmList<QuestCollect>()
+
+        for ((key, value) in json.asJsonObject.entrySet()) {
+            val questCollect = QuestCollect()
+            questCollect.key = key
+            val jsonObject = value.asJsonObject
+            questCollect.count = jsonObject.get("count").asInt
+            questCollect.text = jsonObject.get("text").asString
+            items.add(questCollect)
+        }
+
+        return items
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.java
deleted file mode 100644
index d1f808a0c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.QuestDropItem;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.RealmList;
-
-/**
- * Created by phillip on 25.07.17.
- */
-
-public class QuestDropItemsListSerialization implements JsonDeserializer<RealmList<QuestDropItem>> {
-    @Override
-    public RealmList<QuestDropItem> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<QuestDropItem> items = new RealmList<>();
-        List<String> keys = new ArrayList<>();
-
-        for (JsonElement e : json.getAsJsonArray()) {
-            QuestDropItem item = context.deserialize(e, QuestDropItem.class);
-            if (keys.contains(item.getKey())) {
-                for (QuestDropItem existingItem : items) {
-                    if (existingItem.getKey().equals(item.getKey())) {
-                        existingItem.setCount(existingItem.getCount()+1);
-                    }
-                }
-            } else {
-                item.setCount(1);
-                items.add(item);
-                keys.add(item.getKey());
-            }
-        }
-
-
-        return items;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt
new file mode 100644
index 000000000..0373457f2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt
@@ -0,0 +1,37 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.inventory.QuestDropItem
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.util.*
+
+
+class QuestDropItemsListSerialization : JsonDeserializer<RealmList<QuestDropItem>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList<QuestDropItem> {
+        val items = RealmList<QuestDropItem>()
+        val keys = ArrayList<String>()
+
+        for (e in json.asJsonArray) {
+            val item = context.deserialize<QuestDropItem>(e, QuestDropItem::class.java)
+            if (keys.contains(item.key)) {
+                for (existingItem in items) {
+                    if (existingItem.key == item.key) {
+                        existingItem.count = existingItem.count + 1
+                    }
+                }
+            } else {
+                item.count = 1
+                items.add(item)
+                keys.add(item.key)
+            }
+        }
+
+
+        return items
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
deleted file mode 100644
index 51535772d..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.Skill;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by viirus on 25/11/15.
- */
-public class SkillDeserializer
-        implements JsonDeserializer<List<Skill>> {
-
-    @Override
-    public List<Skill> deserialize(JsonElement json, Type type,
-                                   JsonDeserializationContext context) throws JsonParseException {
-
-        JsonObject object = json.getAsJsonObject();
-        List<Skill> skills = new ArrayList<>();
-        for (Map.Entry<String, JsonElement> classEntry : object.entrySet()) {
-            String classname = classEntry.getKey();
-            JsonObject classObject = classEntry.getValue().getAsJsonObject();
-
-            for (Map.Entry<String, JsonElement> skillEntry : classObject.entrySet()) {
-                JsonObject skillObject = skillEntry.getValue().getAsJsonObject();
-                Skill skill = new Skill();
-                skill.setKey(skillObject.get("key").getAsString());
-                skill.setText(skillObject.get("text").getAsString());
-                skill.setNotes(skillObject.get("notes").getAsString());
-                skill.setKey(skillObject.get("key").getAsString());
-                skill.setTarget(skillObject.get("target").getAsString());
-                skill.setHabitClass(classname);
-                skill.setMana(skillObject.get("mana").getAsInt());
-
-                JsonElement lvlElement = skillObject.get("lvl");
-
-                if (lvlElement != null) {
-                    skill.setLvl(lvlElement.getAsInt());
-                }
-
-                skills.add(skill);
-            }
-        }
-
-        return skills;
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt
new file mode 100644
index 000000000..61b961875
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt
@@ -0,0 +1,45 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.Skill
+import java.lang.reflect.Type
+import java.util.*
+
+/**
+ * Created by viirus on 25/11/15.
+ */
+class SkillDeserializer : JsonDeserializer<List<Skill>> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, type: Type,
+                             context: JsonDeserializationContext): List<Skill> {
+        val jsonObject = json.asJsonObject
+        val skills = ArrayList<Skill>()
+        for ((classname, value) in jsonObject.entrySet()) {
+            for ((_, value1) in value.asJsonObject.entrySet()) {
+                val skillObject = value1.asJsonObject
+                val skill = Skill()
+                skill.key = skillObject.get("key").asString
+                skill.text = skillObject.get("text").asString
+                skill.notes = skillObject.get("notes").asString
+                skill.key = skillObject.get("key").asString
+                skill.target = skillObject.get("target").asString
+                skill.habitClass = classname
+                skill.mana = skillObject.get("mana").asInt
+
+                val lvlElement = skillObject.get("lvl")
+
+                if (lvlElement != null) {
+                    skill.lvl = lvlElement.asInt
+                }
+
+                skills.add(skill)
+            }
+        }
+
+        return skills
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
index 89c4c9f37..8ff9c71aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
@@ -145,7 +145,7 @@ class TaskListDeserializer : JsonDeserializer<TaskList> {
                 try {
                     val tagId = tagElement.asString
                     for (tag in databaseTags) {
-                        if (tag.getId() == tagId) {
+                        if (tag.id == tagId) {
                             if (!alreadyContainsTag(tags, tagId)) {
                                 tags.add(tag)
                             }
@@ -164,7 +164,7 @@ class TaskListDeserializer : JsonDeserializer<TaskList> {
 
     private fun alreadyContainsTag(list: List<Tag>, idToCheck: String): Boolean {
         for (t in list) {
-            if (t.getId() == idToCheck) {
+            if (t.id == idToCheck) {
                 return true
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
deleted file mode 100644
index c5766e11b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.lang.reflect.Type;
-import java.util.List;
-
-public class TaskSerializer implements JsonSerializer<Task> {
-    @Override
-    public JsonElement serialize(Task task, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject obj = new JsonObject();
-        obj.addProperty("_id", task.getId());
-        obj.addProperty("text", task.getText());
-        obj.addProperty("notes", task.getNotes());
-        obj.addProperty("value", task.getValue());
-        obj.addProperty("priority", task.getPriority());
-        obj.addProperty("attribute", task.getAttribute());
-        obj.addProperty("type", task.getType());
-        JsonArray tagsList = new JsonArray();
-        if (task.getTags() != null) {
-            for (Tag tag : task.getTags()) {
-                tagsList.add(tag.getId());
-            }
-        }
-        obj.add("tags", tagsList);
-        switch (task.getType()) {
-            case "habit":
-                obj.addProperty("up", task.getUp());
-                obj.addProperty("down", task.getDown());
-                obj.addProperty("frequency", task.getFrequency());
-                obj.addProperty("counterUp", task.getCounterUp());
-                obj.addProperty("counterDown", task.getCounterDown());
-                break;
-            case "daily":
-                obj.addProperty("frequency", task.getFrequency());
-                obj.addProperty("everyX", task.getEveryX());
-                obj.add("repeat", context.serialize(task.getRepeat()));
-                obj.add("startDate", context.serialize(task.getStartDate()));
-                obj.addProperty("streak", task.getStreak());
-                if (task.getChecklist() != null) {
-                    obj.add("checklist", serializeChecklist(task.getChecklist()));
-                }
-                if (task.getReminders() != null) {
-                    obj.add("reminders", serializeReminders(task.getReminders()));
-                }
-                obj.add("reminders", context.serialize(task.getReminders()));
-                obj.add("daysOfMonth", context.serialize(task.getDaysOfMonth()));
-                obj.add("weeksOfMonth", context.serialize(task.getWeeksOfMonth()));
-                obj.addProperty("completed", task.getCompleted());
-                break;
-            case "todo":
-                if (task.getDueDate() == null) {
-                    obj.addProperty("date", "");
-                } else {
-                    obj.add("date", context.serialize(task.getDueDate()));
-                }
-                if (task.getChecklist() != null) {
-                    obj.add("checklist", serializeChecklist(task.getChecklist()));
-                }
-                if (task.getReminders() != null) {
-                    obj.add("reminders", serializeReminders(task.getReminders()));
-                }
-                obj.addProperty("completed", task.getCompleted());
-                break;
-        }
-
-        return obj;
-    }
-
-    private JsonArray serializeChecklist(List<ChecklistItem> checklist) {
-        JsonArray jsonArray = new JsonArray();
-        for (ChecklistItem item : checklist) {
-            JsonObject object = new JsonObject();
-            object.addProperty("text", item.getText());
-            object.addProperty("id", item.getId());
-            object.addProperty("completed", item.getCompleted());
-            jsonArray.add(object);
-        }
-        return jsonArray;
-    }
-
-    private JsonArray serializeReminders(List<RemindersItem> reminders) {
-        JsonArray jsonArray = new JsonArray();
-        for (RemindersItem item : reminders) {
-            JsonObject object = new JsonObject();
-            object.addProperty("id", item.getId());
-            if (item.getStartDate() != null) {
-                object.addProperty("startDate", item.getStartDate().getTime());
-            }
-            object.addProperty("time", item.getTime().getTime());
-            jsonArray.add(object);
-        }
-        return jsonArray;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
new file mode 100644
index 000000000..2d3a37816
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
@@ -0,0 +1,94 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.*
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.RemindersItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import java.lang.reflect.Type
+import java.util.*
+
+class TaskSerializer : JsonSerializer<Task> {
+    override fun serialize(task: Task, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+        val obj = JsonObject()
+        obj.addProperty("_id", task.id)
+        obj.addProperty("text", task.text)
+        obj.addProperty("notes", task.notes)
+        obj.addProperty("value", task.value)
+        obj.addProperty("priority", task.priority)
+        obj.addProperty("attribute", task.attribute)
+        obj.addProperty("type", task.type)
+        val tagsList = JsonArray()
+        task.tags?.forEach { tag ->
+            tagsList.add(tag.id)
+        }
+        obj.add("tags", tagsList)
+        when (task.type) {
+            "habit" -> {
+                obj.addProperty("up", task.up)
+                obj.addProperty("down", task.down)
+                obj.addProperty("frequency", task.frequency)
+                obj.addProperty("counterUp", task.counterUp)
+                obj.addProperty("counterDown", task.counterDown)
+            }
+            "daily" -> {
+                obj.addProperty("frequency", task.frequency)
+                obj.addProperty("everyX", task.everyX)
+                obj.add("repeat", context.serialize(task.repeat))
+                obj.add("startDate", context.serialize(task.startDate))
+                obj.addProperty("streak", task.streak)
+                if (task.checklist != null) {
+                    obj.add("checklist", serializeChecklist(task.checklist))
+                }
+                if (task.reminders != null) {
+                    obj.add("reminders", serializeReminders(task.reminders))
+                }
+                obj.add("reminders", context.serialize(task.reminders))
+                obj.add("daysOfMonth", context.serialize(task.getDaysOfMonth()))
+                obj.add("weeksOfMonth", context.serialize(task.getWeeksOfMonth()))
+                obj.addProperty("completed", task.completed)
+            }
+            "todo" -> {
+                if (task.dueDate == null) {
+                    obj.addProperty("date", "")
+                } else {
+                    obj.add("date", context.serialize(task.dueDate))
+                }
+                if (task.checklist != null) {
+                    obj.add("checklist", serializeChecklist(task.checklist))
+                }
+                if (task.reminders != null) {
+                    obj.add("reminders", serializeReminders(task.reminders))
+                }
+                obj.addProperty("completed", task.completed)
+            }
+        }
+
+        return obj
+    }
+
+    private fun serializeChecklist(checklist: List<ChecklistItem>?): JsonArray {
+        val jsonArray = JsonArray()
+        checklist?.forEach { item ->
+            val jsonObject = JsonObject()
+            jsonObject.addProperty("text", item.text)
+            jsonObject.addProperty("id", item.id)
+            jsonObject.addProperty("completed", item.completed)
+            jsonArray.add(jsonObject)
+        }
+        return jsonArray
+    }
+
+    private fun serializeReminders(reminders: List<RemindersItem>?): JsonArray {
+        val jsonArray = JsonArray()
+        reminders?.forEach { item ->
+            val jsonObject = JsonObject()
+            jsonObject.addProperty("id", item.id)
+            if (item.startDate != null) {
+                jsonObject.addProperty("startDate", item.startDate?.time)
+            }
+            jsonObject.addProperty("time", item.time?.time ?: Date().time)
+            jsonArray.add(jsonObject)
+        }
+        return jsonArray
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
deleted file mode 100644
index b798cb129..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.Tag;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmList;
-
-public class TaskTagDeserializer implements JsonDeserializer<List<Tag>> {
-    @Override
-    public List<Tag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<Tag> tags = new RealmList<>();
-        List<Tag> databaseTags;
-        try {
-            Realm realm = Realm.getDefaultInstance();
-            databaseTags = realm.copyFromRealm(realm.where(Tag.class).findAll());
-            realm.close();
-        } catch (RuntimeException e) {
-            //Tests don't have a database
-            databaseTags = new ArrayList<>();
-        }
-
-        if (json.isJsonArray()) {
-            for (JsonElement tagElement : json.getAsJsonArray()) {
-                if (tagElement.isJsonObject()) {
-                    tags.add(context.deserialize(tagElement, Tag.class));
-                } else {
-                    try {
-                        String tagId = tagElement.getAsString();
-                        for (Tag tag : databaseTags) {
-                            if (tag.getId().equals(tagId)) {
-                                if (!alreadyContainsTag(tags, tagId)) {
-                                    tags.add(tag);
-                                }
-
-                                break;
-                            }
-                        }
-                    } catch (UnsupportedOperationException ignored) {
-
-                    }
-                }
-
-            }
-        }
-
-        return tags;
-    }
-
-    private boolean alreadyContainsTag(List<Tag> list, String idToCheck) {
-        for (Tag t : list) {
-            if (t.getId().equals(idToCheck)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt
new file mode 100644
index 000000000..1a2c36ecd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt
@@ -0,0 +1,64 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.Tag
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.util.*
+
+class TaskTagDeserializer : JsonDeserializer<List<Tag>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<Tag> {
+        val tags = RealmList<Tag>()
+        var databaseTags: List<Tag>
+        try {
+            val realm = Realm.getDefaultInstance()
+            databaseTags = realm.copyFromRealm(realm.where(Tag::class.java).findAll())
+            realm.close()
+        } catch (e: RuntimeException) {
+            //Tests don't have a database
+            databaseTags = ArrayList()
+        }
+
+        if (json.isJsonArray) {
+            for (tagElement in json.asJsonArray) {
+                if (tagElement.isJsonObject) {
+                    tags.add(context.deserialize<Tag>(tagElement, Tag::class.java))
+                } else {
+                    try {
+                        val tagId = tagElement.asString
+                        for (tag in databaseTags) {
+                            if (tag.id == tagId) {
+                                if (!alreadyContainsTag(tags, tagId)) {
+                                    tags.add(tag)
+                                }
+
+                                break
+                            }
+                        }
+                    } catch (ignored: UnsupportedOperationException) {
+
+                    }
+
+                }
+
+            }
+        }
+
+        return tags
+    }
+
+    private fun alreadyContainsTag(list: List<Tag>, idToCheck: String): Boolean {
+        for (t in list) {
+            if (t.id == idToCheck) {
+                return true
+            }
+        }
+
+        return false
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
deleted file mode 100644
index b33404767..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import io.realm.RealmList;
-
-public class TutorialStepListDeserializer implements JsonDeserializer<List<TutorialStep>> {
-    @Override
-    public List<TutorialStep> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<TutorialStep> vals = new RealmList<>();
-        for (String group : Arrays.asList("common", "android")) {
-            if (json.getAsJsonObject().has(group)) {
-                for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().get(group).getAsJsonObject().entrySet()) {
-
-                    vals.add(parseStep(group, entry));
-                }
-            }
-        }
-
-        return vals;
-    }
-
-    private TutorialStep parseStep(String group, Map.Entry<String, JsonElement> entry) {
-        TutorialStep article = new TutorialStep();
-        article.setTutorialGroup(group);
-        article.setIdentifier(entry.getKey());
-        article.setWasCompleted(entry.getValue().getAsBoolean());
-        return article;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt
new file mode 100644
index 000000000..b7f838f00
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt
@@ -0,0 +1,33 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.TutorialStep
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class TutorialStepListDeserializer : JsonDeserializer<List<TutorialStep>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<TutorialStep> {
+        val steps = RealmList<TutorialStep>()
+        for (group in listOf("common", "android")) {
+            if (json.asJsonObject.has(group)) {
+                for (entry in json.asJsonObject.get(group).asJsonObject.entrySet()) {
+                    steps.add(parseStep(group, entry))
+                }
+            }
+        }
+
+        return steps
+    }
+
+    private fun parseStep(group: String, entry: MutableMap.MutableEntry<String, JsonElement>): TutorialStep {
+        val article = TutorialStep()
+        article.tutorialGroup = group
+        article.identifier = entry.key
+        article.wasCompleted = entry.value.asBoolean
+        return article
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index 4d98f4e72..3fd709d81 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -6,6 +6,7 @@ import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonParseException
 import com.google.gson.reflect.TypeToken
+import com.habitrpg.android.habitica.extensions.getAsString
 import com.habitrpg.android.habitica.models.PushDevice
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Tag
@@ -29,7 +30,10 @@ class UserDeserializer : JsonDeserializer<User> {
         val obj = json.asJsonObject
 
         if (obj.has("_id")) {
-            user.id = obj.get("_id").asString
+            user.id = obj.getAsString("_id")
+        }
+        if (obj.has("_v")) {
+            user.versionNumber = obj.get("_v").asInt
         }
 
         if (obj.has("balance")) {
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
deleted file mode 100644
index 36b9cfe27..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-public class AddTaskWidgetProvider extends BaseWidgetProvider {
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_add_task;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-        // Get all ids
-        ComponentName thisWidget = new ComponentName(context,
-                AddTaskWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            for (int widgetId : allWidgetIds) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                        sizeRemoteViews(context, options, widgetId));
-            }
-        }
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-
-        String selectedTaskType = getSelectedTaskType(widgetId);
-        String addText = "";
-        int backgroundResource = R.drawable.widget_add_habit_background;
-        switch (selectedTaskType) {
-            case Task.TYPE_HABIT:
-                addText = this.getContext().getResources().getString(R.string.add_habit);
-                backgroundResource = R.drawable.widget_add_habit_background;
-                break;
-            case Task.TYPE_DAILY:
-                addText = this.getContext().getResources().getString(R.string.add_daily);
-                backgroundResource = R.drawable.widget_add_daily_background;
-                break;
-            case Task.TYPE_TODO:
-                addText = this.getContext().getResources().getString(R.string.add_todo);
-                backgroundResource = R.drawable.widget_add_todo_background;
-                break;
-            case Task.TYPE_REWARD:
-                addText = this.getContext().getResources().getString(R.string.add_reward);
-                backgroundResource = R.drawable.widget_add_reward_background;
-                break;
-        }
-        remoteViews.setTextViewText(R.id.add_task_text, addText);
-        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource);
-        return remoteViews;
-    }
-
-    private String getSelectedTaskType(int widgetId) {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getContext());
-        return preferences.getString("add_task_widget_" + widgetId, Task.TYPE_HABIT);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
new file mode 100644
index 000000000..803c9f6d5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
@@ -0,0 +1,63 @@
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.widget.RemoteViews
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.tasks.Task
+
+class AddTaskWidgetProvider : BaseWidgetProvider() {
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_add_task
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        // Get all ids
+        val thisWidget = ComponentName(context,
+                AddTaskWidgetProvider::class.java)
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                    sizeRemoteViews(context, options, widgetId))
+        }
+    }
+
+    override fun configureRemoteViews(remoteViews: RemoteViews, widgetId: Int, columns: Int, rows: Int): RemoteViews {
+
+        val selectedTaskType = getSelectedTaskType(widgetId)
+        var addText: String? = ""
+        var backgroundResource = R.drawable.widget_add_habit_background
+        when (selectedTaskType) {
+            Task.TYPE_HABIT -> {
+                addText = context?.resources?.getString(R.string.add_habit)
+                backgroundResource = R.drawable.widget_add_habit_background
+            }
+            Task.TYPE_DAILY -> {
+                addText = context?.resources?.getString(R.string.add_daily)
+                backgroundResource = R.drawable.widget_add_daily_background
+            }
+            Task.TYPE_TODO -> {
+                addText = context?.resources?.getString(R.string.add_todo)
+                backgroundResource = R.drawable.widget_add_todo_background
+            }
+            Task.TYPE_REWARD -> {
+                addText = context?.resources?.getString(R.string.add_reward)
+                backgroundResource = R.drawable.widget_add_reward_background
+            }
+        }
+        remoteViews.setTextViewText(R.id.add_task_text, addText)
+        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource)
+        return remoteViews
+    }
+
+    private fun getSelectedTaskType(widgetId: Int): String {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this.context)
+        return preferences.getString("add_task_widget_$widgetId", Task.TYPE_HABIT) ?: ""
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
deleted file mode 100644
index 1c76a8bd3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import androidx.annotation.NonNull;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.helpers.HealthFormatter;
-import com.habitrpg.android.habitica.helpers.NumberAbbreviator;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.user.User;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
-
-    private AppWidgetManager appWidgetManager;
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_avatar_stats;
-    }
-
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-    @Inject
-    UserRepository userRepository;
-    private Boolean showManaBar = true;
-
-    private void setUp() {
-        if (userRepository == null) {
-            Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        }
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-        this.setUp();
-        this.appWidgetManager = appWidgetManager;
-        this.setContext(context);
-
-        userRepository.getUser(userId).firstElement().subscribe(this::updateData, RxErrorHandler.Companion.handleEmptyError());
-    }
-
-    @NonNull
-    @Override
-    public RemoteViews configureRemoteViews(@NonNull RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        if (columns > 3) {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE);
-        } else {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE);
-        }
-
-        showManaBar = rows > 1;
-        if (rows > 1) {
-            remoteViews.setViewVisibility(R.id.mp_wrapper, View.VISIBLE);
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE);
-        } else {
-            remoteViews.setViewVisibility(R.id.mp_wrapper, View.GONE);
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE);
-        }
-
-        return remoteViews;
-    }
-
-    private void updateData(User user) {
-        if (user == null || user.getStats() == null) {
-            return;
-        }
-        Stats stats = user.getStats();
-        ComponentName thisWidget = new ComponentName(getContext(), AvatarStatsWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        Double currentHealth = HealthFormatter.format(stats.getHp());
-        String currentHealthString = HealthFormatter.formatToString(stats.getHp());
-        String healthValueString = currentHealthString + "/" + stats.getMaxHealth();
-        String expValueString = "" + stats.getExp().intValue() + "/" + stats.getToNextLevel();
-        String mpValueString = "" + stats.getMp().intValue() + "/" + stats.getMaxMP();
-
-        for (int widgetId : allWidgetIds) {
-            RemoteViews remoteViews = new RemoteViews(getContext().getPackageName(), R.layout.widget_avatar_stats);
-
-            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString);
-            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString);
-            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString);
-
-            remoteViews.setImageViewBitmap(R.id.ic_hp_header, HabiticaIconsHelper.imageOfHeartDarkBg());
-            remoteViews.setImageViewBitmap(R.id.ic_exp_header, HabiticaIconsHelper.imageOfExperience());
-            remoteViews.setImageViewBitmap(R.id.ic_mp_header, HabiticaIconsHelper.imageOfMagic());
-
-            remoteViews.setProgressBar(R.id.hp_bar, stats.getMaxHealth(), currentHealth.intValue(), false);
-            remoteViews.setProgressBar(R.id.exp_bar, stats.getToNextLevel(), stats.getExp().intValue(), false);
-            remoteViews.setProgressBar(R.id.mp_bar, stats.getMaxMP(), stats.getMp().intValue(), false);
-            remoteViews.setViewVisibility(R.id.mp_wrapper, showManaBar && ( stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
-
-            remoteViews.setTextViewText(R.id.gold_tv, NumberAbbreviator.INSTANCE.abbreviate(getContext(), stats.getGp()));
-            remoteViews.setTextViewText(R.id.gems_tv, String.valueOf((int) (user.getBalance() * 4)));
-            int hourGlassCount = user.getHourglassCount();
-            if (hourGlassCount == 0) {
-                remoteViews.setViewVisibility(R.id.hourglass_icon, View.GONE);
-                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.GONE);
-            } else {
-                remoteViews.setImageViewBitmap(R.id.hourglass_icon, HabiticaIconsHelper.imageOfHourglass());
-                remoteViews.setViewVisibility(R.id.hourglass_icon, View.VISIBLE);
-                remoteViews.setTextViewText(R.id.hourglasses_tv, String.valueOf(hourGlassCount));
-                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.VISIBLE);
-            }
-            remoteViews.setImageViewBitmap(R.id.gem_icon, HabiticaIconsHelper.imageOfGem());
-            remoteViews.setImageViewBitmap(R.id.gold_icon, HabiticaIconsHelper.imageOfGold());
-            remoteViews.setTextViewText(R.id.lvl_tv, getContext().getString(R.string.user_level, user.getStats().getLvl()));
-
-            AvatarView avatarView = new AvatarView(getContext(), true, true, true);
-
-            avatarView.setAvatar(user);
-            RemoteViews finalRemoteViews = remoteViews;
-            avatarView.onAvatarImageReady(bitmap -> {
-                finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap);
-                appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews);
-            });
-
-            //If user click on life and xp: open the app
-            Intent openAppIntent = new Intent(getContext().getApplicationContext(), MainActivity.class);
-            PendingIntent openApp = PendingIntent.getActivity(getContext(), 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            remoteViews.setOnClickPendingIntent(R.id.widget_main_view, openApp);
-
-
-            if (Build.VERSION.SDK_INT >= 16) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                remoteViews = sizeRemoteViews(getContext(), options, widgetId);
-            }
-
-            appWidgetManager.updateAppWidget(widgetId, remoteViews);
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
new file mode 100644
index 000000000..b817fe4b5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
@@ -0,0 +1,134 @@
+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.view.View
+import android.widget.RemoteViews
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.HealthFormatter
+import com.habitrpg.android.habitica.helpers.NumberAbbreviator
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import io.reactivex.functions.Consumer
+
+class AvatarStatsWidgetProvider : BaseWidgetProvider() {
+
+    private var appWidgetManager: AppWidgetManager? = null
+
+    private var showManaBar: Boolean = true
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_avatar_stats
+    }
+
+    private fun setUp() {
+        if (!hasInjected) {
+            hasInjected = true
+            HabiticaBaseApplication.userComponent?.inject(this)
+        }
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        this.setUp()
+        this.appWidgetManager = appWidgetManager
+        this.context = context
+
+        userRepository?.getUser()?.firstElement()?.subscribe(Consumer<User> { this.updateData(it) }, RxErrorHandler.handleEmptyError())
+    }
+
+    override fun configureRemoteViews(remoteViews: RemoteViews, widgetId: Int, columns: Int, rows: Int): RemoteViews {
+        if (columns > 3) {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE)
+        } else {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE)
+        }
+
+        showManaBar = rows > 1
+        if (rows > 1) {
+            remoteViews.setViewVisibility(R.id.mp_wrapper, View.VISIBLE)
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE)
+        } else {
+            remoteViews.setViewVisibility(R.id.mp_wrapper, View.GONE)
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE)
+        }
+
+        return remoteViews
+    }
+
+    private fun updateData(user: User?) {
+        val context = context
+        val appWidgetManager = appWidgetManager
+        val stats = user?.stats
+        if (user == null || stats == null || context == null || appWidgetManager == null) {
+            return
+        }
+        val thisWidget = ComponentName(context, AvatarStatsWidgetProvider::class.java)
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+        val currentHealth = HealthFormatter.format(stats.hp ?: 0.0)
+        val currentHealthString = HealthFormatter.formatToString(stats.hp ?: 0.0)
+        val healthValueString = currentHealthString + "/" + stats.maxHealth
+        val expValueString = "" + stats.exp?.toInt() + "/" + stats.toNextLevel
+        val mpValueString = "" + stats.mp?.toInt() + "/" + stats.maxMP
+
+        for (widgetId in allWidgetIds) {
+            var remoteViews = RemoteViews(context.packageName, R.layout.widget_avatar_stats)
+
+            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString)
+            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString)
+            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString)
+
+            remoteViews.setImageViewBitmap(R.id.ic_hp_header, HabiticaIconsHelper.imageOfHeartDarkBg())
+            remoteViews.setImageViewBitmap(R.id.ic_exp_header, HabiticaIconsHelper.imageOfExperience())
+            remoteViews.setImageViewBitmap(R.id.ic_mp_header, HabiticaIconsHelper.imageOfMagic())
+
+            remoteViews.setProgressBar(R.id.hp_bar, stats.maxHealth ?: 0, currentHealth.toInt(), false)
+            remoteViews.setProgressBar(R.id.exp_bar, stats.toNextLevel ?: 0, stats.exp?.toInt() ?: 0, false)
+            remoteViews.setProgressBar(R.id.mp_bar, stats.maxMP ?: 0, stats.mp?.toInt() ?: 0, false)
+            remoteViews.setViewVisibility(R.id.mp_wrapper, if (showManaBar && (stats.habitClass == null || (stats.lvl ?: 0) < 10 || user.preferences?.disableClasses == true)) View.GONE else View.VISIBLE)
+
+            remoteViews.setTextViewText(R.id.gold_tv, NumberAbbreviator.abbreviate(context, stats.gp ?: 0.0))
+            remoteViews.setTextViewText(R.id.gems_tv, (user.balance * 4).toInt().toString())
+            val hourGlassCount = user.hourglassCount
+            if (hourGlassCount == 0) {
+                remoteViews.setViewVisibility(R.id.hourglass_icon, View.GONE)
+                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.GONE)
+            } else {
+                remoteViews.setImageViewBitmap(R.id.hourglass_icon, HabiticaIconsHelper.imageOfHourglass())
+                remoteViews.setViewVisibility(R.id.hourglass_icon, View.VISIBLE)
+                remoteViews.setTextViewText(R.id.hourglasses_tv, hourGlassCount.toString())
+                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.VISIBLE)
+            }
+            remoteViews.setImageViewBitmap(R.id.gem_icon, HabiticaIconsHelper.imageOfGem())
+            remoteViews.setImageViewBitmap(R.id.gold_icon, HabiticaIconsHelper.imageOfGold())
+            remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.stats?.lvl ?: 0))
+
+            val avatarView = AvatarView(context, showBackground = true, showMount = true, showPet = true)
+
+            avatarView.setAvatar(user)
+            val finalRemoteViews = remoteViews
+            avatarView.onAvatarImageReady(Consumer { bitmap ->
+                finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap)
+                appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews)
+            })
+
+            //If user click on life and xp: open the app
+            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
+            val openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            remoteViews.setOnClickPendingIntent(R.id.widget_main_view, openApp)
+
+
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            remoteViews = sizeRemoteViews(context, options, widgetId)
+
+            appWidgetManager.updateAppWidget(widgetId, remoteViews)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
index bbc3ebcfc..9194e713a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
@@ -19,6 +19,8 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
     @Inject
     lateinit var userRepository: UserRepository
 
+    var hasInjected = false
+
     protected var context: Context? = null
 
     /**
@@ -62,7 +64,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
         return configureRemoteViews(remoteViews, widgetId, columns, rows)
     }
 
-    protected fun showToastForTaskDirection(context: Context, data: TaskScoringResult?, userID: String) {
+    protected fun showToastForTaskDirection(context: Context, data: TaskScoringResult?) {
         if (data != null) {
             val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(context, data.experienceDelta!!, data.healthDelta!!, data.goldDelta!!, data.manaDelta!!)
             val toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG)
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
deleted file mode 100644
index a80251dc3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-
-public class DailiesListFactory extends TaskListFactory {
-    public DailiesListFactory(Context context, Intent intent) {
-        super(context, intent, Task.TYPE_DAILY, R.layout.widget_dailies_list_row, R.id.dailies_text);
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
new file mode 100644
index 000000000..94cbf168b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.widget
+
+import android.content.Context
+import android.content.Intent
+
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.tasks.Task
+
+
+class DailiesListFactory(context: Context, intent: Intent) : TaskListFactory(context, intent, Task.TYPE_DAILY, R.layout.widget_dailies_list_row, R.id.dailies_text)
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
deleted file mode 100644
index 31567dd72..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.content.Context;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.api.HostConfig;
-import com.habitrpg.android.habitica.data.ApiClient;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-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";
-
-    @Inject
-    ApiClient apiClient;
-    @Inject
-    HostConfig hostConfig;
-
-    private void setUp(Context context) {
-        if (apiClient == null) {
-            Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        }
-    }
-
-    @Override
-    protected Class getServiceClass() {
-        return DailiesWidgetService.class;
-    }
-
-    @Override
-    protected Class getProviderClass() {
-        return DailiesWidgetProvider.class;
-    }
-
-    @Override
-    protected int getTitleResId() {
-        return R.string.dailies;
-    }
-}
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.kt
new file mode 100644
index 000000000..98a992543
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.widget
+
+import com.habitrpg.android.habitica.R
+
+class DailiesWidgetProvider : TaskListWidgetProvider() {
+    override val serviceClass: Class<*>
+        get() = DailiesWidgetService::class.java
+    override val providerClass: Class<*>
+        get() = DailiesWidgetProvider::class.java
+    override val titleResId: Int
+        get() = R.string.dailies
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.java
deleted file mode 100644
index 1119d6201..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.content.Intent;
-import android.widget.RemoteViewsService;
-
-
-public class DailiesWidgetService extends RemoteViewsService {
-
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new DailiesListFactory(this.getApplicationContext(), intent);
-    }
-}
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt
new file mode 100644
index 000000000..d0fa4fbab
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.widget
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+
+
+class DailiesWidgetService : RemoteViewsService() {
+
+    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
+        return DailiesListFactory(this.applicationContext, intent)
+    }
+}
+
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
deleted file mode 100644
index c71546a90..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.modules.AppModule;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class HabitButtonWidgetProvider extends BaseWidgetProvider {
-
-    public static final String HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION";
-    public static final String TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM";
-    public static final String TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION";
-    @Inject
-    public TaskRepository taskRepository;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    public String userId;
-
-    private void setUp() {
-        if (taskRepository == null) {
-            Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        }
-    }
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_habit_button;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-        setUp();
-        ComponentName thisWidget = new ComponentName(context,
-                HabitButtonWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        for (int widgetId : allWidgetIds) {
-            Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-            appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                    sizeRemoteViews(context, options, widgetId));
-        }
-
-        // Build the intent to call the service
-        Intent intent = new Intent(context.getApplicationContext(), HabitButtonWidgetService.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds);
-
-        try {
-            context.startService(intent);
-        } catch (IllegalStateException ignore) {
-            //TODO: Make this play more nicely with Android 8
-        }
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        setUp();
-        if (intent.getAction().equals(HABIT_ACTION)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
-            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            String taskId = intent.getStringExtra(TASK_ID);
-            String direction = intent.getStringExtra(TASK_DIRECTION);
-
-            int[] ids = {appWidgetId};
-
-            if (taskId != null) {
-                getUserRepository().getUser(userId).firstElement().flatMap(user -> taskRepository.taskChecked(user, taskId, TaskDirection.UP.getText().equals(direction), false, null))
-                        .subscribe(taskDirectionData -> showToastForTaskDirection(context, taskDirectionData, userId), RxErrorHandler.Companion.handleEmptyError(), () -> this.onUpdate(context, mgr, ids));
-            }
-        }
-        super.onReceive(context, intent);
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        return remoteViews;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
new file mode 100644
index 000000000..73c1a759d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
@@ -0,0 +1,84 @@
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.widget.RemoteViews
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.responses.TaskDirection
+import io.reactivex.functions.Action
+import io.reactivex.functions.Consumer
+import javax.inject.Inject
+
+class HabitButtonWidgetProvider : BaseWidgetProvider() {
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    private fun setUp() {
+        if (!hasInjected) {
+            hasInjected = true
+            HabiticaBaseApplication.userComponent?.inject(this)
+        }
+    }
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_habit_button
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        setUp()
+        val thisWidget = ComponentName(context,
+                HabitButtonWidgetProvider::class.java)
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                    sizeRemoteViews(context, options, widgetId))
+        }
+
+        // Build the intent to call the service
+        val intent = Intent(context.applicationContext, HabitButtonWidgetService::class.java)
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds)
+
+        try {
+            context.startService(intent)
+        } catch (ignore: IllegalStateException) {
+        }
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        setUp()
+        if (intent.action == HABIT_ACTION) {
+            val mgr = AppWidgetManager.getInstance(context)
+            val appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID)
+            val taskId = intent.getStringExtra(TASK_ID)
+            val direction = intent.getStringExtra(TASK_DIRECTION)
+
+            val ids = intArrayOf(appWidgetId)
+
+            if (taskId != null) {
+                userRepository.getUser().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null) }
+                        .subscribe(Consumer { taskDirectionData -> showToastForTaskDirection(context, taskDirectionData) }, RxErrorHandler.handleEmptyError(), Action { this.onUpdate(context, mgr, ids) })
+            }
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun configureRemoteViews(remoteViews: RemoteViews, widgetId: Int, columns: Int, rows: Int): RemoteViews {
+        return remoteViews
+    }
+
+    companion object {
+
+        const val HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION"
+        const val TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM"
+        const val TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION"
+    }
+}
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
deleted file mode 100644
index 5591cdfcc..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.app.PendingIntent;
-import android.app.Service;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.os.IBinder;
-import androidx.core.content.ContextCompat;
-import android.text.SpannableStringBuilder;
-import android.text.style.DynamicDrawableSpan;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-
-import net.pherth.android.emoji_library.EmojiHandler;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class HabitButtonWidgetService extends Service {
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    public String userId;
-    @Inject
-    public SharedPreferences sharedPreferences;
-    @Inject
-    public Resources resources;
-    @Inject
-    public Context context;
-    @Inject
-    TaskRepository taskRepository;
-    private AppWidgetManager appWidgetManager;
-
-    private Map<String, Integer> taskMapping;
-    private int[] allWidgetIds;
-
-    @Override
-    public int onStartCommand(final Intent intent, int flags, int startId) {
-        Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        this.appWidgetManager = AppWidgetManager.getInstance(this);
-        ComponentName thisWidget = new ComponentName(this, HabitButtonWidgetProvider.class);
-        allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        makeTaskMapping();
-
-        for (String taskid : this.taskMapping.keySet()) {
-            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe(this::updateData, RxErrorHandler.Companion.handleEmptyError());
-        }
-
-        stopSelf();
-
-        return START_STICKY;
-    }
-
-    private void updateData(Task task) {
-        RemoteViews remoteViews = new RemoteViews(this.getPackageName(), R.layout.widget_habit_button);
-        if (task != null && task.isValid()) {
-            CharSequence parsedText = MarkdownParser.INSTANCE.parseMarkdown(task.getText());
-
-            SpannableStringBuilder builder = new SpannableStringBuilder(parsedText);
-            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false);
-
-            remoteViews.setTextViewText(R.id.habit_title, builder);
-
-            if (!task.getUp()) {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE);
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null);
-            } else {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.getLightTaskColor()));
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.getId(), TaskDirection.UP.getText(), taskMapping.get(task.getId())));
-            }
-            if (!task.getDown()) {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE);
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null);
-            } else {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.getMediumTaskColor()));
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.DOWN.getText(), taskMapping.get(task.getId())));
-            }
-            if (taskMapping.get(task.getId()) != null && remoteViews != null) {
-                appWidgetManager.updateAppWidget(taskMapping.get(task.getId()), remoteViews);
-            }
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    private void makeTaskMapping() {
-        this.taskMapping = new HashMap<>();
-        for (int widgetId : allWidgetIds) {
-            String taskId = getTaskId(widgetId);
-            if (!taskId.equals("")) {
-                this.taskMapping.put(taskId, widgetId);
-            }
-        }
-    }
-
-    private String getTaskId(int widgetId) {
-        return sharedPreferences.getString("habit_button_widget_" + widgetId, "");
-    }
-
-    private PendingIntent getPendingIntent(String taskId, String direction, int widgetId) {
-        Intent taskIntent = new Intent(context, HabitButtonWidgetProvider.class);
-        taskIntent.setAction(HabitButtonWidgetProvider.HABIT_ACTION);
-        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId);
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction);
-        return PendingIntent.getBroadcast(context, widgetId + direction.hashCode(), taskIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
new file mode 100644
index 000000000..f9a955d51
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
@@ -0,0 +1,115 @@
+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.os.IBinder
+import android.text.SpannableStringBuilder
+import android.text.style.DynamicDrawableSpan
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import io.reactivex.functions.Consumer
+import net.pherth.android.emoji_library.EmojiHandler
+import java.util.*
+import javax.inject.Inject
+
+class HabitButtonWidgetService : Service() {
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+    @Inject
+    lateinit var context: Context
+    @Inject
+    lateinit var taskRepository: TaskRepository
+    private var appWidgetManager: AppWidgetManager? = null
+
+    private var taskMapping = mutableMapOf<String, Int>()
+    private var allWidgetIds: IntArray? = null
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        HabiticaBaseApplication.userComponent?.inject(this)
+        this.appWidgetManager = AppWidgetManager.getInstance(this)
+        val thisWidget = ComponentName(this, HabitButtonWidgetProvider::class.java)
+        allWidgetIds = appWidgetManager?.getAppWidgetIds(thisWidget)
+        makeTaskMapping()
+
+        for (taskid in this.taskMapping.keys) {
+            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe(Consumer<Task> { this.updateData(it) }, RxErrorHandler.handleEmptyError())
+        }
+
+        stopSelf()
+
+        return Service.START_STICKY
+    }
+
+    private fun updateData(task: Task?) {
+        val remoteViews = RemoteViews(this.packageName, R.layout.widget_habit_button)
+        if (task != null && task.isValid) {
+            val parsedText = MarkdownParser.parseMarkdown(task.text)
+
+            val builder = SpannableStringBuilder(parsedText)
+            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false)
+
+            remoteViews.setTextViewText(R.id.habit_title, builder)
+
+            if (task.up != true) {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE)
+                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null)
+            } else {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE)
+                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.lightTaskColor))
+                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.id, TaskDirection.UP.text, taskMapping[task.id]!!))
+            }
+            if (task.down != true) {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE)
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null)
+            } else {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE)
+                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.mediumTaskColor))
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.id, TaskDirection.DOWN.text, taskMapping[task.id]!!))
+            }
+            if (taskMapping[task.id] != null) {
+                appWidgetManager?.updateAppWidget(taskMapping[task.id]!!, remoteViews)
+            }
+        }
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    private fun makeTaskMapping() {
+        this.taskMapping = HashMap()
+        for (widgetId in allWidgetIds!!) {
+            val taskId = getTaskId(widgetId)
+            if (taskId != "") {
+                this.taskMapping[taskId] = widgetId
+            }
+        }
+    }
+
+    private fun getTaskId(widgetId: Int): String {
+        return sharedPreferences.getString("habit_button_widget_$widgetId", "") ?: ""
+    }
+
+    private fun getPendingIntent(taskId: String?, direction: String, widgetId: Int): PendingIntent {
+        val taskIntent = Intent(context, HabitButtonWidgetProvider::class.java)
+        taskIntent.action = HabitButtonWidgetProvider.HABIT_ACTION
+        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId)
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction)
+        return PendingIntent.getBroadcast(context, widgetId + direction.hashCode(), taskIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
deleted file mode 100644
index fd570c747..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.text.SpannableStringBuilder;
-import android.text.style.DynamicDrawableSpan;
-import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-
-import net.pherth.android.emoji_library.EmojiHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-
-public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsFactory {
-    private final int widgetId;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    public String userID;
-    @Inject
-    TaskRepository taskRepository;
-    @Inject
-    UserRepository userRepository;
-    private int listItemResId;
-    private int listItemTextResId;
-    private String taskType;
-    private List<Task> taskList = new ArrayList<>();
-    private Context context = null;
-    private boolean reloadData;
-
-    TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
-        this.context = context;
-        this.widgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
-        this.listItemResId = listItemResId;
-        this.listItemTextResId = listItemTextResId;
-        this.reloadData = false;
-        this.taskType = taskType;
-
-        if (userID == null) {
-            Objects.requireNonNull(HabiticaApplication.Companion.getUserComponent()).inject(this);
-        }
-        this.loadData();
-    }
-
-    private void loadData() {
-        Handler mainHandler = new Handler(context.getMainLooper());
-        mainHandler.post(() -> taskRepository.getTasks(taskType, userID)
-                .firstElement()
-                .toObservable()
-                .flatMap(Observable::fromIterable)
-                .filter(task -> (task.getType().equals(Task.TYPE_TODO) && !task.getCompleted()) || task.isDisplayedActive())
-                .toList()
-                .flatMapMaybe(tasks -> taskRepository.getTaskCopies(tasks).firstElement())
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(tasks -> {
-                    reloadData = false;
-                    taskList = tasks;
-                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view);
-                }, RxErrorHandler.Companion.handleEmptyError()));
-
-    }
-
-
-    @Override
-    public void onCreate() {
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        if (this.reloadData) {
-            this.loadData();
-        }
-        this.reloadData = true;
-    }
-
-    @Override
-    public void onDestroy() {
-    }
-
-    @Override
-    public int getCount() {
-        return taskList.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        final RemoteViews remoteView = new RemoteViews(
-                context.getPackageName(), listItemResId);
-        if (taskList.size() > position) {
-            Task task = taskList.get(position);
-
-            CharSequence parsedText = MarkdownParser.INSTANCE.parseMarkdown(task.getText());
-
-            SpannableStringBuilder builder = new SpannableStringBuilder(parsedText);
-            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false);
-
-            remoteView.setTextViewText(listItemTextResId, builder);
-            remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.getLightTaskColor());
-            Intent fillInIntent = new Intent();
-            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.getId());
-            remoteView.setOnClickFillInIntent(R.id.widget_list_row, fillInIntent);
-        }
-        return remoteView;
-    }
-
-    @Override
-    public RemoteViews getLoadingView() {
-        return new RemoteViews(context.getPackageName(), listItemResId);
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        if (taskList.size() > position) {
-            Task task = taskList.get(position);
-            return task.getId().hashCode();
-        }
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
new file mode 100644
index 000000000..b96e9aa93
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -0,0 +1,114 @@
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+import android.os.Handler
+import android.text.SpannableStringBuilder
+import android.text.style.DynamicDrawableSpan
+import android.widget.RemoteViews
+import android.widget.RemoteViewsService
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.functions.Consumer
+import net.pherth.android.emoji_library.EmojiHandler
+import java.util.*
+import javax.inject.Inject
+
+abstract class TaskListFactory internal constructor(val context: Context, intent: Intent, private val taskType: String, private val listItemResId: Int, private val listItemTextResId: Int) : RemoteViewsService.RemoteViewsFactory {
+    private val widgetId: Int = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0)
+    @Inject
+    lateinit var taskRepository: TaskRepository
+    @Inject
+    lateinit var userRepository: UserRepository
+    private var taskList: List<Task> = ArrayList()
+    private var reloadData: Boolean = false
+
+    init {
+        this.reloadData = false
+    }
+
+    private fun loadData() {
+        val mainHandler = Handler(context.mainLooper)
+        mainHandler.post {
+            taskRepository.getCurrentUserTasks(taskType)
+                    .firstElement()
+                    .toObservable()
+                    .flatMap { Observable.fromIterable(it) }
+                    .filter { task -> task.type == Task.TYPE_TODO && !task.completed || task.isDisplayedActive }
+                    .toList()
+                    .flatMapMaybe { tasks -> taskRepository.getTaskCopies(tasks).firstElement() }
+                    .subscribeOn(AndroidSchedulers.mainThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(Consumer { tasks ->
+                        reloadData = false
+                        taskList = tasks
+                        AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view)
+                    }, RxErrorHandler.handleEmptyError())
+        }
+
+    }
+
+    override fun onCreate() {
+        HabiticaBaseApplication.userComponent?.inject(this)
+        this.loadData()
+    }
+    override fun onDestroy() {}
+
+    override fun onDataSetChanged() {
+        if (this.reloadData) {
+            this.loadData()
+        }
+        this.reloadData = true
+    }
+
+    override fun getCount(): Int {
+        return taskList.size
+    }
+
+    override fun getViewAt(position: Int): RemoteViews {
+        val remoteView = RemoteViews(context.packageName, listItemResId)
+        if (taskList.size > position) {
+            val task = taskList[position]
+
+            val parsedText = MarkdownParser.parseMarkdown(task.text)
+
+            val builder = SpannableStringBuilder(parsedText)
+            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false)
+
+            remoteView.setTextViewText(listItemTextResId, builder)
+            remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.lightTaskColor)
+            val fillInIntent = Intent()
+            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.id)
+            remoteView.setOnClickFillInIntent(R.id.widget_list_row, fillInIntent)
+        }
+        return remoteView
+    }
+
+    override fun getLoadingView(): RemoteViews {
+        return RemoteViews(context.packageName, listItemResId)
+    }
+
+    override fun getViewTypeCount(): Int {
+        return 1
+    }
+
+    override fun getItemId(position: Int): Long {
+        if (taskList.size > position) {
+            val task = taskList[position]
+            return task.id.hashCode().toLong()
+        }
+        return position.toLong()
+    }
+
+    override fun hasStableIds(): Boolean {
+        return true
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
deleted file mode 100644
index 22035b267..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
-    public static final String DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION";
-    public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
-
-    @Inject
-    ApiClient apiClient;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-    @Inject
-    TaskRepository taskRepository;
-
-    private void setUp(Context context) {
-        if (apiClient == null) {
-            Objects.requireNonNull(HabiticaBaseApplication.Companion.getUserComponent()).inject(this);
-        }
-    }
-
-    protected abstract Class getServiceClass();
-
-    protected abstract Class getProviderClass();
-
-    protected abstract int getTitleResId();
-
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        setUp(context);
-        if (intent.getAction().equals(DAILY_ACTION)) {
-            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            String taskId = intent.getStringExtra(TASK_ID_ITEM);
-
-            if (taskId != null) {
-                getUserRepository().getUser(userId).firstElement().flatMap(user -> taskRepository.taskChecked(user, taskId, true, false, null))
-                        .subscribe(taskDirectionData -> {
-                            taskRepository.markTaskCompleted(taskId, true);
-                            showToastForTaskDirection(context, taskDirectionData, userId);
-                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-                        }, RxErrorHandler.Companion.handleEmptyError());
-            }
-        }
-        super.onReceive(context, intent);
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-        setUp(context);
-        ComponentName thisWidget = new ComponentName(context, getProviderClass());
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            for (int widgetId : allWidgetIds) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                        sizeRemoteViews(context, options, widgetId));
-            }
-        }
-
-        for (int appWidgetId : appWidgetIds) {
-            Intent intent = new Intent(context, getServiceClass());
-            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-            RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_task_list);
-            rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent);
-            rv.setEmptyView(R.id.list_view, R.id.emptyView);
-            rv.setTextViewText(R.id.widget_title, context.getString(getTitleResId()));
-
-            // if the user click on the title: open App
-            Intent openAppIntent = new Intent(context.getApplicationContext(), MainActivity.class);
-            PendingIntent openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            rv.setOnClickPendingIntent(R.id.widget_title, openApp);
-
-            Intent taskIntent = new Intent(context, getProviderClass());
-            taskIntent.setAction(DAILY_ACTION);
-            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-            PendingIntent toastPendingIntent = PendingIntent.getBroadcast(context, 0, taskIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent);
-
-            appWidgetManager.updateAppWidget(appWidgetId, rv);
-
-            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-        }
-
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-    }
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_task_list;
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        return remoteViews;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
new file mode 100644
index 000000000..5cd7c9d9a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
@@ -0,0 +1,108 @@
+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.widget.RemoteViews
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import io.reactivex.functions.Consumer
+import javax.inject.Inject
+
+abstract class TaskListWidgetProvider : BaseWidgetProvider() {
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    protected abstract val serviceClass: Class<*>
+
+    protected abstract val providerClass: Class<*>
+
+    protected abstract val titleResId: Int
+
+    private fun setUp() {
+        if (!hasInjected) {
+            hasInjected = true
+            HabiticaBaseApplication.userComponent?.inject(this)
+        }
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        setUp()
+        if (intent.action == DAILY_ACTION) {
+            val appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID)
+            val taskId = intent.getStringExtra(TASK_ID_ITEM)
+
+            if (taskId != null) {
+                userRepository.getUser().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null) }
+                        .subscribe(Consumer { taskDirectionData ->
+                            showToastForTaskDirection(context, taskDirectionData)
+                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+                        }, RxErrorHandler.handleEmptyError())
+            }
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        setUp()
+        val thisWidget = ComponentName(context, providerClass)
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                    sizeRemoteViews(context, options, widgetId))
+        }
+
+        for (appWidgetId in appWidgetIds) {
+            val intent = Intent(context, serviceClass)
+            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
+            val rv = RemoteViews(context.packageName, R.layout.widget_task_list)
+            rv.setRemoteAdapter(R.id.list_view, intent)
+            rv.setEmptyView(R.id.list_view, R.id.emptyView)
+            rv.setTextViewText(R.id.widget_title, context.getString(titleResId))
+
+            // if the user click on the title: open App
+            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
+            val openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+            rv.setOnClickPendingIntent(R.id.widget_title, openApp)
+
+            val taskIntent = Intent(context, providerClass)
+            taskIntent.action = DAILY_ACTION
+            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
+            val toastPendingIntent = PendingIntent.getBroadcast(context, 0, taskIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT)
+            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent)
+
+            appWidgetManager.updateAppWidget(appWidgetId, rv)
+
+            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+        }
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+    }
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_task_list
+    }
+
+    override fun configureRemoteViews(remoteViews: RemoteViews, widgetId: Int, columns: Int, rows: Int): RemoteViews {
+        return remoteViews
+    }
+
+    companion object {
+        const val DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION"
+        const val TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM"
+    }
+}
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
deleted file mode 100644
index 7007606ad..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-public class TodoListFactory extends TaskListFactory {
-    public TodoListFactory(Context context, Intent intent) {
-        super(context, intent, Task.TYPE_TODO, R.layout.widget_todo_list_row, R.id.todo_text);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
new file mode 100644
index 000000000..951305de5
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
@@ -0,0 +1,9 @@
+package com.habitrpg.android.habitica.widget
+
+import android.content.Context
+import android.content.Intent
+
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.tasks.Task
+
+class TodoListFactory(context: Context, intent: Intent) : TaskListFactory(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
deleted file mode 100644
index aafd4e9e6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import com.habitrpg.android.habitica.R;
-
-public class TodoListWidgetProvider extends TaskListWidgetProvider {
-
-    @Override
-    protected Class getServiceClass() {
-        return TodosWidgetService.class;
-    }
-
-    @Override
-    protected Class getProviderClass() {
-        return TodoListWidgetProvider.class;
-    }
-
-    @Override
-    protected int getTitleResId() {
-        return R.string.todos;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.kt
new file mode 100644
index 000000000..59bec3e44
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.widget
+
+import com.habitrpg.android.habitica.R
+
+class TodoListWidgetProvider : TaskListWidgetProvider() {
+    override val serviceClass: Class<*>
+        get() = TodosWidgetService::class.java
+
+    override val providerClass: Class<*>
+        get() = TodoListWidgetProvider::class.java
+
+    override val titleResId: Int
+        get() = R.string.todos
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.java
deleted file mode 100644
index c15af4164..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.content.Intent;
-import android.widget.RemoteViewsService;
-
-public class TodosWidgetService extends RemoteViewsService {
-
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new TodoListFactory(this.getApplicationContext(), intent);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
new file mode 100644
index 000000000..56c427fdc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.widget
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+
+class TodosWidgetService : RemoteViewsService() {
+
+    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
+        return TodoListFactory(this.applicationContext, intent)
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
index aad68a66f..d7c384aa0 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -54,9 +54,9 @@ public class UserStatComputerTest {
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) statsRows.get(0);
 
-        Assert.assertEquals(key, equipmentRow.gearKey);
-        Assert.assertEquals(text, equipmentRow.text);
-        Assert.assertEquals("STR 1, INT 2, CON 4, PER 3", equipmentRow.stats);
+        Assert.assertEquals(key, equipmentRow.getGearKey());
+        Assert.assertEquals(text, equipmentRow.getText());
+        Assert.assertEquals("STR 1, INT 2, CON 4, PER 3", equipmentRow.getStats());
     }
 
     @Test
@@ -67,13 +67,13 @@ public class UserStatComputerTest {
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
-        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
-        Assert.assertEquals(str * 0.5f, attributeRow.strVal);
-        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
-        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
-        Assert.assertEquals(per * 0.5f, attributeRow.perVal);
-        Assert.assertFalse(attributeRow.roundDown);
-        Assert.assertFalse(attributeRow.isSummary);
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.getLabelId());
+        Assert.assertEquals(str * 0.5f, attributeRow.getStrVal());
+        Assert.assertEquals(intStat * 0.0f, attributeRow.getIntVal());
+        Assert.assertEquals(con * 0.0f, attributeRow.getConVal());
+        Assert.assertEquals(per * 0.5f, attributeRow.getPerVal());
+        Assert.assertFalse(attributeRow.getRoundDown());
+        Assert.assertFalse(attributeRow.getIsSummary());
     }
 
     @Test
@@ -85,13 +85,13 @@ public class UserStatComputerTest {
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
-        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
-        Assert.assertEquals(str * 0.5f, attributeRow.strVal);
-        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
-        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
-        Assert.assertEquals(per * 0.5f, attributeRow.perVal);
-        Assert.assertFalse(attributeRow.roundDown);
-        Assert.assertFalse(attributeRow.isSummary);
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.getLabelId());
+        Assert.assertEquals(str * 0.5f, attributeRow.getStrVal());
+        Assert.assertEquals(intStat * 0.0f, attributeRow.getIntVal());
+        Assert.assertEquals(con * 0.0f, attributeRow.getConVal());
+        Assert.assertEquals(per * 0.5f, attributeRow.getPerVal());
+        Assert.assertFalse(attributeRow.getRoundDown());
+        Assert.assertFalse(attributeRow.getIsSummary());
     }
 
     @Test
@@ -103,12 +103,12 @@ public class UserStatComputerTest {
         List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
-        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
-        Assert.assertEquals(str *0.0f, attributeRow.strVal);
-        Assert.assertEquals(intStat * 0.0f, attributeRow.intVal);
-        Assert.assertEquals(con * 0.0f, attributeRow.conVal);
-        Assert.assertEquals(per * 0.0f, attributeRow.perVal);
-        Assert.assertFalse(attributeRow.roundDown);
-        Assert.assertFalse(attributeRow.isSummary);
+        Assert.assertEquals(R.string.profile_class_bonus, attributeRow.getLabelId());
+        Assert.assertEquals(str *0.0f, attributeRow.getStrVal());
+        Assert.assertEquals(intStat * 0.0f, attributeRow.getIntVal());
+        Assert.assertEquals(con * 0.0f, attributeRow.getConVal());
+        Assert.assertEquals(per * 0.0f, attributeRow.getPerVal());
+        Assert.assertFalse(attributeRow.getRoundDown());
+        Assert.assertFalse(attributeRow.getIsSummary());
     }
 }
diff --git a/build.gradle b/build.gradle
index 40ec1019b..7979dbf2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.50'
     ext.build_tools_version = '28.0.3'
     ext.sdk_version = 28
 
@@ -11,14 +11,14 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.google.gms:google-services:4.2.0'
-        classpath "io.realm:realm-gradle-plugin:5.11.0"
+        classpath 'com.google.gms:google-services:4.3.1'
+        classpath "io.realm:realm-gradle-plugin:5.14.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC4-3"
         classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
-        classpath 'com.google.firebase:perf-plugin:1.2.1'
+        classpath 'com.google.firebase:perf-plugin:1.3.1'
     }
 }
 
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index ac4be0893..26d9a3c46 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,4 +1,4 @@
-This beta update stores the apps authentication credentials more securely. The app should automatically update to the new storage method without you having to log in again. If you experience any issues with this, please report them through the in-app-reporting option or to admin@habitica.com
-We updated the app with a new modal design
+In this update we added managing party members to the party screen and in-app notifications for certain notifications.
+We also fixed some issues with notifications and improved the feedback when opening a mystery item
 
 Be sure to download this update now for a better Habitica experience!
diff --git a/gradle.properties b/gradle.properties
index 721569bba..c87c025fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=false
+android.enableR8=true
 android.debug.obsoleteApi=true
 org.gradle.configureondemand=true
 org.gradle.daemon=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ec73ef69e..605b357cc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
diff --git a/habitica.properties.example b/habitica.properties.example
index 3af43be42..482159495 100644
--- a/habitica.properties.example
+++ b/habitica.properties.example
@@ -14,3 +14,4 @@ PORT=80
 BASE_URL=https://habitica.com
 
 STAGING_KEY=
+ANDROID_TESTING_UUID=
diff --git a/habitica.properties.travis b/habitica.properties.travis
index 86925b693..8710df3c9 100644
--- a/habitica.properties.travis
+++ b/habitica.properties.travis
@@ -1,3 +1,4 @@
 PORT=3000
 BASE_URL=http://localhost:3000
 STAGING_KEY=
+ANDROID_TESTING_UUID=
diff --git a/habitica.resources.example b/habitica.resources.example
index 98f80f458..989a5322f 100644
--- a/habitica.resources.example
+++ b/habitica.resources.example
@@ -1,6 +1,3 @@
 fabric_key=CHANGE_ME
 facebook_app_id=CHANGE_ME
 amplitude_app_id=CHANGE_ME
-seeds_app_key=CHANGE_ME
-seeds_interstitial_gems=CHANGE_ME
-seeds_interstitial_sharing=CHANGE_ME
diff --git a/seeds-sdk/LICENSE b/seeds-sdk/LICENSE
deleted file mode 100755
index 75bb68d7b..000000000
--- a/seeds-sdk/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2010-2015 Matomy Media Group Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/seeds-sdk/MoPub Client Licence.txt b/seeds-sdk/MoPub Client Licence.txt
deleted file mode 100755
index 83beb8a16..000000000
--- a/seeds-sdk/MoPub Client Licence.txt	
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2011 MoPub Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of MoPub nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/seeds-sdk/NOTICE b/seeds-sdk/NOTICE
deleted file mode 100644
index 5f41fb7e9..000000000
--- a/seeds-sdk/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-    Copyright 2015 MobFox
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-   limitations under the License.
-
-Code in the com.playseeds.android.sdk.inappmessaging.inappmessaging package modified from
-MobFox Android SDK available at https://github.com/mobfox/MobFox-Android-SDK
\ No newline at end of file
diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle
deleted file mode 100755
index 240fb82e3..000000000
--- a/seeds-sdk/build.gradle
+++ /dev/null
@@ -1,71 +0,0 @@
-apply plugin: 'com.android.library'
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-    maven { url 'https://maven.fabric.io/public' }
-
-    // Material View Pager
-    maven { url "http://dl.bintray.com/florent37/maven" }
-
-    // Markdown
-    maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-    maven { url "https://jitpack.io" }
-    maven { url "https://maven.google.com" }
-}
-
-android {
-    compileSdkVersion sdk_version
-    buildToolsVersion build_tools_version
-
-    defaultConfig {
-        minSdkVersion 14
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner 'com.playseeds.android.sdk.test.InstrumentationTestRunner'
-        testHandleProfiling true
-        testFunctionalTest true
-        multiDexEnabled true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled = true
-        }
-    }
-
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'org.glassfish:javax.json:1.0.4'
-    implementation 'com.google.android.gms:play-services:12.0.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'androidx.multidex:multidex:2.0.0'
-    implementation 'com.loopj.android:android-async-http:1.4.9'
-    implementation 'org.solovyev.android:checkout:1.2.1@aar'
-    androidTestImplementation 'org.mockito:mockito-core:2.8.9'
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:3.8"
-    testImplementation "org.robolectric:shadows-multidex:3.8"
-}
diff --git a/seeds-sdk/gradle/wrapper/gradle-wrapper.jar b/seeds-sdk/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372aef5..000000000
Binary files a/seeds-sdk/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/seeds-sdk/gradle/wrapper/gradle-wrapper.properties b/seeds-sdk/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 122a0dca2..000000000
--- a/seeds-sdk/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/seeds-sdk/gradlew b/seeds-sdk/gradlew
deleted file mode 100644
index 9d82f7891..000000000
--- a/seeds-sdk/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/seeds-sdk/gradlew.bat b/seeds-sdk/gradlew.bat
deleted file mode 100644
index aec99730b..000000000
--- a/seeds-sdk/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/seeds-sdk/proguard-rules.pro b/seeds-sdk/proguard-rules.pro
deleted file mode 100755
index e9ece7221..000000000
--- a/seeds-sdk/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /projects/android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/seeds-sdk/src/main/AndroidManifest.xml b/seeds-sdk/src/main/AndroidManifest.xml
deleted file mode 100755
index e9e1e5340..000000000
--- a/seeds-sdk/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.playseeds.android.sdk">
-
-    <!-- Permissions collected from Countly plugin and MobFox plugin -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
-
-    <application
-        android:name="androidx.multidex.MultiDexApplication">
-        <!-- MobFox activities declaration -->
-        <activity android:name="com.playseeds.android.sdk.inappmessaging.RichMediaActivity"
-            android:theme="@android:style/Theme.Translucent"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-            android:hardwareAccelerated="false" />
-        <activity android:name="com.playseeds.android.sdk.inappmessaging.InAppWebView"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
-
-        <!-- Required to use Google Play Services, but is already provided by GPS base AAR -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
-        <!--<uses-library android:name="android.test.runner"/>-->
-    </application>
-    <!--<instrumentation android:name="com.playseeds.android.sdk.test.InstrumentationTestRunner"-->
-    <!--android:targetPackage="ly.count.android.sdk"/>-->
-
-</manifest>
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/AdvertisingIdAdapter.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/AdvertisingIdAdapter.java
deleted file mode 100755
index d9eb8d636..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/AdvertisingIdAdapter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-
-import java.lang.reflect.Method;
-
-public class AdvertisingIdAdapter {
-    private static final String TAG = "AdvertisingIdAdapter";
-    private final static String ADVERTISING_ID_CLIENT_CLASS_NAME = "com.google.android.gms.ads.identifier.AdvertisingIdClient";
-
-    public static boolean isAdvertisingIdAvailable() {
-        boolean advertisingIdAvailable = false;
-        try {
-            Class.forName(ADVERTISING_ID_CLIENT_CLASS_NAME);
-            advertisingIdAvailable = true;
-        }
-        catch (ClassNotFoundException ignored) {}
-        return advertisingIdAvailable;
-    }
-
-    public static void setAdvertisingId(final Context context, final CountlyStore store, final DeviceId deviceId) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    deviceId.setId(DeviceId.Type.ADVERTISING_ID, getAdvertisingId(context));
-                } catch (Throwable t) {
-                    if (t.getCause() != null && t.getCause().getClass().toString().contains("GooglePlayServicesAvailabilityException")) {
-                        // recoverable, let device ID be null, which will result in storing all requests to Seeds server
-                        // and rerunning them whenever Advertising ID becomes available
-                        if (Seeds.sharedInstance().isLoggingEnabled()) {
-                            Log.i(TAG, "Advertising ID cannot be determined yet");
-                        }
-                    } else if (t.getCause() != null && t.getCause().getClass().toString().contains("GooglePlayServicesNotAvailableException")) {
-                        // non-recoverable, fallback to OpenUDID
-                        if (Seeds.sharedInstance().isLoggingEnabled()) {
-                            Log.w(TAG, "Advertising ID cannot be determined because Play Services are not available");
-                        }
-                        deviceId.switchToIdType(DeviceId.Type.OPEN_UDID, context, store);
-                    } else {
-                        // unexpected
-                        Log.e(TAG, "Couldn't get advertising ID", t);
-                    }
-                }
-            }
-        }).start();
-    }
-
-    private static String getAdvertisingId(Context context) throws Throwable{
-        final Class<?> cls = Class.forName(ADVERTISING_ID_CLIENT_CLASS_NAME);
-        final Method getAdvertisingIdInfo = cls.getMethod("getAdvertisingIdInfo", Context.class);
-        Object info = getAdvertisingIdInfo.invoke(null, context);
-        if (info != null) {
-            final Method getId = info.getClass().getMethod("getId");
-            Object id = getId.invoke(info);
-            return (String)id;
-        }
-        return null;
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CertificateTrustManager.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/CertificateTrustManager.java
deleted file mode 100644
index fff0b922d..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CertificateTrustManager.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.util.Base64;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.security.KeyStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * Created by artem on 11/06/15. Taken from https://www.owasp.org/index.php/Certificate_and_Public_Key_Pinning
- */
-
-// Many thanks to Nikolay Elenkov for feedback.
-// Shamelessly based upon Moxie's example code (AOSP/Google did not offer code)
-// http://www.thoughtcrime.org/blog/authenticity-is-broken-in-ssl-but-your-app-ha/
-public final class CertificateTrustManager implements X509TrustManager {
-
-    // DER encoded public key
-    private final List<byte[]> keys;
-
-    public CertificateTrustManager(List<String> certificates) throws CertificateException {
-        if (certificates == null || certificates.size() == 0) {
-            throw new IllegalArgumentException("You must specify non-empty keys list");
-        }
-
-        this.keys = new ArrayList<>();
-        for (String key : certificates) {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            Certificate cert = cf.generateCertificate(new ByteArrayInputStream(Base64.decode(key, Base64.DEFAULT)));
-            this.keys.add(cert.getPublicKey().getEncoded());
-        }
-    }
-
-    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-        if (chain == null) {
-            throw new IllegalArgumentException("PublicKeyManager: X509Certificate array is null");
-        }
-
-        if (!(chain.length > 0)) {
-            throw new IllegalArgumentException("PublicKeyManager: X509Certificate is empty");
-        }
-
-        if (!(null != authType && authType.equalsIgnoreCase("RSA"))) {
-            throw new CertificateException("PublicKeyManager: AuthType is not RSA");
-        }
-
-        // Perform customary SSL/TLS checks
-        TrustManagerFactory tmf;
-        try {
-            tmf = TrustManagerFactory.getInstance("X509");
-            tmf.init((KeyStore) null);
-
-            for (TrustManager trustManager : tmf.getTrustManagers()) {
-                ((X509TrustManager) trustManager).checkServerTrusted(chain, authType);
-            }
-
-        } catch (Exception e) {
-            throw new CertificateException(e);
-        }
-
-        byte server[] = chain[0].getPublicKey().getEncoded();
-
-        for (byte[] key : keys) {
-            if (Arrays.equals(key, server)) {
-                return;
-            }
-        }
-
-        throw new CertificateException("Public keys didn't pass checks");
-    }
-
-    public void checkClientTrusted(X509Certificate[] xcs, String string) {
-        // throw new
-        // UnsupportedOperationException("checkClientTrusted: Not supported yet.");
-    }
-
-    public X509Certificate[] getAcceptedIssuers() {
-        // throw new
-        // UnsupportedOperationException("getAcceptedIssuers: Not supported yet.");
-        return null;
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java
deleted file mode 100755
index c3d9e3191..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.os.Build;
-import android.util.Log;
-
-import org.json.JSONObject;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-
-/**
- * ConnectionProcessor is a Runnable that is executed on a background
- * thread to submit session &amp; event data to a Count.ly server.
- *
- * NOTE: This class is only public to facilitate unit testing, because
- *       of this bug in dexmaker: https://code.google.com/p/dexmaker/issues/detail?id=34
- */
-public class ConnectionProcessor implements Runnable {
-    private static final int CONNECT_TIMEOUT_IN_MILLISECONDS = 30000;
-    private static final int READ_TIMEOUT_IN_MILLISECONDS = 30000;
-
-    private final CountlyStore store_;
-    private final DeviceId deviceId_;
-    private final String serverURL_;
-    private final SSLContext sslContext_;
-
-    ConnectionProcessor(final String serverURL, final CountlyStore store, final DeviceId deviceId, final SSLContext sslContext) {
-        serverURL_ = serverURL;
-        store_ = store;
-        deviceId_ = deviceId;
-        sslContext_ = sslContext;
-
-        // HTTP connection reuse which was buggy pre-froyo
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
-            System.setProperty("http.keepAlive", "false");
-        }
-    }
-
-    public URLConnection urlConnectionForEventData(final String eventData) throws IOException {
-        String urlStr = serverURL_ + "/i?";
-        if(!eventData.contains("&crash="))
-            urlStr += eventData;
-        final URL url = new URL(urlStr);
-        final HttpURLConnection conn;
-        if (Seeds.publicKeyPinCertificates == null) {
-            conn = (HttpURLConnection)url.openConnection();
-        } else {
-            HttpsURLConnection c = (HttpsURLConnection)url.openConnection();
-            c.setSSLSocketFactory(sslContext_.getSocketFactory());
-            conn = c;
-        }
-        conn.setConnectTimeout(CONNECT_TIMEOUT_IN_MILLISECONDS);
-        conn.setReadTimeout(READ_TIMEOUT_IN_MILLISECONDS);
-        conn.setUseCaches(false);
-        conn.setDoInput(true);
-        String picturePath = UserData.getPicturePathFromQuery(url);
-        if (Seeds.sharedInstance().isLoggingEnabled()) {
-            Log.d(Seeds.TAG, "Got picturePath: " + picturePath);
-        }
-        if(!picturePath.equals("")){
-        	//Uploading files:
-        	//http://stackoverflow.com/questions/2793150/how-to-use-java-net-urlconnection-to-fire-and-handle-http-requests
-        	
-        	File binaryFile = new File(picturePath);
-        	conn.setDoOutput(true);
-        	// Just generate some unique random value.
-        	String boundary = Long.toHexString(System.currentTimeMillis());
-        	// Line separator required by multipart/form-data.
-        	String CRLF = "\r\n";
-        	String charset = "UTF-8";
-        	conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-        	OutputStream output = conn.getOutputStream();
-        	PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true);
-        	// Send binary file.
-            writer.append("--" + boundary).append(CRLF);
-            writer.append("Content-Disposition: form-data; name=\"binaryFile\"; filename=\"" + binaryFile.getName() + "\"").append(CRLF);
-            writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(binaryFile.getName())).append(CRLF);
-            writer.append("Content-Transfer-Encoding: binary").append(CRLF);
-            writer.append(CRLF).flush();
-            FileInputStream fileInputStream = new FileInputStream(binaryFile);
-            byte[] buffer = new byte[1024];
-            int len;
-            while ((len = fileInputStream.read(buffer)) != -1) {
-                output.write(buffer, 0, len);
-            }
-            output.flush(); // Important before continuing with writer!
-            writer.append(CRLF).flush(); // CRLF is important! It indicates end of boundary.
-            fileInputStream.close();
-
-            // End of multipart/form-data.
-            writer.append("--" + boundary + "--").append(CRLF).flush();
-        }
-        else if(eventData.contains("&crash=")){
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.d(Seeds.TAG, "Using post because of crash");
-            }
-            conn.setDoOutput(true);
-            conn.setRequestMethod("POST");
-            OutputStream os = conn.getOutputStream();
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));
-            writer.write(eventData);
-            writer.flush();
-            writer.close();
-            os.close();
-        }
-        else{
-        	conn.setDoOutput(false);
-        }
-        return conn;
-    }
-
-    @Override
-    public void run() {
-        while (true) {
-            final String[] storedEvents = store_.connections();
-            if (storedEvents == null || storedEvents.length == 0) {
-                // currently no data to send, we are done for now
-                break;
-            }
-
-            // get first event from collection
-            if (deviceId_.getId() == null) {
-                // When device ID is supplied by OpenUDID or by Google Advertising ID.
-                // In some cases it might take time for them to initialize. So, just wait for it.
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.i(Seeds.TAG, "No Device ID available yet, skipping request " + storedEvents[0]);
-                }
-                break;
-            }
-            final String eventData = storedEvents[0] + "&device_id=" + deviceId_.getId();
-
-            URLConnection conn = null;
-            BufferedInputStream responseStream = null;
-            try {
-                // initialize and open connection
-                conn = urlConnectionForEventData(eventData);
-                conn.connect();
-
-                // consume response stream
-                responseStream = new BufferedInputStream(conn.getInputStream());
-                final ByteArrayOutputStream responseData = new ByteArrayOutputStream(256); // big enough to handle success response without reallocating
-                int c;
-                while ((c = responseStream.read()) != -1) {
-                    responseData.write(c);
-                }
-
-                // response code has to be 2xx to be considered a success
-                boolean success = true;
-                if (conn instanceof HttpURLConnection) {
-                    final HttpURLConnection httpConn = (HttpURLConnection) conn;
-                    final int responseCode = httpConn.getResponseCode();
-                    success = responseCode >= 200 && responseCode < 300;
-                    if (!success && Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.w(Seeds.TAG, "HTTP error response code was " + responseCode + " from submitting event data: " + eventData);
-                    }
-                }
-
-                // HTTP response code was good, check response JSON contains {"result":"Success"}
-                if (success) {
-                    final JSONObject responseDict = new JSONObject(responseData.toString("UTF-8"));
-                    success = responseDict.optString("result").equalsIgnoreCase("success");
-                    if (!success && Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.w(Seeds.TAG, "Response from Seeds server did not report success, it was: " + responseData.toString("UTF-8"));
-                    }
-                }
-
-                if (success) {
-                    if (Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.d(Seeds.TAG, "ok ->" + eventData);
-                    }
-
-                    // successfully submitted event data to Count.ly server, so remove
-                    // this one from the stored events collection
-                    store_.removeConnection(storedEvents[0]);
-                }
-                else {
-                    // warning was logged above, stop processing, let next tick take care of retrying
-                    break;
-                }
-            }
-            catch (Exception e) {
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.w(Seeds.TAG, "Got exception while trying to submit event data: " + eventData, e);
-                }
-                // if exception occurred, stop processing, let next tick take care of retrying
-                break;
-            }
-            finally {
-                // free connection resources
-                if (responseStream != null) {
-                    try { responseStream.close(); } catch (IOException ignored) {}
-                }
-                if (conn != null && conn instanceof HttpURLConnection) {
-                    ((HttpURLConnection)conn).disconnect();
-                }
-            }
-        }
-    }
-
-    // for unit testing
-    String getServerURL() { return serverURL_; }
-    CountlyStore getCountlyStore() { return store_; }
-    DeviceId getDeviceId() { return deviceId_; }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionQueue.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionQueue.java
deleted file mode 100755
index 2f2bb9c55..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionQueue.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-
-/**
- * ConnectionQueue queues session and event data and periodically sends that data to
- * a Count.ly server on a background thread.
- *
- * None of the methods in this class are synchronized because access to this class is
- * controlled by the Seeds singleton, which is synchronized.
- *
- * NOTE: This class is only public to facilitate unit testing, because
- *       of this bug in dexmaker: https://code.google.com/p/dexmaker/issues/detail?id=34
- */
-public class ConnectionQueue {
-    private CountlyStore store_;
-    private ExecutorService executor_;
-    private String appKey_;
-    private Context context_;
-    private String serverURL_;
-    private Future<?> connectionProcessorFuture_;
-    private DeviceId deviceId_;
-    private SSLContext sslContext_;
-
-    // Getters are for unit testing
-    String getAppKey() {
-        return appKey_;
-    }
-
-    void setAppKey(final String appKey) {
-        appKey_ = appKey;
-    }
-
-    Context getContext() {
-        return context_;
-    }
-
-    void setContext(final Context context) {
-        context_ = context;
-    }
-
-    String getServerURL() {
-        return serverURL_;
-    }
-
-    void setServerURL(final String serverURL) {
-        serverURL_ = serverURL;
-
-        if (Seeds.publicKeyPinCertificates == null) {
-            sslContext_ = null;
-        } else {
-            try {
-                TrustManager tm[] = { new CertificateTrustManager(Seeds.publicKeyPinCertificates) };
-                sslContext_ = SSLContext.getInstance("TLS");
-                sslContext_.init(null, tm, null);
-            } catch (Throwable e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-
-    CountlyStore getCountlyStore() {
-        return store_;
-    }
-
-    void setCountlyStore(final CountlyStore countlyStore) {
-        store_ = countlyStore;
-    }
-
-    DeviceId getDeviceId() { return deviceId_; }
-
-    public void setDeviceId(DeviceId deviceId) {
-        this.deviceId_ = deviceId;
-    }
-
-    /**
-     * Checks internal state and throws IllegalStateException if state is invalid to begin use.
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void checkInternalState() {
-        if (context_ == null) {
-            throw new IllegalStateException("context has not been set");
-        }
-        if (appKey_ == null || appKey_.length() == 0) {
-            throw new IllegalStateException("app key has not been set");
-        }
-        if (store_ == null) {
-            throw new IllegalStateException("countly store has not been set");
-        }
-        if (serverURL_ == null || !Seeds.isValidURL(serverURL_)) {
-            throw new IllegalStateException("server URL is not valid");
-        }
-        if (Seeds.publicKeyPinCertificates != null && !serverURL_.startsWith("https")) {
-            throw new IllegalStateException("server must start with https once you specified public keys");
-        }
-    }
-
-    /**
-     * Records a session start event for the app and sends it to the server.
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void beginSession() {
-        checkInternalState();
-        final String data = "app_key=" + appKey_
-                          + "&timestamp=" + Seeds.currentTimestamp()
-                          + "&sdk_version=" + Seeds.COUNTLY_SDK_VERSION_STRING
-                          + "&begin_session=1"
-                          + "&metrics=" + DeviceInfo.getMetrics(context_);
-
-        store_.addConnection(data);
-
-        tick();
-    }
-
-    /**
-     * Records a session duration event for the app and sends it to the server. This method does nothing
-     * if passed a negative or zero duration.
-     * @param duration duration in seconds to extend the current app session, should be more than zero
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void updateSession(final int duration) {
-        checkInternalState();
-        if (duration > 0) {
-            final String data = "app_key=" + appKey_
-                              + "&timestamp=" + Seeds.currentTimestamp()
-                              + "&session_duration=" + duration
-                              + "&location=" + getCountlyStore().getAndRemoveLocation();
-
-            store_.addConnection(data);
-
-            tick();
-        }
-    }
-
-    public void tokenSession(String token, Seeds.CountlyMessagingMode mode) {
-        checkInternalState();
-
-        final String data = "app_key=" + appKey_
-                + "&" + "timestamp=" + Seeds.currentTimestamp()
-                + "&" + "token_session=1"
-                + "&" + "android_token=" + token
-                + "&" + "test_mode=" + (mode == Seeds.CountlyMessagingMode.TEST ? 2 : 0)
-                + "&" + "locale=" + DeviceInfo.getLocale();
-
-        // To ensure begin_session will be fully processed by the server before token_session
-        final ScheduledExecutorService worker = Executors.newSingleThreadScheduledExecutor();
-        worker.schedule(new Runnable() {
-            @Override
-            public void run() {
-                store_.addConnection(data);
-                tick();
-            }
-        }, 10, TimeUnit.SECONDS);
-    }
-
-    /**
-     * Records a session end event for the app and sends it to the server. Duration is only included in
-     * the session end event if it is more than zero.
-     * @param duration duration in seconds to extend the current app session
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void endSession(final int duration) {
-        checkInternalState();
-        String data = "app_key=" + appKey_
-                    + "&timestamp=" + Seeds.currentTimestamp()
-                    + "&end_session=1";
-        if (duration > 0) {
-            data += "&session_duration=" + duration;
-        }
-
-        store_.addConnection(data);
-
-        tick();
-    }
-
-    /**
-     * Send user data to the server.
-     * @throws java.lang.IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void sendUserData() {
-        checkInternalState();
-        String userdata = UserData.getDataForRequest();
-
-        if(!userdata.equals("")){
-            String data = "app_key=" + appKey_
-                    + "&timestamp=" + Seeds.currentTimestamp()
-                    + userdata;
-            store_.addConnection(data);
-
-            tick();
-        }
-    }
-
-    /**
-     * Attribute installation to Seeds server.
-     * @param referrer query parameters
-     * @throws java.lang.IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void sendReferrerData(String referrer) {
-        checkInternalState();
-
-        if(referrer != null){
-            String data = "app_key=" + appKey_
-                    + "&timestamp=" + Seeds.currentTimestamp()
-                    + referrer;
-            store_.addConnection(data);
-
-            tick();
-        }
-    }
-
-    /**
-     * Reports a crash with device data to the server.
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void sendCrashReport(String error, boolean nonfatal) {
-        checkInternalState();
-        final String data = "app_key=" + appKey_
-                + "&timestamp=" + Seeds.currentTimestamp()
-                + "&sdk_version=" + Seeds.COUNTLY_SDK_VERSION_STRING
-                + "&crash=" + CrashDetails.getCrashData(context_, error, nonfatal);
-
-        store_.addConnection(data);
-
-        tick();
-    }
-
-    /**
-     * Records the specified events and sends them to the server.
-     * @param events URL-encoded JSON string of event data
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void recordEvents(final String events) {
-        checkInternalState();
-        final String data = "app_key=" + appKey_
-                          + "&timestamp=" + Seeds.currentTimestamp()
-                          + "&events=" + events;
-
-        store_.addConnection(data);
-
-        tick();
-    }
-
-    /**
-     * Records the specified events and sends them to the server.
-     * @param events URL-encoded JSON string of event data
-     * @throws IllegalStateException if context, app key, store, or server URL have not been set
-     */
-    void recordLocation(final String events) {
-        checkInternalState();
-        final String data = "app_key=" + appKey_
-                          + "&timestamp=" + Seeds.currentTimestamp()
-                          + "&events=" + events;
-
-        store_.addConnection(data);
-
-        tick();
-    }
-
-    /**
-     * Ensures that an executor has been created for ConnectionProcessor instances to be submitted to.
-     */
-    void ensureExecutor() {
-        if (executor_ == null) {
-            executor_ = Executors.newSingleThreadExecutor();
-        }
-    }
-
-    /**
-     * Starts ConnectionProcessor instances running in the background to
-     * process the local connection queue data.
-     * Does nothing if there is connection queue data or if a ConnectionProcessor
-     * is already running.
-     */
-    void tick() {
-        if (!store_.isEmptyConnections() && (connectionProcessorFuture_ == null || connectionProcessorFuture_.isDone())) {
-            ensureExecutor();
-            connectionProcessorFuture_ = executor_.submit(new ConnectionProcessor(serverURL_, store_, deviceId_, sslContext_));
-        }
-    }
-
-    // for unit testing
-    ExecutorService getExecutor() { return executor_; }
-    void setExecutor(final ExecutorService executor) { executor_ = executor; }
-    Future<?> getConnectionProcessorFuture() { return connectionProcessorFuture_; }
-    void setConnectionProcessorFuture(final Future<?> connectionProcessorFuture) { connectionProcessorFuture_ = connectionProcessorFuture; }
-
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CountlyStore.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/CountlyStore.java
deleted file mode 100755
index 93df55ed7..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CountlyStore.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class provides a persistence layer for the local event &amp; connection queues.
- *
- * The "read" methods in this class are not synchronized, because the underlying data store
- * provides thread-safe reads.  The "write" methods in this class are synchronized, because
- * 1) they often read a list of items, modify the list, and then commit it back to the underlying
- * data store, and 2) while the Seeds singleton is synchronized to ensure only a single writer
- * at a time from the public API side, the internal implementation has a background thread that
- * submits data to a Seeds server, and it writes to this store as well.
- *
- * NOTE: This class is only public to facilitate unit testing, because
- *       of this bug in dexmaker: https://code.google.com/p/dexmaker/issues/detail?id=34
- */
-public class CountlyStore {
-    private static final String PREFERENCES = "COUNTLY_STORE";
-    private static final String DELIMITER = ":::";
-    private static final String CONNECTIONS_PREFERENCE = "CONNECTIONS";
-    private static final String EVENTS_PREFERENCE = "EVENTS";
-    private static final String LOCATION_PREFERENCE = "LOCATION";
-
-    private final SharedPreferences preferences_;
-
-    /**
-     * Constructs a CountlyStore object.
-     * @param context used to retrieve storage meta data, must not be null.
-     * @throws IllegalArgumentException if context is null
-     */
-    CountlyStore(final Context context) {
-        if (context == null) {
-            throw new IllegalArgumentException("must provide valid context");
-        }
-        preferences_ = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
-    }
-
-    /**
-     * Returns an unsorted array of the current stored connections.
-     */
-    public String[] connections() {
-        final String joinedConnStr = preferences_.getString(CONNECTIONS_PREFERENCE, "");
-        return joinedConnStr.length() == 0 ? new String[0] : joinedConnStr.split(DELIMITER);
-    }
-
-    /**
-     * Returns an unsorted array of the current stored event JSON strings.
-     */
-    public String[] events() {
-        final String joinedEventsStr = preferences_.getString(EVENTS_PREFERENCE, "");
-        return joinedEventsStr.length() == 0 ? new String[0] : joinedEventsStr.split(DELIMITER);
-    }
-
-    /**
-     * Returns a list of the current stored events, sorted by timestamp from oldest to newest.
-     */
-    public List<Event> eventsList() {
-        final String[] array = events();
-        final List<Event> events = new ArrayList<>(array.length);
-        for (String s : array) {
-            try {
-                final Event event = Event.fromJSON(new JSONObject(s));
-                if (event != null) {
-                    events.add(event);
-                }
-            } catch (JSONException ignored) {
-                // should not happen since JSONObject is being constructed from previously stringified JSONObject
-                // events -> json objects -> json strings -> storage -> json strings -> here
-            }
-        }
-        // order the events from least to most recent
-        Collections.sort(events, new Comparator<Event>() {
-            @Override
-            public int compare(final Event e1, final Event e2) {
-                return e1.timestamp - e2.timestamp;
-            }
-        });
-        return events;
-    }
-
-    /**
-     * Returns true if no connections are current stored, false otherwise.
-     */
-    public boolean isEmptyConnections() {
-        return preferences_.getString(CONNECTIONS_PREFERENCE, "").length() == 0;
-    }
-
-    /**
-     * Adds a connection to the local store.
-     * @param str the connection to be added, ignored if null or empty
-     */
-    public synchronized void addConnection(final String str) {
-        if (str != null && str.length() > 0) {
-            final List<String> connections = new ArrayList<>(Arrays.asList(connections()));
-            connections.add(str);
-            preferences_.edit().putString(CONNECTIONS_PREFERENCE, join(connections, DELIMITER)).commit();
-        }
-    }
-
-    /**
-     * Removes a connection from the local store.
-     * @param str the connection to be removed, ignored if null or empty,
-     *            or if a matching connection cannot be found
-     */
-    public synchronized void removeConnection(final String str) {
-        if (str != null && str.length() > 0) {
-            final List<String> connections = new ArrayList<>(Arrays.asList(connections()));
-            if (connections.remove(str)) {
-                preferences_.edit().putString(CONNECTIONS_PREFERENCE, join(connections, DELIMITER)).commit();
-            }
-        }
-    }
-
-    /**
-     * Adds a custom event to the local store.
-     * @param event event to be added to the local store, must not be null
-     */
-    void addEvent(final Event event) {
-        final List<Event> events = eventsList();
-        events.add(event);
-        preferences_.edit().putString(EVENTS_PREFERENCE, joinEvents(events, DELIMITER)).commit();
-    }
-
-    /**
-     * Sets location of user and sends it with next request
-     */
-    void setLocation(final double lat, final double lon) {
-        if (preferences_ != null) {
-            preferences_.edit().putString(LOCATION_PREFERENCE, lat + "," + lon).commit();
-        }
-    }
-
-    /**
-     * Get location or empty string in case if no location is specified
-     */
-    String getAndRemoveLocation() {
-        String location = null;
-        if (preferences_ != null) {
-            location = preferences_.getString(LOCATION_PREFERENCE, "");
-            if (!location.equals("")) {
-                preferences_.edit().remove(LOCATION_PREFERENCE).commit();
-            }
-        }
-        return location;
-    }
-
-    /**
-     * Adds a custom event to the local store.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param segmentation segmentation values for the custom event, may be null
-     * @param timestamp timestamp (seconds since 1970) in GMT when the event occurred
-     * @param count count associated with the custom event, should be more than zero
-     * @param sum sum associated with the custom event, if not used, pass zero.
-     *            NaN and infinity values will be quietly ignored.
-     */
-    public synchronized void addEvent(final String key, final Map<String, String> segmentation, final int timestamp, final int count, final double sum) {
-        final Event event = new Event();
-        event.key = key;
-        event.segmentation = segmentation;
-        event.timestamp = timestamp;
-        event.count = count;
-        event.sum = sum;
-
-        addEvent(event);
-    }
-
-    /**
-     * Removes the specified events from the local store. Does nothing if the event collection
-     * is null or empty.
-     * @param eventsToRemove collection containing the events to remove from the local store
-     */
-    public synchronized void removeEvents(final Collection<Event> eventsToRemove) {
-        if (eventsToRemove != null && eventsToRemove.size() > 0) {
-            final List<Event> events = eventsList();
-            if (events.removeAll(eventsToRemove)) {
-                preferences_.edit().putString(EVENTS_PREFERENCE, joinEvents(events, DELIMITER)).commit();
-            }
-        }
-    }
-
-    /**
-     * Converts a collection of Event objects to URL-encoded JSON to a string, with each
-     * event JSON string delimited by the specified delimiter.
-     * @param collection events to join into a delimited string
-     * @param delimiter delimiter to use, should not be something that can be found in URL-encoded JSON string
-     */
-    static String joinEvents(final Collection<Event> collection, final String delimiter) {
-        final List<String> strings = new ArrayList<>();
-        for (Event e : collection) {
-            strings.add(e.toJSON().toString());
-        }
-        return join(strings, delimiter);
-    }
-
-    /**
-     * Joins all the strings in the specified collection into a single string with the specified delimiter.
-     */
-    static String join(final Collection<String> collection, final String delimiter) {
-        final StringBuilder builder = new StringBuilder();
-
-        int i = 0;
-        for (String s : collection) {
-            builder.append(s);
-            if (++i < collection.size()) {
-                builder.append(delimiter);
-            }
-        }
-
-        return builder.toString();
-    }
-
-    /**
-     * Retrieves a preference from local store.
-     * @param key the preference key
-     */
-    public synchronized String getPreference(final String key) {
-        return preferences_.getString(key, null);
-    }
-
-    /**
-     * Adds a preference to local store.
-     * @param key the preference key
-     * @param value the preference value, supply null value to remove preference
-     */
-    public synchronized void setPreference(final String key, final String value) {
-        if (value == null) {
-            preferences_.edit().remove(key).commit();
-        } else {
-            preferences_.edit().putString(key, value).commit();
-        }
-    }
-
-    // for unit testing
-    synchronized void clear() {
-        if (preferences_ != null) {
-            SharedPreferences.Editor prefsEditor = preferences_.edit();
-            prefsEditor.remove(EVENTS_PREFERENCE);
-            prefsEditor.remove(CONNECTIONS_PREFERENCE);
-            prefsEditor.commit();
-        }
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CrashDetails.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/CrashDetails.java
deleted file mode 100644
index 7e91bbef6..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/CrashDetails.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.FeatureInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.media.AudioManager;
-import android.net.ConnectivityManager;
-import android.os.BatteryManager;
-import android.os.Build;
-import android.os.Environment;
-import android.os.StatFs;
-import android.util.Log;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * This class provides several static methods to retrieve information about
- * the current device and operating environment for crash reporting purposes.
- *
- */
-public class CrashDetails {
-    private static ArrayList<String> logs = new ArrayList<>();
-    private static int startTime = Seeds.currentTimestamp();
-    private static Map<String,String> customSegments = null;
-    private static boolean inBackground = true;
-    private static long totalMemory = 0;
-
-    private static long getTotalRAM() {
-        if(totalMemory == 0) {
-            RandomAccessFile reader;
-            String load;
-
-            try {
-                reader = new RandomAccessFile("/proc/meminfo", "r");
-                load = reader.readLine();
-
-                // Get the Number value from the string
-                Pattern p = Pattern.compile("(\\d+)");
-                Matcher m = p.matcher(load);
-                String value = "";
-                while (m.find()) {
-                    value = m.group(1);
-                }
-                reader.close();
-
-                totalMemory = Long.parseLong(value) / 1024;
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
-        }
-        return totalMemory;
-    }
-
-    /**
-     * Notify when app is in foreground
-     */
-    static void inForeground() {
-        inBackground = false;
-    }
-
-    /**
-     * Notify when app is in background
-     */
-    static void inBackground() {
-        inBackground = true;
-    }
-
-    /**
-     * Returns app background state
-     */
-    static String isInBackground() {
-        return Boolean.toString(inBackground);
-    }
-
-    /**
-     * Adds a record in the log
-     */
-    static void addLog(String record) {
-        logs.add(record);
-    }
-
-    /**
-     * Returns the collected logs.
-     */
-    static String getLogs() {
-        String allLogs = "";
-
-        for (String s : logs)
-        {
-            allLogs += s + "\n";
-        }
-        logs.clear();
-        return allLogs;
-    }
-
-    /**
-     * Adds developer provided custom segments for crash,
-     * like versions of dependency libraries.
-     */
-    static void setCustomSegments(Map<String,String> segments) {
-        customSegments = new HashMap<>();
-        customSegments.putAll(segments);
-    }
-
-    /**
-     * Get custom segments json string
-     */
-    static JSONObject getCustomSegments() {
-        if(customSegments != null && !customSegments.isEmpty())
-            return new JSONObject(customSegments);
-        else
-            return null;
-    }
-
-    /**
-     * Returns the current device manufacturer.
-     */
-    static String getManufacturer() {
-        return android.os.Build.MANUFACTURER;
-    }
-
-    /**
-     * Returns the current device cpu.
-     */
-    static String getCpu() {
-        if(android.os.Build.VERSION.SDK_INT < 21 )
-            return android.os.Build.CPU_ABI;
-        else
-            return Build.SUPPORTED_ABIS[0];
-    }
-
-    /**
-     * Returns the current device openGL version.
-     */
-    static String getOpenGL(Context context) {
-        PackageManager packageManager = context.getPackageManager();
-        FeatureInfo[] featureInfos = packageManager.getSystemAvailableFeatures();
-        if (featureInfos != null && featureInfos.length > 0) {
-            for (FeatureInfo featureInfo : featureInfos) {
-                // Null feature name means this feature is the open gl es version feature.
-                if (featureInfo.name == null) {
-                    if (featureInfo.reqGlEsVersion != FeatureInfo.GL_ES_VERSION_UNDEFINED) {
-                        return Integer.toString((featureInfo.reqGlEsVersion & 0xffff0000) >> 16);
-                    } else {
-                        return "1"; // Lack of property means OpenGL ES version 1
-                    }
-                }
-            }
-        }
-        return "1";
-    }
-
-    /**
-     * Returns the current device RAM amount.
-     */
-    static String getRamCurrent(Context context) {
-        ActivityManager.MemoryInfo mi = new ActivityManager.MemoryInfo();
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        activityManager.getMemoryInfo(mi);
-        return Long.toString(getTotalRAM() - (mi.availMem / 1048576L));
-    }
-
-    /**
-     * Returns the total device RAM amount.
-     */
-    static String getRamTotal() {
-        return Long.toString(getTotalRAM());
-    }
-
-    /**
-     * Returns the current device disk space.
-     */
-    static String getDiskCurrent() {
-        if(android.os.Build.VERSION.SDK_INT < 18 ) {
-            StatFs statFs = new StatFs(Environment.getRootDirectory().getAbsolutePath());
-            long   total  = (statFs.getBlockCount() * statFs.getBlockSize());
-            long   free   = (statFs.getAvailableBlocks() * statFs.getBlockSize());
-            return Long.toString((total - free)/ 1048576L);
-        } else{
-            StatFs statFs = new StatFs(Environment.getRootDirectory().getAbsolutePath());
-            long   total  = (statFs.getBlockCountLong() * statFs.getBlockSizeLong());
-            long   free   = (statFs.getAvailableBlocksLong() * statFs.getBlockSizeLong());
-            return Long.toString((total - free) / 1048576L);
-        }
-    }
-
-    /**
-     * Returns the current device disk space.
-     */
-    static String getDiskTotal() {
-        if(android.os.Build.VERSION.SDK_INT < 18 ) {
-            StatFs statFs = new StatFs(Environment.getRootDirectory().getAbsolutePath());
-            long   total  = (statFs.getBlockCount() * statFs.getBlockSize());
-            return Long.toString(total/ 1048576L);
-        } else{
-            StatFs statFs = new StatFs(Environment.getRootDirectory().getAbsolutePath());
-            long   total  = (statFs.getBlockCountLong() * statFs.getBlockSizeLong());
-            return Long.toString(total/ 1048576L);
-        }
-    }
-
-    /**
-     * Returns the current device battery level.
-     */
-    static String getBatteryLevel(Context context) {
-        Intent batteryIntent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        assert batteryIntent != null;
-        int level = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
-        int scale = batteryIntent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
-
-        // Error checking that probably isn't needed but I added just in case.
-        if (level > -1 && scale > 0) {
-            return Float.toString(((float) level / (float) scale) * 100.0f);
-        }
-
-        if (Seeds.sharedInstance().isLoggingEnabled()) {
-            Log.i(Seeds.TAG, "Can't get battery level");
-        }
-
-        return null;
-    }
-
-    /**
-     * Get app's running time before crashing.
-     */
-    static String getRunningTime() {
-        return Integer.toString(Seeds.currentTimestamp() - startTime);
-    }
-
-    /**
-     * Returns the current device orientation.
-     */
-    static String getOrientation(Context context) {
-        int orientation = context.getResources().getConfiguration().orientation;
-        switch(orientation)
-        {
-            case  Configuration.ORIENTATION_LANDSCAPE:
-                return "Landscape";
-            case Configuration.ORIENTATION_PORTRAIT:
-                return "Portrait";
-            case Configuration.ORIENTATION_SQUARE:
-                return "Square";
-            case Configuration.ORIENTATION_UNDEFINED:
-                return "Unknown";
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * Checks if device is rooted.
-     */
-    static String isRooted() {
-        String[] paths = { "/sbin/su", "/system/bin/su", "/system/xbin/su", "/data/local/xbin/su", "/data/local/bin/su", "/system/sd/xbin/su",
-                "/system/bin/failsafe/su", "/data/local/su" };
-        for (String path : paths) {
-            if (new File(path).exists()) return "true";
-        }
-        return "false";
-    }
-
-    /**
-     * Checks if device is online.
-     */
-    static String isOnline(Context context) {
-        try {
-            ConnectivityManager conMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            if (conMgr != null && conMgr.getActiveNetworkInfo() != null && conMgr.getActiveNetworkInfo().isAvailable()
-                    && conMgr.getActiveNetworkInfo().isConnected()) {
-
-                return "true";
-            }
-            return "false";
-        }
-        catch(Exception e){
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.w(Seeds.TAG, "Got exception determining connectivity", e);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Checks if device is muted.
-     */
-    static String isMuted(Context context) {
-        AudioManager audio = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        switch( audio.getRingerMode() ){
-            case AudioManager.RINGER_MODE_SILENT:
-                return "true";
-            case AudioManager.RINGER_MODE_VIBRATE:
-                return "true";
-            default:
-                return "false";
-        }
-    }
-
-    /**
-     * Returns a URL-encoded JSON string containing the device crash report
-     * See the following link for more info:
-     * http://resources.count.ly/v1.0/docs/i
-     */
-    static String getCrashData(final Context context, String error, Boolean nonfatal) {
-        final JSONObject json = new JSONObject();
-
-        fillJSONIfValuesNotEmpty(json,
-                "_error", error,
-                "_nonfatal", Boolean.toString(nonfatal),
-                "_logs", getLogs(),
-                "_device", DeviceInfo.getDevice(),
-                "_os", DeviceInfo.getOS(),
-                "_os_version", DeviceInfo.getOSVersion(),
-                "_resolution", DeviceInfo.getResolution(context),
-                "_app_version", DeviceInfo.getAppVersion(context),
-                "_manufacture", getManufacturer(),
-                "_cpu", getCpu(),
-                "_opengl", getOpenGL(context),
-                "_ram_current", getRamCurrent(context),
-                "_ram_total", getRamTotal(),
-                "_disk_current", getDiskCurrent(),
-                "_disk_total", getDiskTotal(),
-                "_bat", getBatteryLevel(context),
-                "_run", getRunningTime(),
-                "_orientation", getOrientation(context),
-                "_root", isRooted(),
-                "_online", isOnline(context),
-                "_muted", isMuted(context),
-                "_background", isInBackground()
-                );
-
-        try {
-            json.put("_custom", getCustomSegments());
-        } catch (JSONException e) {
-            //no custom segments
-        }
-        String result = json.toString();
-
-        try {
-            result = java.net.URLEncoder.encode(result, "UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-            // should never happen because Android guarantees UTF-8 support
-        }
-
-        return result;
-    }
-
-    /**
-     * Utility method to fill JSONObject with supplied objects for supplied keys.
-     * Fills json only with non-null and non-empty key/value pairs.
-     * @param json JSONObject to fill
-     * @param objects varargs of this kind: key1, value1, key2, value2, ...
-     */
-    static void fillJSONIfValuesNotEmpty(final JSONObject json, final String ... objects) {
-        try {
-            if (objects.length > 0 && objects.length % 2 == 0) {
-                for (int i = 0; i < objects.length; i += 2) {
-                    final String key = objects[i];
-                    final String value = objects[i + 1];
-                    if (value != null && value.length() > 0) {
-                        json.put(key, value);
-                    }
-                }
-            }
-        } catch (JSONException ignored) {
-            // shouldn't ever happen when putting String objects into a JSONObject,
-            // it can only happen when putting NaN or INFINITE doubles or floats into it
-        }
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceId.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceId.java
deleted file mode 100755
index f65953e4d..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceId.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-import android.util.Log;
-
-
-public class DeviceId {
-    private String id;
-    private Type type;
-    private static final String TAG = "DeviceId";
-    private static final String PREFERENCE_KEY_ID_TYPE = "ly.count.android.api.DeviceId.type";
-
-    /**
-     * Enum used throughout Seeds which controls what kind of ID Seeds should use.
-     */
-    public enum Type {
-        DEVELOPER_SUPPLIED,
-        OPEN_UDID,
-        ADVERTISING_ID,
-    }
-
-    /**
-     * Initialize DeviceId with Type of OPEN_UDID or ADVERTISING_ID
-     * @param type type of ID generation strategy
-     */
-    public DeviceId(Type type) {
-        if (type == null) {
-            throw new IllegalStateException("Please specify DeviceId.Type, that is which type of device ID generation you want to use");
-        } else if (type == Type.DEVELOPER_SUPPLIED) {
-            throw new IllegalStateException("Please use another DeviceId constructor for device IDs supplied by developer");
-        }
-        this.type = type;
-    }
-
-    /**
-     * Initialize DeviceId with Developer-supplied id string
-     * @param developerSuppliedId Device ID string supplied by developer
-     */
-    public DeviceId(String developerSuppliedId) {
-        if (developerSuppliedId == null || "".equals(developerSuppliedId)) {
-            throw new IllegalStateException("Please make sure that device ID is not null or empty");
-        }
-        this.type = Type.DEVELOPER_SUPPLIED;
-        this.id = developerSuppliedId;
-    }
-
-    /**
-     * Initialize device ID generation, that is start up required services and send requests.
-     * Device ID is expected to be available after some time.
-     * In some cases, Seeds can override ID generation strategy to other one, for example when
-     * Google Play Services are not available and user chose Advertising ID strategy, it will fall
-     * back to OpenUDID
-     * @param context Context to use
-     * @param store CountlyStore to store configuration in
-     * @param raiseExceptions whether to raise exceptions in case of illegal state or not
-     */
-    public void init(Context context, CountlyStore store, boolean raiseExceptions) {
-        Type overriddenType = retrieveOverriddenType(store);
-
-        // Some time ago some ID generation strategy was not available and SDK fell back to
-        // some other strategy. We still have to use that strategy.
-        if (overriddenType != null && overriddenType != type) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.i(TAG, "Overridden device ID generation strategy detected: " + overriddenType + ", using it instead of " + this.type);
-            }
-            type = overriddenType;
-        }
-
-        switch (type) {
-            case DEVELOPER_SUPPLIED:
-                // no initialization for developer id
-                break;
-            case OPEN_UDID:
-                if (OpenUDIDAdapter.isOpenUDIDAvailable()) {
-                    if (Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.i(TAG, "Using OpenUDID");
-                    }
-                    if (!OpenUDIDAdapter.isInitialized()) {
-                        OpenUDIDAdapter.sync(context);
-                    }
-                } else {
-                    if (raiseExceptions)
-                        throw new IllegalStateException("OpenUDID is not available, please make sure that you have it in your classpath");
-                }
-                break;
-            case ADVERTISING_ID:
-                if (AdvertisingIdAdapter.isAdvertisingIdAvailable()) {
-                    if (Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.i(TAG, "Using Advertising ID");
-                    }
-                    AdvertisingIdAdapter.setAdvertisingId(context, store, this);
-                } else if (OpenUDIDAdapter.isOpenUDIDAvailable()) {
-                    // Fall back to OpenUDID on devices without google play services set up
-                    if (Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.i(TAG, "Advertising ID is not available, falling back to OpenUDID");
-                    }
-                    if (!OpenUDIDAdapter.isInitialized()) {
-                        OpenUDIDAdapter.sync(context);
-                    }
-                } else {
-                    // just do nothing, without Advertising ID and OpenUDID this user is lost for Seeds
-                    if (Seeds.sharedInstance().isLoggingEnabled()) {
-                        Log.w(TAG, "Advertising ID is not available, neither OpenUDID is");
-                    }
-                    if (raiseExceptions)
-                        throw new IllegalStateException("OpenUDID is not available, please make sure that you have it in your classpath");
-                }
-                break;
-        }
-    }
-
-    private void storeOverriddenType(CountlyStore store, Type type) {
-        // Using strings is safer when it comes to extending Enum values list
-        store.setPreference(PREFERENCE_KEY_ID_TYPE, type == null ? null : type.toString());
-    }
-
-    private Type retrieveOverriddenType(CountlyStore store) {
-        Type oldType;
-
-        // Using strings is safer when it comes to extending Enum values list
-        String oldTypeString = store.getPreference(PREFERENCE_KEY_ID_TYPE);
-        if (oldTypeString == null) {
-            oldType = null;
-        } else if (oldTypeString.equals(Type.DEVELOPER_SUPPLIED.toString())) {
-            oldType = Type.DEVELOPER_SUPPLIED;
-        } else if (oldTypeString.equals(Type.OPEN_UDID.toString())) {
-            oldType = Type.OPEN_UDID;
-        } else if (oldTypeString.equals(Type.ADVERTISING_ID.toString())) {
-            oldType = Type.ADVERTISING_ID;
-        } else {
-            oldType = null;
-        }
-        return oldType;
-    }
-
-    protected void switchToIdType(Type type, Context context, CountlyStore store) {
-        if (Seeds.sharedInstance().isLoggingEnabled()) {
-            Log.w(TAG, "Switching to device ID generation strategy " + type + " from " + this.type);
-        }
-        this.type = type;
-        storeOverriddenType(store, type);
-        init(context, store, false);
-    }
-
-    public String getId() {
-        if (id == null && type == Type.OPEN_UDID) {
-            id = OpenUDIDAdapter.getOpenUDID();
-        }
-        return id;
-    }
-
-    protected void setId(Type type, String id) {
-        if (Seeds.sharedInstance().isLoggingEnabled()) {
-            Log.w(TAG, "Device ID is " + id + " (type " + type + ")");
-        }
-        this.type = type;
-        this.id = id;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    /**
-     * Helper method for null safe comparison of current device ID and the one supplied to Seeds.init
-     * @return true if supplied device ID equal to the one registered before
-     */
-    static boolean deviceIDEqualsNullSafe(final String id, Type type, final DeviceId deviceId) {
-        if (type == null || type == Type.DEVELOPER_SUPPLIED) {
-            final String deviceIdId = (deviceId == null) ? null : deviceId.getId();
-            return (deviceIdId == null && id == null) || (deviceIdId != null && deviceIdId.equals(id));
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceInfo.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceInfo.java
deleted file mode 100755
index 36f94e15d..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/DeviceInfo.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.telephony.TelephonyManager;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-
-/**
- * This class provides several static methods to retrieve information about
- * the current device and operating environment.
- *
- * It is important to call setDeviceID early, before logging any session or custom
- * event data.
- */
-class DeviceInfo {
-    /**
-     * Returns the display name of the current operating system.
-     */
-    static String getOS() {
-        return "Android";
-    }
-
-    /**
-     * Returns the current operating system version as a displayable string.
-     */
-    static String getOSVersion() {
-        return android.os.Build.VERSION.RELEASE;
-    }
-
-    /**
-     * Returns the current device model.
-     */
-    static String getDevice() {
-        return android.os.Build.MODEL;
-    }
-
-    /**
-     * Returns the non-scaled pixel resolution of the current default display being used by the
-     * WindowManager in the specified context.
-     * @param context context to use to retrieve the current WindowManager
-     * @return a string in the format "WxH", or the empty string "" if resolution cannot be determined
-     */
-    static String getResolution(final Context context) {
-        // user reported NPE in this method; that means either getSystemService or getDefaultDisplay
-        // were returning null, even though the documentation doesn't say they should do so; so now
-        // we catch Throwable and return empty string if that happens
-        String resolution = "";
-        try {
-            final WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-            final Display display = wm.getDefaultDisplay();
-            final DisplayMetrics metrics = new DisplayMetrics();
-            display.getMetrics(metrics);
-            resolution = metrics.widthPixels + "x" + metrics.heightPixels;
-        }
-        catch (Throwable t) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.i(Seeds.TAG, "Device resolution cannot be determined");
-            }
-        }
-        return resolution;
-    }
-
-    /**
-     * Maps the current display density to a string constant.
-     * @param context context to use to retrieve the current display metrics
-     * @return a string constant representing the current display density, or the
-     *         empty string if the density is unknown
-     */
-    static String getDensity(final Context context) {
-        String densityStr = "";
-        final int density = context.getResources().getDisplayMetrics().densityDpi;
-        switch (density) {
-            case DisplayMetrics.DENSITY_LOW:
-                densityStr = "LDPI";
-                break;
-            case DisplayMetrics.DENSITY_MEDIUM:
-                densityStr = "MDPI";
-                break;
-            case DisplayMetrics.DENSITY_TV:
-                densityStr = "TVDPI";
-                break;
-            case DisplayMetrics.DENSITY_HIGH:
-                densityStr = "HDPI";
-                break;
-            case DisplayMetrics.DENSITY_XHIGH:
-                densityStr = "XHDPI";
-                break;
-            case DisplayMetrics.DENSITY_400:
-                densityStr = "XMHDPI";
-                break;
-            case DisplayMetrics.DENSITY_XXHIGH:
-                densityStr = "XXHDPI";
-                break;
-            case DisplayMetrics.DENSITY_XXXHIGH:
-                densityStr = "XXXHDPI";
-                break;
-        }
-        return densityStr;
-    }
-
-    /**
-     * Returns the display name of the current network operator from the
-     * TelephonyManager from the specified context.
-     * @param context context to use to retrieve the TelephonyManager from
-     * @return the display name of the current network operator, or the empty
-     *         string if it cannot be accessed or determined
-     */
-    static String getCarrier(final Context context) {
-        String carrier = "";
-        final TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        if (manager != null) {
-            carrier = manager.getNetworkOperatorName();
-        }
-        if (carrier == null || carrier.length() == 0) {
-            carrier = "";
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.i(Seeds.TAG, "No carrier found");
-            }
-        }
-        return carrier;
-    }
-
-    /**
-     * Returns the current locale (ex. "en_US").
-     */
-    static String getLocale() {
-        final Locale locale = Locale.getDefault();
-        return locale.getLanguage() + "_" + locale.getCountry();
-    }
-
-    /**
-     * Returns the application version string stored in the specified
-     * context's package info versionName field, or "1.0" if versionName
-     * is not present.
-     */
-    static String getAppVersion(final Context context) {
-        String result = Seeds.DEFAULT_APP_VERSION;
-        try {
-            result = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
-        }
-        catch (PackageManager.NameNotFoundException e) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.i(Seeds.TAG, "No app version found");
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Returns the package name of the app that installed this app
-     */
-    static String getStore(final Context context) {
-        String result = "";
-        if(android.os.Build.VERSION.SDK_INT >= 3 ) {
-            try {
-                result = context.getPackageManager().getInstallerPackageName(context.getPackageName());
-            } catch (Exception e) {
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.i(Seeds.TAG, "Can't get Installer package");
-                }
-            }
-            if (result == null || result.length() == 0) {
-                result = "";
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.i(Seeds.TAG, "No store found");
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Returns a URL-encoded JSON string containing the device metrics
-     * to be associated with a begin session event.
-     * See the following link for more info:
-     * https://count.ly/resources/reference/server-api
-     */
-    static String getMetrics(final Context context) {
-        final JSONObject json = new JSONObject();
-
-        fillJSONIfValuesNotEmpty(json,
-                "_device", getDevice(),
-                "_os", getOS(),
-                "_os_version", getOSVersion(),
-                "_carrier", getCarrier(context),
-                "_resolution", getResolution(context),
-                "_density", getDensity(context),
-                "_locale", getLocale(),
-                "_app_version", getAppVersion(context),
-                "_store", getStore(context));
-
-        String result = json.toString();
-
-        try {
-            result = java.net.URLEncoder.encode(result, "UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-            // should never happen because Android guarantees UTF-8 support
-        }
-
-        return result;
-    }
-
-    /**
-     * Utility method to fill JSONObject with supplied objects for supplied keys.
-     * Fills json only with non-null and non-empty key/value pairs.
-     * @param json JSONObject to fill
-     * @param objects varargs of this kind: key1, value1, key2, value2, ...
-     */
-    static void fillJSONIfValuesNotEmpty(final JSONObject json, final String ... objects) {
-        try {
-            if (objects.length > 0 && objects.length % 2 == 0) {
-                for (int i = 0; i < objects.length; i += 2) {
-                    final String key = objects[i];
-                    final String value = objects[i + 1];
-                    if (value != null && value.length() > 0) {
-                        json.put(key, value);
-                    }
-                }
-            }
-        } catch (JSONException ignored) {
-            // shouldn't ever happen when putting String objects into a JSONObject,
-            // it can only happen when putting NaN or INFINITE doubles or floats into it
-        }
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/Event.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/Event.java
deleted file mode 100755
index 8d68ac3b7..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/Event.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.util.Log;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * This class holds the data for a single Count.ly custom event instance.
- * It also knows how to read & write itself to the Count.ly custom event JSON syntax.
- * See the following link for more info:
- * https://count.ly/resources/reference/custom-events
- */
-class Event {
-    private static final String SEGMENTATION_KEY = "segmentation";
-    private static final String KEY_KEY = "key";
-    private static final String COUNT_KEY = "count";
-    private static final String SUM_KEY = "sum";
-    private static final String TIMESTAMP_KEY = "timestamp";
-
-    public String key;
-    public Map<String, String> segmentation;
-    public int count;
-    public double sum;
-    public int timestamp;
-
-    /**
-     * Creates and returns a JSONObject containing the event data from this object.
-     * @return a JSONObject containing the event data from this object
-     */
-    JSONObject toJSON() {
-        final JSONObject json = new JSONObject();
-
-        try {
-            json.put(KEY_KEY, key);
-            json.put(COUNT_KEY, count);
-            json.put(TIMESTAMP_KEY, timestamp);
-
-            if (segmentation != null) {
-                json.put(SEGMENTATION_KEY, new JSONObject(segmentation));
-            }
-
-            // we put in the sum last, the only reason that a JSONException would be thrown
-            // would be if sum is NaN or infinite, so in that case, at least we will return
-            // a JSON object with the rest of the fields populated
-            json.put(SUM_KEY, sum);
-        }
-        catch (JSONException e) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.w(Seeds.TAG, "Got exception converting an Event to JSON", e);
-            }
-        }
-
-        return json;
-    }
-
-    /**
-     * Factory method to create an Event from its JSON representation.
-     * @param json JSON object to extract event data from
-     * @return Event object built from the data in the JSON or null if the "key" value is not
-     *         present or the empty string, or if a JSON exception occurs
-     * @throws NullPointerException if JSONObject is null
-     */
-    static Event fromJSON(final JSONObject json) {
-        Event event = new Event();
-
-        try {
-            if (!json.isNull(KEY_KEY)) {
-                event.key = json.getString(KEY_KEY);
-            }
-            event.count = json.optInt(COUNT_KEY);
-            event.sum = json.optDouble(SUM_KEY, 0.0d);
-            event.timestamp = json.optInt(TIMESTAMP_KEY);
-
-            if (!json.isNull(SEGMENTATION_KEY)) {
-                final JSONObject segm = json.getJSONObject(SEGMENTATION_KEY);
-                final HashMap<String, String> segmentation = new HashMap<>(segm.length());
-                final Iterator nameItr = segm.keys();
-                while (nameItr.hasNext()) {
-                    final String key = (String) nameItr.next();
-                    if (!segm.isNull(key)) {
-                        segmentation.put(key, segm.getString(key));
-                    }
-                }
-                event.segmentation = segmentation;
-            }
-        }
-        catch (JSONException e) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.w(Seeds.TAG, "Got exception converting JSON to an Event", e);
-            }
-            event = null;
-        }
-
-        return (event != null && event.key != null && event.key.length() > 0) ? event : null;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (o == null || !(o instanceof Event)) {
-            return false;
-        }
-
-        final Event e = (Event) o;
-
-        return (key == null ? e.key == null : key.equals(e.key)) &&
-               timestamp == e.timestamp &&
-               (segmentation == null ? e.segmentation == null : segmentation.equals(e.segmentation));
-    }
-
-    @Override
-    public int hashCode() {
-        return (key != null ? key.hashCode() : 1) ^
-               (segmentation != null ? segmentation.hashCode() : 1) ^
-               (timestamp != 0 ? timestamp : 1);
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/EventQueue.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/EventQueue.java
deleted file mode 100755
index 7ca9a0dae..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/EventQueue.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import org.json.JSONArray;
-
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class queues event data locally and can convert that event data to JSON
- * for submission to a Count.ly server.
- *
- * None of the methods in this class are synchronized because access to this class is
- * controlled by the Seeds singleton, which is synchronized.
- *
- * NOTE: This class is only public to facilitate unit testing, because
- *       of this bug in dexmaker: https://code.google.com/p/dexmaker/issues/detail?id=34
- */
-public class EventQueue {
-    private final CountlyStore countlyStore_;
-
-    /**
-     * Constructs an EventQueue.
-     * @param countlyStore backing store to be used for local event queue persistence
-     */
-    EventQueue(final CountlyStore countlyStore) {
-        countlyStore_ = countlyStore;
-    }
-
-    /**
-     * Returns the number of events in the local event queue.
-     * @return the number of events in the local event queue
-     */
-    int size() {
-        if (countlyStore_ != null) {
-            return countlyStore_.events().length;
-        }
-
-        return -1;
-   }
-
-    /**
-     * Removes all current events from the local queue and returns them as a
-     * URL-encoded JSON string that can be submitted to a ConnectionQueue.
-     * @return URL-encoded JSON string of event data from the local event queue
-     */
-    String events() {
-        String result;
-
-        final List<Event> events = countlyStore_.eventsList();
-
-        final JSONArray eventArray = new JSONArray();
-        for (Event e : events) {
-            eventArray.put(e.toJSON());
-        }
-
-        result = eventArray.toString();
-
-        countlyStore_.removeEvents(events);
-
-        try {
-            result = java.net.URLEncoder.encode(result, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            // should never happen because Android guarantees UTF-8 support
-        }
-
-        return result;
-    }
-
-    /**
-     * Records a custom Count.ly event to the local event queue.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param segmentation segmentation values for the custom event, may be null
-     * @param count count associated with the custom event, should be more than zero
-     * @param sum sum associated with the custom event, if not used, pass zero.
-     *            NaN and infinity values will be quietly ignored.
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    void recordEvent(final String key, final Map<String, String> segmentation, final int count, final double sum) {
-        final int timestamp = Seeds.currentTimestamp();
-        countlyStore_.addEvent(key, segmentation, timestamp, count, sum);
-    }
-
-    // for unit tests
-    CountlyStore getCountlyStore() {
-        return countlyStore_;
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppMessageShowCountListener.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppMessageShowCountListener.java
deleted file mode 100644
index 0e3b1c814..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppMessageShowCountListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.playseeds.android.sdk;
-
-public interface IInAppMessageShowCountListener {
-    void onInAppMessageShowCount(String errorMessage, int showCount, String message_id);
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppPurchaseCountListener.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppPurchaseCountListener.java
deleted file mode 100644
index bb4f91ee8..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IInAppPurchaseCountListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.playseeds.android.sdk;
-
-public interface IInAppPurchaseCountListener {
-    void onInAppPurchaseCount(String errorMessage, int purchasesCount, String key);
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IUserBehaviorQueryListener.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/IUserBehaviorQueryListener.java
deleted file mode 100644
index f4e498f48..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/IUserBehaviorQueryListener.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.playseeds.android.sdk;
-import com.google.gson.JsonElement;
-
-public interface IUserBehaviorQueryListener {
-    void onUserBehaviorResponse(String errorMessage, JsonElement result, String queryPath);
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/MainActivityEventListener.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/MainActivityEventListener.java
deleted file mode 100644
index 881c4f383..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/MainActivityEventListener.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Application;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-
-import com.android.vending.billing.IInAppBillingService;
-import com.playseeds.android.sdk.inappmessaging.InAppMessageListener;
-
-/**
- * Created by atte on 23/08/16.
- *
- * Streamlines the integration experience on Android v4.0 and up by
- * - automating the resolving of the billing service
- * - listening to onStart, onStop and onDestroy of the activity and informing Seeds SDK
- *   about the changes in application state
- */
-
-@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-public class MainActivityEventListener implements Application.ActivityLifecycleCallbacks {
-    private Activity mainActivity;
-    private final InAppMessageListener listener;
-    private final String serverURL;
-    private final String appKey;
-    private final String deviceID;
-    private final DeviceId.Type idMode;
-    private ServiceConnection mServiceConn;
-    IInAppBillingService mService;
-
-    public MainActivityEventListener(Activity mainActivity, InAppMessageListener listener, String serverURL, String appKey, String deviceID, DeviceId.Type idMode) {
-        this.mainActivity = mainActivity;
-        this.listener = listener;
-        this.serverURL = serverURL;
-        this.appKey = appKey;
-        this.deviceID = deviceID;
-        this.idMode = idMode;
-    }
-
-    public void resolve() {
-        mainActivity.getApplication().registerActivityLifecycleCallbacks(this);
-
-        mServiceConn = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                mService = IInAppBillingService.Stub.asInterface(service);
-
-                Seeds.sharedInstance()
-                        .init(mainActivity, mService, listener, serverURL, appKey, deviceID, idMode);
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-                mService = null;
-            }
-        };
-
-        Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
-        serviceIntent.setPackage("com.android.vending");
-
-        mainActivity.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    @Override
-    public void onActivityStarted(Activity activity) {
-        if (activity == mainActivity) {
-            Log.d(Seeds.TAG, "mainactivity onstart");
-            Seeds.sharedInstance().onStart();
-        }
-    }
-
-    @Override
-    public void onActivityStopped(Activity activity) {
-        if (activity == mainActivity) {
-            Log.d(Seeds.TAG, "mainactivity onstop");
-            Seeds.sharedInstance().onStop();
-        }
-    }
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {
-        if (activity == mainActivity) {
-            if (mService != null) {
-                Log.d(Seeds.TAG, "mainactivity onactivitydestroyed");
-                mainActivity.unbindService(mServiceConn);
-            }
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-        // Unneeded
-    }
-
-    @Override
-    public void onActivityResumed(Activity activity) {
-        // Unneeded
-    }
-
-    @Override
-    public void onActivityPaused(Activity activity) {
-        // Unneeded
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-        // Unneeded
-    }
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/MessagingAdapter.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/MessagingAdapter.java
deleted file mode 100755
index 0ef71a2e1..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/MessagingAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.Log;
-
-import java.lang.reflect.Method;
-
-public class MessagingAdapter {
-    private static final String TAG = "MessagingAdapter";
-    private final static String MESSAGING_CLASS_NAME = "ly.count.android.sdk.messaging.CountlyMessaging";
-
-    public static boolean isMessagingAvailable() {
-        boolean messagingAvailable = false;
-        try {
-            Class.forName(MESSAGING_CLASS_NAME);
-            messagingAvailable = true;
-        }
-        catch (ClassNotFoundException ignored) {}
-        return messagingAvailable;
-    }
-
-    public static boolean init(Activity activity, Class<? extends Activity> activityClass, String sender, String[] buttonNames) {
-        try {
-            final Class<?> cls = Class.forName(MESSAGING_CLASS_NAME);
-            final Method method = cls.getMethod("init", Activity.class, Class.class, String.class, String[].class);
-            method.invoke(null, activity, activityClass, sender, buttonNames);
-            return true;
-        }
-        catch (Throwable logged) {
-            Log.e(TAG, "Couldn't init Seeds Messaging", logged);
-            return false;
-        }
-    }
-
-    public static boolean storeConfiguration(Context context, String serverURL, String appKey, String deviceID, DeviceId.Type idMode) {
-        try {
-            final Class<?> cls = Class.forName(MESSAGING_CLASS_NAME);
-            final Method method = cls.getMethod("storeConfiguration", Context.class, String.class, String.class, String.class, DeviceId.Type.class);
-            method.invoke(null, context, serverURL, appKey, deviceID, idMode);
-            return true;
-        }
-        catch (Throwable logged) {
-            Log.e(TAG, "Couldn't store configuration in Seeds Messaging", logged);
-            return false;
-        }
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/OpenUDIDAdapter.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/OpenUDIDAdapter.java
deleted file mode 100755
index a082d8af3..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/OpenUDIDAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.playseeds.android.sdk;
-
-import android.content.Context;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class OpenUDIDAdapter {
-    private final static String OPEN_UDID_MANAGER_CLASS_NAME = "org.openudid.OpenUDID_manager";
-
-    public static boolean isOpenUDIDAvailable() {
-        boolean openUDIDAvailable = false;
-        try {
-            Class.forName(OPEN_UDID_MANAGER_CLASS_NAME);
-            openUDIDAvailable = true;
-        }
-        catch (ClassNotFoundException ignored) {}
-        return openUDIDAvailable;
-    }
-
-    public static boolean isInitialized() {
-        boolean initialized = false;
-        try {
-            final Class<?> cls = Class.forName(OPEN_UDID_MANAGER_CLASS_NAME);
-            final Method isInitializedMethod = cls.getMethod("isInitialized", (Class[]) null);
-            final Object result = isInitializedMethod.invoke(null, (Object[]) null);
-            if (result instanceof Boolean) {
-                initialized = (Boolean) result;
-            }
-        }
-        catch (ClassNotFoundException ignored) {}
-        catch (NoSuchMethodException ignored) {}
-        catch (InvocationTargetException ignored) {}
-        catch (IllegalAccessException ignored) {}
-        return initialized;
-    }
-
-    public static void sync(final Context context) {
-        try {
-            final Class<?> cls = Class.forName(OPEN_UDID_MANAGER_CLASS_NAME);
-            final Method syncMethod = cls.getMethod("sync", Context.class);
-            syncMethod.invoke(null, context);
-        }
-        catch (ClassNotFoundException ignored) {}
-        catch (NoSuchMethodException ignored) {}
-        catch (InvocationTargetException ignored) {}
-        catch (IllegalAccessException ignored) {}
-    }
-
-    public static String getOpenUDID() {
-        String openUDID = null;
-        try {
-            final Class<?> cls = Class.forName(OPEN_UDID_MANAGER_CLASS_NAME);
-            final Method getOpenUDIDMethod = cls.getMethod("getOpenUDID", (Class[]) null);
-            final Object result = getOpenUDIDMethod.invoke(null, (Object[]) null);
-            if (result instanceof String) {
-                openUDID = (String) result;
-            }
-        }
-        catch (ClassNotFoundException ignored) {}
-        catch (NoSuchMethodException ignored) {}
-        catch (InvocationTargetException ignored) {}
-        catch (IllegalAccessException ignored) {}
-        return openUDID;
-    }
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ReferrerReceiver.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/ReferrerReceiver.java
deleted file mode 100755
index c8d6a2443..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ReferrerReceiver.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.playseeds.android.sdk;
-
-import java.net.URLDecoder;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-/**
- * ADB Testing
- * adb shell
- * am broadcast -a com.android.vending.INSTALL_REFERRER --es "referrer" "countly_cid%3Dcb14e5f33b528334715f1809e4572842c74686df%26countly_cuid%3Decf125107e4e27e6bcaacb3ae10ddba66459e6ae"
-**/
-//******************************************************************************
-public class ReferrerReceiver extends BroadcastReceiver
-{
-    private static String key = "referrer";
-    //--------------------------------------------------------------------------
-    public static String getReferrer(Context context)
-    {
-        // Return any persisted referrer value or null if we don't have a referrer.
-        return context.getSharedPreferences(key, Context.MODE_PRIVATE).getString(key, null);
-    }
-
-    public static void deleteReferrer(Context context)
-    {
-        // delete stored referrer.
-        context.getSharedPreferences(key, Context.MODE_PRIVATE).edit().remove(key).commit();
-    }
-
-    //--------------------------------------------------------------------------
-    public ReferrerReceiver(){
-    }
-
-    //--------------------------------------------------------------------------
-    @Override public void onReceive(Context context, Intent intent)
-    {
-        try
-        {
-            // Make sure this is the intent we expect - it always should be.
-            if ((null != intent) && (intent.getAction().equals("com.android.vending.INSTALL_REFERRER")))
-            {
-                // This intent should have a referrer string attached to it.
-                String rawReferrer = intent.getStringExtra(key);
-                if (null != rawReferrer)
-                {
-                    // The string is usually URL Encoded, so we need to decode it.
-                    String referrer = URLDecoder.decode(rawReferrer, "UTF-8");
-
-                    // Log the referrer string.
-                    Log.d(Seeds.TAG, "Referrer: " + referrer);
-
-                    String parts[] = referrer.split("&");
-                    String cid = null;
-                    String uid = null;
-                    for(int i = 0; i < parts.length; i++){
-                        if(parts[i].startsWith("countly_cid"))
-                            cid = parts[i].replace("countly_cid=", "").trim();
-                        if(parts[i].startsWith("countly_cuid"))
-                            uid = parts[i].replace("countly_cuid=", "").trim();
-                    }
-                    String res = "";
-                    if(cid != null)
-                        res += "&campaign_id="+cid;
-                    if(uid != null)
-                        res += "&campaign_user="+uid;
-
-                    Log.d(Seeds.TAG, "Processed: " + res);
-                    // Persist the referrer string.
-                    if(!res.equals(""))
-                        context.getSharedPreferences(key, Context.MODE_PRIVATE).edit().putString(key, res).commit();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            Log.d(Seeds.TAG, e.toString());
-        }
-    }
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/Seeds.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/Seeds.java
deleted file mode 100755
index 19602ab0d..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/Seeds.java
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
-Copyright (c) 2012, 2013, 2014 Countly
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package com.playseeds.android.sdk;
-
-import android.app.Activity;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import com.android.vending.billing.IInAppBillingService;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.TextHttpResponseHandler;
-import com.playseeds.android.sdk.inappmessaging.InAppMessageListener;
-import com.playseeds.android.sdk.inappmessaging.InAppMessageManager;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import cz.msebera.android.httpclient.Header;
-
-/**
- * This class is the public API for the Seeds Android SDK.
- * Get more details <a href="https://github.com/the-real-sseds/seeds-sdk-android">here</a>.
- */
-public class Seeds {
-    private ConnectionQueue connectionQueue_;
-    @SuppressWarnings("FieldCanBeLocal")
-    private ScheduledExecutorService timerService_;
-    private EventQueue eventQueue_;
-    private long prevSessionDurationStartTime_;
-    private int activityCount_;
-    private boolean disableUpdateSessionRequests_;
-    private boolean enableLogging_;
-    private Seeds.CountlyMessagingMode messagingMode_;
-    private Context context_;
-    protected static List<String> publicKeyPinCertificates;
-    private IInAppBillingService billingService;
-    private AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
-    private MainActivityEventListener mainActivityEventListener;
-
-    /**
-     * Current version of the Count.ly Android SDK as a displayable string.
-     */
-    public static final String COUNTLY_SDK_VERSION_STRING = "15.06";
-
-    /**
-     * Default string used in the begin session metrics if the
-     * app version cannot be found.
-     */
-    public static final String DEFAULT_APP_VERSION = "1.0";
-
-    /**
-     * Tag used in all logging in the Count.ly SDK.
-     */
-    public static final String TAG = "Seeds";
-
-    /**
-     * Determines how many custom events can be queued locally before
-     * an attempt is made to submit them to a Count.ly server.
-     */
-    private static final int EVENT_QUEUE_SIZE_THRESHOLD = 10;
-
-    /**
-     * How often onTimer() is called.
-     */
-    private static final long TIMER_DELAY_IN_SECONDS = 60;
-
-    /**
-     * Constructs a Seeds object.
-     * Creates a new ConnectionQueue and initializes the session timer.
-     */
-    Seeds() {
-        connectionQueue_ = new ConnectionQueue();
-        timerService_ = Executors.newSingleThreadScheduledExecutor();
-        timerService_.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-                onTimer();
-            }
-        }, TIMER_DELAY_IN_SECONDS, TIMER_DELAY_IN_SECONDS, TimeUnit.SECONDS);
-    }
-
-    // see http://stackoverflow.com/questions/7048198/thread-safe-singletons-in-java
-    private static class SingletonHolder {
-        static final Seeds instance = new Seeds();
-    }
-
-    /**
-     * Returns the Seeds singleton.
-     */
-    public static Seeds sharedInstance() {
-        return SingletonHolder.instance;
-    }
-
-    /**
-     * Enum used in Seeds.initMessaging() method which controls what kind of
-     * app installation it is. Later (in Seeds Dashboard or when calling Seeds API method),
-     * you'll be able to choose whether you want to send a message to ly.count.android.sdk.test devices,
-     * or to production ones.
-     */
-    public enum CountlyMessagingMode {
-        TEST,
-        PRODUCTION,
-    }
-
-    /**
-     * Initializes the Seeds SDK in a simplified fashion. Call from your main Activity's onCreate() method.
-     * Must be called before other SDK methods can be used.
-     * This version integrates to activity lifecycle hooks and isn't supported in Android v. 13 or lower.
-     * The use of lifecycle hook removes the need for adding code to onStart, onStop and onDestroy manually.
-     * Device ID is supplied by OpenUDID service if available, otherwise Advertising ID is used.
-     * Be cautious: If neither OpenUDID, nor Advertising ID is available, Seeds will ignore this user.
-     * @param activity preferably the main activity of the app
-     * @param listener callbacks listener
-     * @param serverURL URL of the Seeds server to submit data to; use "https://cloud.count.ly" for Seeds Cloud
-     * @param appKey app key for the application being tracked; find in the Seeds Dashboard under Management &gt; Applications
-     * @return Seeds instance for easy method chaining
-     * @throws java.lang.IllegalArgumentException if context, serverURL, appKey, or deviceID are invalid
-     * @throws java.lang.IllegalStateException if the Seeds SDK has already been initialized or Android SDK is too old
-     */
-    public Seeds simpleInit(final Activity activity, final InAppMessageListener listener, final String serverURL, final String appKey) {
-        final boolean apiSupportsLifecycleCallbacks =
-                                Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
-
-        if (apiSupportsLifecycleCallbacks) {
-            DeviceId.Type idMode = OpenUDIDAdapter.isOpenUDIDAvailable() ? DeviceId.Type.OPEN_UDID : DeviceId.Type.ADVERTISING_ID;
-
-            // Pre-initialize SDK without the billing service
-            Seeds sdk = Seeds.sharedInstance()
-                    .init(activity, null, listener, serverURL, appKey, null, idMode);
-
-            // MainActivityEventListener takes care of the creation of the billing service
-            // and binds to the main activity lifecycle hooks
-            mainActivityEventListener =
-                    new MainActivityEventListener(activity, listener, serverURL, appKey, null, idMode);
-            mainActivityEventListener.resolve();
-
-            return sdk;
-        } else {
-            throw new IllegalStateException("You can't use automatedInit with Android SDK version <= 13");
-        }
-    }
-
-    /**
-     * Initializes the Seeds SDK. Call from your main Activity's onCreate() method.
-     * Must be called before other SDK methods can be used.
-     * Device ID is supplied by OpenUDID service if available, otherwise Advertising ID is used.
-     * Be cautious: If neither OpenUDID, nor Advertising ID is available, Seeds will ignore this user.
-     * @param context application context
-     * @param billingService billing service or null
-     * @param listener callbacks listener
-     * @param serverURL URL of the Seeds server to submit data to; use "https://cloud.count.ly" for Seeds Cloud
-     * @param appKey app key for the application being tracked; find in the Seeds Dashboard under Management &gt; Applications
-     * @return Seeds instance for easy method chaining
-     * @throws java.lang.IllegalArgumentException if context, serverURL, appKey, or deviceID are invalid
-     * @throws java.lang.IllegalStateException if the Seeds SDK has already been initialized
-     */
-    public Seeds init(final Context context, IInAppBillingService billingService, final InAppMessageListener listener, final String serverURL, final String appKey) {
-        return init(context, billingService, listener, serverURL, appKey, null, OpenUDIDAdapter.isOpenUDIDAvailable() ? DeviceId.Type.OPEN_UDID : DeviceId.Type.ADVERTISING_ID);
-    }
-
-    /**
-     * Initializes the Seeds SDK. Call from your main Activity's onCreate() method.
-     * Must be called before other SDK methods can be used.
-     * @param context application context
-     * @param billingService billing service or null
-     * @param listener callbacks listener
-     * @param serverURL URL of the Seeds server to submit data to; use "https://cloud.count.ly" for Seeds Cloud
-     * @param appKey app key for the application being tracked; find in the Seeds Dashboard under Management &gt; Applications
-     * @param deviceID unique ID for the device the app is running on; note that null in deviceID means that Seeds will fall back to OpenUDID, then, if it's not available, to Google Advertising ID
-     * @return Seeds instance for easy method chaining
-     * @throws IllegalArgumentException if context, serverURL, appKey, or deviceID are invalid
-     * @throws IllegalStateException if init has previously been called with different values during the same application instance
-     */
-    public Seeds init(final Context context, IInAppBillingService billingService, final InAppMessageListener listener, final String serverURL, final String appKey, final String deviceID) {
-        return init(context, billingService, listener, serverURL, appKey, deviceID, null);
-    }
-
-    /**
-     * Initializes the Seeds SDK. Call from your main Activity's onCreate() method.
-     * Must be called before other SDK methods can be used.
-     * @param context application context
-     * @param billingService billing service or null
-     * @param listener callbacks listener
-     * @param serverURL URL of the Seeds server to submit data to; use "https://cloud.count.ly" for Seeds Cloud
-     * @param appKey app key for the application being tracked; find in the Seeds Dashboard under Management &gt; Applications
-     * @param deviceID unique ID for the device the app is running on; note that null in deviceID means that Seeds will fall back to OpenUDID, then, if it's not available, to Google Advertising ID
-     * @param idMode enum value specifying which device ID generation strategy Seeds should use: OpenUDID or Google Advertising ID
-     * @return Seeds instance for easy method chaining
-     * @throws IllegalArgumentException if context, serverURL, appKey, or deviceID are invalid
-     * @throws IllegalStateException if init has previously been called with different values during the same application instance
-     */
-    public synchronized Seeds init(final Context context, IInAppBillingService billingService, final InAppMessageListener listener, final String serverURL, final String appKey, final String deviceID, DeviceId.Type idMode) {
-        if (context == null) {
-            throw new IllegalArgumentException("valid context is required");
-        }
-        if (!isValidURL(serverURL)) {
-            throw new IllegalArgumentException("valid serverURL is required");
-        }
-        if (appKey == null || appKey.length() == 0) {
-            throw new IllegalArgumentException("valid appKey is required");
-        }
-        if (deviceID != null && deviceID.length() == 0) {
-            throw new IllegalArgumentException("valid deviceID is required");
-        }
-        if (deviceID == null && idMode == null) {
-            if (OpenUDIDAdapter.isOpenUDIDAvailable()) idMode = DeviceId.Type.OPEN_UDID;
-            else if (AdvertisingIdAdapter.isAdvertisingIdAvailable()) idMode = DeviceId.Type.ADVERTISING_ID;
-        }
-        if (deviceID == null && idMode == DeviceId.Type.OPEN_UDID && !OpenUDIDAdapter.isOpenUDIDAvailable()) {
-            throw new IllegalArgumentException("valid deviceID is required because OpenUDID is not available");
-        }
-        if (deviceID == null && idMode == DeviceId.Type.ADVERTISING_ID && !AdvertisingIdAdapter.isAdvertisingIdAvailable()) {
-            throw new IllegalArgumentException("valid deviceID is required because Advertising ID is not available (you need to include Google Play services 4.0+ into your project)");
-        }
-        if (eventQueue_ != null && (!connectionQueue_.getServerURL().equals(serverURL) ||
-                !connectionQueue_.getAppKey().equals(appKey) ||
-                !DeviceId.deviceIDEqualsNullSafe(deviceID, idMode, connectionQueue_.getDeviceId()) )) {
-            throw new IllegalStateException("Seeds cannot be reinitialized with different values");
-        }
-
-        // In some cases CountlyMessaging does some background processing, so it needs a way
-        // to start Seeds on itself
-        if (MessagingAdapter.isMessagingAvailable()) {
-            MessagingAdapter.storeConfiguration(context, serverURL, appKey, deviceID, idMode);
-        }
-
-        // if we get here and eventQueue_ != null, init is being called again with the same values,
-        // so there is nothing to do, because we are already initialized with those values
-        if (eventQueue_ == null) {
-            DeviceId deviceIdInstance;
-            if (deviceID != null) {
-                deviceIdInstance = new DeviceId(deviceID);
-            } else {
-                deviceIdInstance = new DeviceId(idMode);
-            }
-
-            final CountlyStore countlyStore = new CountlyStore(context);
-
-            deviceIdInstance.init(context, countlyStore, true);
-
-            connectionQueue_.setServerURL(serverURL);
-            connectionQueue_.setAppKey(appKey);
-            connectionQueue_.setCountlyStore(countlyStore);
-            connectionQueue_.setDeviceId(deviceIdInstance);
-
-            eventQueue_ = new EventQueue(countlyStore);
-        }
-
-        context_ = context;
-        this.billingService = billingService;
-
-        // context is allowed to be changed on the second init call
-        connectionQueue_.setContext(context);
-
-        initInAppMessaging();
-        InAppMessageManager.sharedInstance().setListener(listener);
-
-        return this;
-    }
-
-    /**
-     * Checks whether Seeds.init has been already called.
-     * @return true if Seeds is ready to use
-     */
-    public synchronized boolean isInitialized() {
-        return eventQueue_ != null;
-    }
-
-    /**
-     * Initializes the Seeds MessagingSDK. Call from your main Activity's onCreate() method.
-     * @param activity application activity which acts as a final destination for notifications
-     * @param activityClass application activity class which acts as a final destination for notifications
-     * @param projectID ProjectID for this app from Google API Console
-     * @param mode whether this app installation is a ly.count.android.sdk.test release or production
-     * @return Seeds instance for easy method chaining
-     * @throws IllegalStateException if no CountlyMessaging class is found (you need to use countly-messaging-sdk-android library instead of countly-sdk-android)
-     */
-    public Seeds initMessaging(Activity activity, Class<? extends Activity> activityClass, String projectID, Seeds.CountlyMessagingMode mode) {
-        return initMessaging(activity, activityClass, projectID, null, mode);
-    }
-
-    /**
-     * Initializes the Seeds MessagingSDK. Call from your main Activity's onCreate() method.
-     * @param activity application activity which acts as a final destination for notifications
-     * @param activityClass application activity class which acts as a final destination for notifications
-     * @param projectID ProjectID for this app from Google API Console
-     * @param buttonNames Strings to use when displaying Dialogs (uses new String[]{"Open", "Review"} by default)
-     * @param mode whether this app installation is a ly.count.android.sdk.test release or production
-     * @return Seeds instance for easy method chaining
-     * @throws IllegalStateException if no CountlyMessaging class is found (you need to use countly-messaging-sdk-android library instead of countly-sdk-android)
-     */
-    public synchronized Seeds initMessaging(Activity activity, Class<? extends Activity> activityClass, String projectID, String[] buttonNames, Seeds.CountlyMessagingMode mode) {
-        if (mode != null && !MessagingAdapter.isMessagingAvailable()) {
-            throw new IllegalStateException("you need to include countly-messaging-sdk-android library instead of countly-sdk-android if you want to use Seeds Messaging");
-        } else {
-            if (!MessagingAdapter.init(activity, activityClass, projectID, buttonNames)) {
-                throw new IllegalStateException("couldn't initialize Seeds Messaging");
-            }
-        }
-        messagingMode_ = mode;
-
-        if (MessagingAdapter.isMessagingAvailable()) {
-            Log.d(Seeds.TAG, "deviceId in initMessaging: " + connectionQueue_.getDeviceId() +  connectionQueue_.getDeviceId().getId() + connectionQueue_.getDeviceId().getType());
-            MessagingAdapter.storeConfiguration(connectionQueue_.getContext(), connectionQueue_.getServerURL(), connectionQueue_.getAppKey(), connectionQueue_.getDeviceId().getId(), connectionQueue_.getDeviceId().getType());
-        }
-
-        return this;
-    }
-
-    /**
-     * Initializes the Seeds InAppMessaging part of the MessagingSDK. Call from your main Activity's onCreate() method.
-     * @return Seeds instance for easy method chaining
-     */
-    public synchronized Seeds initInAppMessaging() {
-        Log.d(Seeds.TAG, "deviceId: " + connectionQueue_.getDeviceId() +
-                connectionQueue_.getDeviceId().getId() + connectionQueue_.getDeviceId().getType());
-
-        InAppMessageManager.sharedInstance().init(connectionQueue_.getContext(), billingService,
-                connectionQueue_.getServerURL(), connectionQueue_.getAppKey(),
-                connectionQueue_.getDeviceId().getId(), connectionQueue_.getDeviceId().getType());
-
-        return this;
-    }
-
-    /**
-     * Immediately disables session &amp; event tracking and clears any stored session &amp; event data.
-     * This API is useful if your app has a tracking opt-out switch, and you want to immediately
-     * disable tracking when a user opts out. The onStart/onStop/recordEvent methods will throw
-     * IllegalStateException after calling this until Seeds is reinitialized by calling init
-     * again.
-     */
-    public synchronized void halt() {
-        eventQueue_ = null;
-        final CountlyStore countlyStore = connectionQueue_.getCountlyStore();
-        if (countlyStore != null) {
-            countlyStore.clear();
-        }
-        connectionQueue_.setContext(null);
-        connectionQueue_.setServerURL(null);
-        connectionQueue_.setAppKey(null);
-        connectionQueue_.setCountlyStore(null);
-        prevSessionDurationStartTime_ = 0;
-        activityCount_ = 0;
-    }
-
-    /**
-     * Tells the Seeds SDK that an Activity has started. Since Android does not have an
-     * easy way to determine when an application instance starts and stops, you must call this
-     * method from every one of your Activity's onStart methods for accurate application
-     * session tracking.
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     */
-    public synchronized void onStart() {
-        if (eventQueue_ == null) {
-            throw new IllegalStateException("init must be called before onStart");
-        }
-
-        ++activityCount_;
-        if (activityCount_ == 1) {
-            onStartHelper();
-        }
-
-        //check if there is an install referrer data
-        String referrer = ReferrerReceiver.getReferrer(context_);
-        if (Seeds.sharedInstance().isLoggingEnabled()) {
-            Log.d(Seeds.TAG, "Checking referrer: " + referrer);
-        }
-        if(referrer != null){
-            connectionQueue_.sendReferrerData(referrer);
-            ReferrerReceiver.deleteReferrer(context_);
-        }
-
-        CrashDetails.inForeground();
-    }
-
-    /**
-     * Called when the first Activity is started. Sends a begin session event to the server
-     * and initializes application session tracking.
-     */
-    void onStartHelper() {
-        prevSessionDurationStartTime_ = System.nanoTime();
-        connectionQueue_.beginSession();
-    }
-
-    /**
-     * Tells the Seeds SDK that an Activity has stopped. Since Android does not have an
-     * easy way to determine when an application instance starts and stops, you must call this
-     * method from every one of your Activity's onStop methods for accurate application
-     * session tracking.
-     * @throws IllegalStateException if Seeds SDK has not been initialized, or if
-     *                               unbalanced calls to onStart/onStop are detected
-     */
-    public synchronized void onStop() {
-        if (eventQueue_ == null) {
-            throw new IllegalStateException("init must be called before onStop");
-        }
-        if (activityCount_ == 0) {
-            throw new IllegalStateException("must call onStart before onStop");
-        }
-
-        --activityCount_;
-        if (activityCount_ == 0) {
-            onStopHelper();
-        }
-
-        CrashDetails.inBackground();
-    }
-
-    /**
-     * Called when final Activity is stopped. Sends an end session event to the server,
-     * also sends any unsent custom events.
-     */
-    void onStopHelper() {
-        connectionQueue_.endSession(roundedSecondsSinceLastSessionDurationUpdate());
-        prevSessionDurationStartTime_ = 0;
-
-        if (eventQueue_.size() > 0) {
-            connectionQueue_.recordEvents(eventQueue_.events());
-        }
-    }
-
-    /**
-     * Called when GCM Registration ID is received. Sends a token session event to the server.
-     */
-    public void onRegistrationId(String registrationId) {
-        connectionQueue_.tokenSession(registrationId, messagingMode_);
-    }
-
-    /**
-     * Records a custom event with no segmentation values, a count of one and a sum of zero.
-     * @param key name of the custom event, required, must not be the empty string
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordEvent(final String key) {
-        recordEvent(key, null, 1, 0);
-    }
-
-    /**
-     * Records a custom event with no segmentation values, the specified count, and a sum of zero.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param count count to associate with the event, should be more than zero
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordEvent(final String key, final int count) {
-        recordEvent(key, null, count, 0);
-    }
-
-    /**
-     * Records a custom event with no segmentation values, and the specified count and sum.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param count count to associate with the event, should be more than zero
-     * @param sum sum to associate with the event
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordEvent(final String key, final int count, final double sum) {
-        recordEvent(key, null, count, sum);
-    }
-
-    private void recordGenericIAPEvent(String key, final double price, boolean seedsEvent) {
-
-        HashMap<String, String> segmentation = new HashMap<String, String>();
-
-        if (seedsEvent) {
-            segmentation.put("IAP type", "Seeds");
-        } else {
-            segmentation.put("IAP type", "Non-Seeds");
-        }
-
-        segmentation.put("item", key);
-
-        recordEvent("IAP: " + key, segmentation, 1, price);
-        Log.d(TAG, "IAP: " + key + " segment: " + segmentation);
-    }
-    
-    /**
-     * Records a custom event with the specified segmentation values and count, and a sum of zero.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param segmentation segmentation dictionary to associate with the event, can be null
-     * @param count count to associate with the event, should be more than zero
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordEvent(final String key, final Map<String, String> segmentation, final int count) {
-        recordEvent(key, segmentation, count, 0);
-    }
-
-    /**
-     * Records a custom event with the specified values.
-     * @param key name of the custom event, required, must not be the empty string
-     * @param segmentation segmentation dictionary to associate with the event, can be null
-     * @param count count to associate with the event, should be more than zero
-     * @param sum sum to associate with the event
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty, count is less than 1, or if
-     *                                  segmentation contains null or empty keys or values
-     */
-    public synchronized void recordEvent(final String key, final Map<String, String> segmentation, final int count, final double sum) {
-        if (!isInitialized()) {
-            throw new IllegalStateException("Seeds.sharedInstance().init must be called before recordEvent");
-        }
-        if (key == null || key.length() == 0) {
-            throw new IllegalArgumentException("Valid Seeds event key is required");
-        }
-        if (count < 1) {
-            throw new IllegalArgumentException("Seeds event count should be greater than zero");
-        }
-        if (segmentation != null) {
-            for (String k : segmentation.keySet()) {
-                if (k == null || k.length() == 0) {
-                    throw new IllegalArgumentException("Seeds event segmentation key cannot be null or empty");
-                }
-                if (segmentation.get(k) == null || segmentation.get(k).length() == 0) {
-                    throw new IllegalArgumentException("Seeds event segmentation value cannot be null or empty");
-                }
-            }
-        }
-
-        eventQueue_.recordEvent(key, segmentation, count, sum);
-        sendEventsIfNeeded();
-    }
-
-    /**
-     * Sets information about user. Possible keys are:
-     * <ul>
-     * <li>
-     * name - (String) providing user's full name
-     * </li>
-     * <li>
-     * username - (String) providing user's nickname
-     * </li>
-     * <li>
-     * email - (String) providing user's email address
-     * </li>
-     * <li>
-     * organization - (String) providing user's organization's name where user works
-     * </li>
-     * <li>
-     * phone - (String) providing user's phone number
-     * </li>
-     * <li>
-     * picture - (String) providing WWW URL to user's avatar or profile picture
-     * </li>
-     * <li>
-     * picturePath - (String) providing local path to user's avatar or profile picture
-     * </li>
-     * <li>
-     * gender - (String) providing user's gender as M for male and F for female
-     * </li>
-     * <li>
-     * byear - (int) providing user's year of birth as integer
-     * </li>
-     * </ul>
-     * @param data Map&lt;String, String&gt; with user data
-     */
-    public synchronized Seeds setUserData(Map<String, String> data) {
-        return setUserData(data, null);
-    }
-
-    /**
-     * Sets information about user with custom properties.
-     * In custom properties you can provide any string key values to be stored with user
-     * Possible keys are:
-     * <ul>
-     * <li>
-     * name - (String) providing user's full name
-     * </li>
-     * <li>
-     * username - (String) providing user's nickname
-     * </li>
-     * <li>
-     * email - (String) providing user's email address
-     * </li>
-     * <li>
-     * organization - (String) providing user's organization's name where user works
-     * </li>
-     * <li>
-     * phone - (String) providing user's phone number
-     * </li>
-     * <li>
-     * picture - (String) providing WWW URL to user's avatar or profile picture
-     * </li>
-     * <li>
-     * picturePath - (String) providing local path to user's avatar or profile picture
-     * </li>
-     * <li>
-     * gender - (String) providing user's gender as M for male and F for female
-     * </li>
-     * <li>
-     * byear - (int) providing user's year of birth as integer
-     * </li>
-     * </ul>
-     * @param data Map&lt;String, String&gt; with user data
-     * @param customdata Map&lt;String, String&gt; with custom key values for this user
-     */
-    public synchronized Seeds setUserData(Map<String, String> data, Map<String, String> customdata) {
-        UserData.setData(data);
-        if(customdata != null)
-            UserData.setCustomData(customdata);
-        connectionQueue_.sendUserData();
-        return this;
-    }
-
-    /**
-     * Sets custom properties.
-     * In custom properties you can provide any string key values to be stored with user
-     * @param customdata Map&lt;String, String&gt; with custom key values for this user
-     */
-    public synchronized Seeds setCustomUserData(Map<String, String> customdata) {
-        if(customdata != null)
-            UserData.setCustomData(customdata);
-        connectionQueue_.sendUserData();
-        return this;
-    }
-
-    /**
-     * Set user location.
-     *
-     * Seeds detects user location based on IP address. But for geolocation-enabled apps,
-     * it's better to supply exact location of user.
-     * Allows sending messages to a custom segment of users located in a particular area.
-     *
-     * @param lat Latitude
-     * @param lon Longitude
-     */
-    public synchronized Seeds setLocation(double lat, double lon) {
-        connectionQueue_.getCountlyStore().setLocation(lat, lon);
-
-        if (disableUpdateSessionRequests_) {
-            connectionQueue_.updateSession(roundedSecondsSinceLastSessionDurationUpdate());
-        }
-
-        return this;
-    }
-
-    /**
-     * Sets custom segments to be reported with crash reports
-     * In custom segments you can provide any string key values to segments crashes by
-     * @param segments Map&lt;String, String&gt; key segments and their values
-     */
-    public synchronized Seeds setCustomCrashSegments(Map<String, String> segments) {
-        if(segments != null)
-            CrashDetails.setCustomSegments(segments);
-        return this;
-    }
-
-    /**
-     * Add crash breadcrumb like log record to the log that will be send together with crash report
-     * @param record String a bread crumb for the crash report
-     */
-    public synchronized Seeds addCrashLog(String record) {
-        CrashDetails.addLog(record);
-        return this;
-    }
-
-    /**
-     * Log handled exception to report it to server as non fatal crash
-     * @param exception Exception to log
-     */
-    public synchronized Seeds logException(Exception exception) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        exception.printStackTrace(pw);
-        connectionQueue_.sendCrashReport(sw.toString(), true);
-        return this;
-    }
-
-    /**
-     * Log handled exception to report it to server as non fatal crash
-     * @param exception Exception to log
-     */
-    public synchronized Seeds logException(String exception) {
-        connectionQueue_.sendCrashReport(exception, true);
-        return this;
-    }
-
-    /**
-     * Enable crash reporting to send unhandled crash reports to server
-     */
-    public synchronized Seeds enableCrashReporting() {
-        //get default handler
-        final Thread.UncaughtExceptionHandler oldHandler = Thread.getDefaultUncaughtExceptionHandler();
-
-        Thread.UncaughtExceptionHandler handler = new Thread.UncaughtExceptionHandler() {
-
-            @Override
-            public void uncaughtException(Thread t, Throwable e) {
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                connectionQueue_.sendCrashReport(sw.toString(), false);
-
-                //if there was another handler before
-                if(oldHandler != null){
-                    //notify it also
-                    oldHandler.uncaughtException(t,e);
-                }
-            }
-        };
-
-        Thread.setDefaultUncaughtExceptionHandler(handler);
-        return this;
-    }
-
-    /**
-     * Disable periodic session time updates.
-     * By default, Seeds will send a request to the server each 30 seconds with a small update
-     * containing session duration time. This method allows you to disable such behavior.
-     * Note that event updates will still be sent every 10 events or 30 seconds after event recording.
-     * @param disable whether or not to disable session time updates
-     * @return Seeds instance for easy method chaining
-     */
-    public synchronized Seeds setDisableUpdateSessionRequests(final boolean disable) {
-        disableUpdateSessionRequests_ = disable;
-        return this;
-    }
-
-    /**
-     * Sets whether debug logging is turned on or off. Logging is disabled by default.
-     * @param enableLogging true to enable logging, false to disable logging
-     * @return Seeds instance for easy method chaining
-     */
-    public synchronized Seeds setLoggingEnabled(final boolean enableLogging) {
-        enableLogging_ = enableLogging;
-        return this;
-    }
-
-    public synchronized boolean isLoggingEnabled() {
-        return enableLogging_;
-    }
-
-    /**
-     * Submits all of the locally queued events to the server if there are more than 10 of them.
-     */
-    void sendEventsIfNeeded() {
-        if (eventQueue_.size() >= EVENT_QUEUE_SIZE_THRESHOLD) {
-            connectionQueue_.recordEvents(eventQueue_.events());
-        }
-    }
-
-    /**
-     * Called every 60 seconds to send a session heartbeat to the server. Does nothing if there
-     * is not an active application session.
-     */
-    synchronized void onTimer() {
-        final boolean hasActiveSession = activityCount_ > 0;
-        if (hasActiveSession) {
-            if (!disableUpdateSessionRequests_) {
-                connectionQueue_.updateSession(roundedSecondsSinceLastSessionDurationUpdate());
-            }
-            if (eventQueue_.size() > 0) {
-                connectionQueue_.recordEvents(eventQueue_.events());
-            }
-        }
-    }
-
-    /**
-     * Calculates the unsent session duration in seconds, rounded to the nearest int.
-     */
-    int roundedSecondsSinceLastSessionDurationUpdate() {
-        final long currentTimestampInNanoseconds = System.nanoTime();
-        final long unsentSessionLengthInNanoseconds = currentTimestampInNanoseconds - prevSessionDurationStartTime_;
-        prevSessionDurationStartTime_ = currentTimestampInNanoseconds;
-        return (int) Math.round(unsentSessionLengthInNanoseconds / 1000000000.0d);
-    }
-
-    /**
-     * Utility method to return a current timestamp that can be used in the Count.ly API.
-     */
-    static int currentTimestamp() {
-        return ((int)(System.currentTimeMillis() / 1000l));
-    }
-
-    /**
-     * Utility method for testing validity of a URL.
-     */
-    static boolean isValidURL(final String urlStr) {
-        boolean validURL = false;
-        if (urlStr != null && urlStr.length() > 0) {
-            try {
-                new URL(urlStr);
-                validURL = true;
-            }
-            catch (MalformedURLException e) {
-                validURL = false;
-            }
-        }
-        return validURL;
-    }
-
-    /**
-     * Allows public key pinning.
-     * Supply list of SSL certificates (base64-encoded strings between "-----BEGIN CERTIFICATE-----" and "-----END CERTIFICATE-----" without end-of-line)
-     * along with server URL starting with "https://". Seeds will only accept connections to the server
-     * if public key of SSL certificate provided by the server matches one provided to this method.
-     * @param certificates List of SSL certificates
-     * @return Seeds instance
-     */
-    public static Seeds enablePublicKeyPinning(List<String> certificates) {
-        publicKeyPinCertificates = certificates;
-        return Seeds.sharedInstance();
-    }
-
-    // for unit testing
-    ConnectionQueue getConnectionQueue() {
-        return connectionQueue_;
-    }
-
-    void setConnectionQueue(final ConnectionQueue connectionQueue) {
-        connectionQueue_ = connectionQueue;
-    }
-
-    ExecutorService getTimerService() {
-        return timerService_;
-    }
-
-    EventQueue getEventQueue() {
-        return eventQueue_;
-    }
-
-    void setEventQueue(final EventQueue eventQueue) {
-        eventQueue_ = eventQueue;
-    }
-
-    long getPrevSessionDurationStartTime() {
-        return prevSessionDurationStartTime_;
-    }
-
-    void setPrevSessionDurationStartTime(final long prevSessionDurationStartTime) {
-        prevSessionDurationStartTime_ = prevSessionDurationStartTime;
-    }
-
-    int getActivityCount() {
-        return activityCount_;
-    }
-
-    boolean getDisableUpdateSessionRequests() {
-        return disableUpdateSessionRequests_;
-    }
-
-    /**
-     * This method is added solely for the purposes of testing
-     * Check: SeedsTests.java
-     */
-    protected void clear() {
-        sharedInstance().eventQueue_ = null;
-    }
-
-    /**
-     * Records an IAP event
-     * @param key name of the custom event, required, must not be the empty string
-     * @param price sum to associate with the event
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordIAPEvent(String key, final double price) {
-        recordGenericIAPEvent(key, price, false);
-    }
-
-    /**
-     * Records an IAP event
-     * @param key name of the custom event, required, must not be the empty string
-     * @param price sum to associate with the event
-     * @throws IllegalStateException if Seeds SDK has not been initialized
-     * @throws IllegalArgumentException if key is null or empty
-     */
-    public void recordSeedsIAPEvent(String key, final double price) {
-        recordGenericIAPEvent(key, price, true);
-    }
-
-    public void requestInAppMessage(String messageId) {
-        InAppMessageManager.sharedInstance().requestInAppMessage(messageId, null);
-    }
-
-    public void requestInAppMessage(String messageId, String manualLocalizedPrice) {
-        InAppMessageManager.sharedInstance().requestInAppMessage(messageId, manualLocalizedPrice);
-    }
-
-    public boolean isInAppMessageLoaded(String messageId) {
-        return InAppMessageManager.sharedInstance().isInAppMessageLoaded(messageId);
-    }
-
-    public void showInAppMessage(String messageId, String messageContext) {
-        InAppMessageManager.sharedInstance().showInAppMessage(messageId, messageContext);
-    }
-
-    /**
-     * Query how many times in total a user has made IAP purchases which are tracked in Seeds
-     * @param listener Listener callback, first parameter is an error message and second parameter is
-     *                 the purchase count. If the error message is null, the request was successful.
-     */
-    public void requestTotalInAppPurchaseCount(IInAppPurchaseCountListener listener) {
-        requestInAppPurchaseCount(null, listener);
-    }
-
-    /**
-     * Query how many times in total a user has made IAP purchases which are tracked in Seeds
-     * @param key The key of the IAP which you have used in recordSeedsIAPEvent or recordIAPEvent
-     * @param listener Listener callback, first parameter is an error string and second parameter is
-     *                 the show count. If the error string is null, the request was successful.
-     */
-    public void requestInAppPurchaseCount(final String key, final IInAppPurchaseCountListener listener) {
-        String endpoint = connectionQueue_.getServerURL() + "/o/app-user/query-iap-purchase-count";
-        Uri.Builder uri = Uri.parse(endpoint).buildUpon();
-        uri.appendQueryParameter("app_key", connectionQueue_.getAppKey());
-        uri.appendQueryParameter("device_id", connectionQueue_.getDeviceId().getId());
-
-        if (key != null)
-            uri.appendQueryParameter("iap_key", key);
-        else
-            uri.appendPath("total");
-
-        asyncHttpClient.get(uri.build().toString(), new TextHttpResponseHandler() {
-            @Override
-            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
-                Log.e(TAG, "requestInAppPurchaseCount failed: " + responseString);
-                if (listener != null)
-                    listener.onInAppPurchaseCount(responseString, -1, null);
-            }
-
-            @Override
-            public void onSuccess(int statusCode, Header[] headers, String responseString) {
-                JsonObject jsonResponse = new JsonParser().parse(responseString).getAsJsonObject();
-                if (listener != null)
-                    listener.onInAppPurchaseCount(null, jsonResponse.get("result").getAsInt(), key);
-            }
-        });
-    }
-
-    /**
-     * Query how many times in total a user has seen interstitials
-     * @param listener Listener callback, first parameter is an error string and second parameter is
-     *                 the show count. If the error string is null, the request was successful.
-     */
-    public void requestTotalInAppMessageShowCount(IInAppMessageShowCountListener listener) {
-        requestInAppMessageShowCount(null, listener);
-    }
-
-    /**
-     * Query how many times user has seen a specific interstitial
-     * @param message_id The message_id of the interstitial
-     * @param listener Listener callback, first parameter is an error string and second parameter is
-     *                 the show count. If the error string is null, the request was successful.
-     */
-    public void requestInAppMessageShowCount(final String message_id, final IInAppMessageShowCountListener listener) {
-        String endpoint = connectionQueue_.getServerURL() + "/o/app-user/query-interstitial-shown-count";
-        Uri.Builder uri = Uri.parse(endpoint).buildUpon();
-        uri.appendQueryParameter("app_key", connectionQueue_.getAppKey());
-        uri.appendQueryParameter("device_id", connectionQueue_.getDeviceId().getId());
-
-        if (message_id != null)
-            uri.appendQueryParameter("interstitial_id", message_id);
-        else
-            uri.appendPath("total");
-
-        asyncHttpClient.get(uri.build().toString(), new TextHttpResponseHandler() {
-            @Override
-            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
-                Log.e(TAG, "requestInAppPurchaseCount failed: " + responseString);
-                if (listener != null)
-                    listener.onInAppMessageShowCount(responseString, -1, null);
-            }
-
-            @Override
-            public void onSuccess(int statusCode, Header[] headers, String responseString) {
-                JsonObject jsonResponse = new JsonParser().parse(responseString).getAsJsonObject();
-                if (listener != null)
-                    listener.onInAppMessageShowCount(null, jsonResponse.get("result").getAsInt(), message_id);
-            }
-        });
-    }
-
-
-    /**
-     * Generalized user behaviour query
-     * @param queryPath The query path string for the query
-     * @param listener Listener callback, first parameter is an error string and second parameter is
-     *                 the result as a JsonObject. If the error string is null, the request was successful.
-     */
-    public void requestGenericUserBehaviorQuery(final String queryPath, final IUserBehaviorQueryListener listener) {
-        String endpoint = connectionQueue_.getServerURL() + "/o/app-user/" + queryPath;
-        Uri.Builder uri = Uri.parse(endpoint).buildUpon();
-        uri.appendQueryParameter("app_key", connectionQueue_.getAppKey());
-        uri.appendQueryParameter("device_id", connectionQueue_.getDeviceId().getId());
-
-        asyncHttpClient.get(uri.build().toString(), new TextHttpResponseHandler() {
-            @Override
-            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
-                Log.e(TAG, "requestGenericUserBehaviourQuery failed: " + responseString);
-                if (listener != null)
-                    listener.onUserBehaviorResponse(responseString, null, null);
-            }
-
-            @Override
-            public void onSuccess(int statusCode, Header[] headers, String responseString) {
-                JsonObject jsonResponse = new JsonParser().parse(responseString).getAsJsonObject();
-                if (listener != null)
-                    listener.onUserBehaviorResponse(null, jsonResponse.get("result"), queryPath);
-            }
-        });
-    }
-
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/UserData.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/UserData.java
deleted file mode 100755
index 8fd971028..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/UserData.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.playseeds.android.sdk;
-
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.util.Log;
-
-public class UserData {
-    public static final String NAME_KEY = "name";
-    public static final String USERNAME_KEY = "username";
-    public static final String EMAIL_KEY = "email";
-    public static final String ORG_KEY = "organization";
-    public static final String PHONE_KEY = "phone";
-    public static final String PICTURE_KEY = "picture";
-    public static final String PICTURE_PATH_KEY = "picturePath";
-    public static final String GENDER_KEY = "gender";
-    public static final String BYEAR_KEY = "byear";
-    public static final String CUSTOM_KEY = "custom";
-
-    public static String name;
-    public static String username;
-    public static String email;
-    public static String org;
-    public static String phone;
-    public static String picture;
-    public static String picturePath;
-    public static String gender;
-    public static Map<String, String> custom;
-    public static int byear = 0;
-    public static boolean isSynced = true;
-
-    /**
-     * Sets user data values.
-     * @param data Map with user data
-     */
-    static void setData(Map<String, String> data){
-        if(data.containsKey(NAME_KEY))
-            name = data.get(NAME_KEY);
-        if(data.containsKey(USERNAME_KEY))
-            username = data.get(USERNAME_KEY);
-        if(data.containsKey(EMAIL_KEY))
-            email = data.get(EMAIL_KEY);
-        if(data.containsKey(ORG_KEY))
-            org = data.get(ORG_KEY);
-        if(data.containsKey(PHONE_KEY))
-            phone = data.get(PHONE_KEY);
-        if(data.containsKey(PICTURE_PATH_KEY))
-            picturePath = data.get(PICTURE_PATH_KEY);
-        if(picturePath != null){
-            File sourceFile = new File(picturePath);
-            if (!sourceFile.isFile()) {
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.w(Seeds.TAG, "Provided file " + picturePath + " can not be opened");
-                }
-                picturePath = null;
-            }
-        }
-        if(data.containsKey(PICTURE_KEY))
-            picture = data.get(PICTURE_KEY);
-        if(data.containsKey(GENDER_KEY))
-            gender = data.get(GENDER_KEY);
-        if(data.containsKey(BYEAR_KEY)){
-            try {
-                byear = Integer.parseInt(data.get(BYEAR_KEY));
-            }
-            catch(NumberFormatException e){
-                if (Seeds.sharedInstance().isLoggingEnabled()) {
-                    Log.w(Seeds.TAG, "Incorrect byear number format");
-                }
-                byear = 0;
-            }
-        }
-        isSynced = false;
-    }
-
-    /**
-     * Sets user custom properties and values.
-     * @param data Map with user custom key/values
-     */
-    static void setCustomData(Map<String, String> data){
-        custom = new HashMap<>();
-        custom.putAll(data);
-        isSynced = false;
-    }
-
-    /**
-     * Returns &user_details= prefixed url to add to request data when making request to server
-     * @return a String user_details url part with provided user data
-     */
-    static String getDataForRequest(){
-        if(!isSynced){
-            isSynced = true;
-            final JSONObject json = UserData.toJSON();
-            if(json != null){
-                String result = json.toString();
-
-                try {
-                    result = java.net.URLEncoder.encode(result, "UTF-8");
-
-                    if(result != null && !result.equals("")){
-                        result = "&user_details="+result;
-                        if(picturePath != null)
-                            result += "&"+PICTURE_PATH_KEY+"="+java.net.URLEncoder.encode(picturePath, "UTF-8");
-                    }
-                    else{
-                        result = "";
-                        if(picturePath != null)
-                            result += "&user_details&"+PICTURE_PATH_KEY+"="+java.net.URLEncoder.encode(picturePath, "UTF-8");
-                    }
-                } catch (UnsupportedEncodingException ignored) {
-                    // should never happen because Android guarantees UTF-8 support
-                }
-
-                if(result != null)
-                    return result;
-            }
-        }
-        return "";
-    }
-
-    /**
-     * Creates and returns a JSONObject containing the user data from this object.
-     * @return a JSONObject containing the user data from this object
-     */
-    static JSONObject toJSON() {
-        final JSONObject json = new JSONObject();
-
-        try {
-            if (name != null)
-                if(name.isEmpty())
-                    json.put(NAME_KEY, JSONObject.NULL);
-                else
-                    json.put(NAME_KEY, name);
-            if (username != null)
-                if(username.isEmpty())
-                    json.put(USERNAME_KEY, JSONObject.NULL);
-                else
-                    json.put(USERNAME_KEY, username);
-            if (email != null)
-                if(email.isEmpty())
-                    json.put(EMAIL_KEY, JSONObject.NULL);
-                else
-                    json.put(EMAIL_KEY, email);
-            if (org != null)
-                if(org.isEmpty())
-                    json.put(ORG_KEY, JSONObject.NULL);
-                else
-                    json.put(ORG_KEY, org);
-            if (phone != null)
-                if(phone.isEmpty())
-                    json.put(PHONE_KEY, JSONObject.NULL);
-                else
-                    json.put(PHONE_KEY, phone);
-            if (picture != null)
-                if(picture.isEmpty())
-                    json.put(PICTURE_KEY, JSONObject.NULL);
-                else
-                    json.put(PICTURE_KEY, picture);
-            if (gender != null)
-                if(gender.isEmpty())
-                    json.put(GENDER_KEY, JSONObject.NULL);
-                else
-                    json.put(GENDER_KEY, gender);
-            if (byear != 0)
-                if(byear > 0)
-                    json.put(BYEAR_KEY, byear);
-                else
-                    json.put(BYEAR_KEY, JSONObject.NULL);
-            if(custom != null){
-                if(custom.isEmpty())
-                    json.put(CUSTOM_KEY, JSONObject.NULL);
-                else
-                    json.put(CUSTOM_KEY, new JSONObject(custom));
-            }
-        }
-        catch (JSONException e) {
-            if (Seeds.sharedInstance().isLoggingEnabled()) {
-                Log.w(Seeds.TAG, "Got exception converting an UserData to JSON", e);
-            }
-        }
-
-        return json;
-    }
-
-    //for url query parsing
-    public static String getPicturePathFromQuery(URL url){
-        String query = url.getQuery();
-        String[] pairs = query.split("&");
-        String ret = "";
-        if(url.getQuery().contains(PICTURE_PATH_KEY)){
-            for (String pair : pairs) {
-                int idx = pair.indexOf("=");
-                if(pair.substring(0, idx).equals(PICTURE_PATH_KEY)){
-                    try {
-                        ret = URLDecoder.decode(pair.substring(idx + 1), "UTF-8");
-                    } catch (UnsupportedEncodingException e) {
-                        ret = "";
-                    }
-                    break;
-                }
-            }
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ClickType.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ClickType.java
deleted file mode 100755
index e4d1860da..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ClickType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: moved from data sub-package
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public enum ClickType {
-	INAPP, BROWSER;
-
-	public static ClickType getValue(final String value) {
-		for (final ClickType clickType : ClickType.values())
-			if (clickType.name().equalsIgnoreCase(value))
-				return clickType;
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Const.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Const.java
deleted file mode 100755
index 3a73cf9c7..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Const.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: Removed MRAID and video-specific code
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public interface Const {
-
-	public static final String ENCODING = "UTF-8";
-	public static final String RESPONSE_ENCODING = "ISO-8859-1";
-
-	public static final String VERSION = "6.1.0";
-
-	public static final String PROTOCOL_VERSION = "3.0";
-
-	public static final int LIVE = 0;
-	public static final int TEST = 1;
-
-	public static final String IMAGE_BODY = "<body style='\"'margin: 0px; padding: 0px; text-align:center;'\"'><img src='\"'{0}'\"' width='\"'{1}'dp\"' height='\"'{2}'dp\"'/></body>";
-	//	public static final String IMAGE_BODY = "<body style='\"'margin: 0px; padding: 0px; text-align:center;'\"'><div style=\"background-image:{0} width='\"'{1}'dp\"' height='\"'{2}'dp\"'></div></body>";
-	public static final String REDIRECT_URI = "REDIRECT_URI";
-
-	public static final String HIDE_BORDER = "<style>* { -webkit-tap-highlight-color: rgba(0,0,0,0);} img {width:100%;height:100%} body {margin: 0; padding: 0}</style>";
-	public static final String INTERSTITIAL_HIDE_BORDER = "<style>* { -webkit-tap-highlight-color: rgba(0,0,0,0);} body {height:100%; width:100%;} img {max-width:100%; max-height:100%; width:auto; height:auto; position: absolute; margin: auto; top: 0; left: 0; right: 0; bottom: 0;}</style>";
-
-	//	public static final String HIDE_BORDER = "<style>* { -webkit-tap-highlight-color: rgba(0,0,0,0) }</style>";
-
-	public static final int TOUCH_DISTANCE = 30;
-
-/*	public static final long VIDEO_LOAD_TIMEOUT = 1200000;*/
-	public static final int CONNECTION_TIMEOUT = 10000; // = 15 sec
-	public static final int SOCKET_TIMEOUT = 10000; // = 15 sec
-
-	public static final String PREFS_DEVICE_ID = "device_id";
-
-	public static final String USER_AGENT_PATTERN = "Mozilla/5.0 (Linux; U; Android %1$s; %2$s; %3$s Build/%4$s) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
-	public static final String AD_EXTRA = "RICH_AD_DATA";
-	public static final String AD_TYPE_EXTRA = "RICH_AD_TYPE";
-	public static final int MAX_NUMBER_OF_TRACKING_RETRIES = 5;
-
-	public static final String CONNECTION_TYPE_UNKNOWN = "UNKNOWN";
-	public static final String CONNECTION_TYPE_WIFI = "WIFI";
-	public static final String CONNECTION_TYPE_WIMAX = "WIMAX";
-	public static final String CONNECTION_TYPE_MOBILE_UNKNOWN = "MOBILE";
-	public static final String CONNECTION_TYPE_MOBILE_1xRTT = "1xRTT";
-	public static final String CONNECTION_TYPE_MOBILE_CDMA = "CDMA";
-	public static final String CONNECTION_TYPE_MOBILE_EDGE = "EDGE";
-	public static final String CONNECTION_TYPE_MOBILE_EHRPD = "EHRPD";
-	public static final String CONNECTION_TYPE_MOBILE_EVDO_0 = "EVDO_0";
-	public static final String CONNECTION_TYPE_MOBILE_EVDO_A = "EVDO_A";
-	public static final String CONNECTION_TYPE_MOBILE_EVDO_B = "EVDO_B";
-	public static final String CONNECTION_TYPE_MOBILE_GPRS = "GPRS";
-	public static final String CONNECTION_TYPE_MOBILE_HSDPA = "HSDPA";
-	public static final String CONNECTION_TYPE_MOBILE_HSPA = "HSPA";
-	public static final String CONNECTION_TYPE_MOBILE_HSPAP = "HSPAP";
-	public static final String CONNECTION_TYPE_MOBILE_HSUPA = "HSUPA";
-	public static final String CONNECTION_TYPE_MOBILE_IDEN = "IDEN";
-	public static final String CONNECTION_TYPE_MOBILE_LTE = "LTE";
-	public static final String CONNECTION_TYPE_MOBILE_UMTS = "UMTS";
-
-	public static final CharSequence LOADING = "Loading....";
-	public static final long CACHE_DOWNLOAD_PERIOD = 10 * 60 * 1000;
-
-	public final static int AD_FAILED = -1;
-	public final static int IMAGE = 0;
-	public final static int TEXT = 1;
-	public final static int NO_AD = 2;
-
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Gender.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Gender.java
deleted file mode 100755
index f4392403f..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Gender.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public enum Gender {
-	MALE("m"),
-	FEMALE("f");
-	
-	private String param;
-	
-	Gender(String param) {
-		this.param = param;
-	}
-	
-	public String getServerParam() {
-		return this.param;
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/GeneralInAppMessageProvider.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/GeneralInAppMessageProvider.java
deleted file mode 100755
index 8dd845380..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/GeneralInAppMessageProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	removed video, custom event and MRAID-related code
- *					renamed from RequestGeneralAd
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import com.playseeds.android.sdk.Seeds;
-
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-
-
-public class GeneralInAppMessageProvider extends InAppMessageProvider<InAppMessageResponse> {
-
-	public GeneralInAppMessageProvider() {
-	}
-
-	public InAppMessageResponse parseCountlyJSON(final InputStream inputStream,  Map<String, List<String>> headers) throws RequestException {
-
-		Log.i("Starting parseCountlyJSON");
-
-		final InAppMessageResponse response = new InAppMessageResponse();
-		response.setType(Const.TEXT);
-
-		ClickType clickType = ClickType.getValue("inapp");
-		response.setClickType(clickType);
-		response.setRefresh(60);
-		response.setScale(false);
-		response.setSkipPreflight(true);
-
-		try {
-			JsonReader jsonReader = Json.createReader(inputStream);
-			JsonObject jsonObject = jsonReader.readObject();
-			response.setText(jsonObject.getString("htmlString"));
-			JsonValue jsonClickUrl = jsonObject.get("clickurl");
-
-			if (jsonClickUrl != null && !jsonClickUrl.equals(JsonValue.NULL) &&
-					(jsonClickUrl instanceof JsonString)) {
-				response.setClickUrl(((JsonString) jsonClickUrl).getString());
-			} else {
-				response.setSkipOverlay(1);
-			}
-
-			JsonValue jsonProductId = jsonObject.get("productIdAndroid");
-			if (jsonProductId != null && !jsonProductId.equals(JsonValue.NULL) &&
-					(jsonProductId instanceof JsonString)) {
-				response.setProductId(((JsonString) jsonProductId).getString());
-			}
-
-			JsonValue jsonMessageVariant = jsonObject.get("messageVariant");
-			if (jsonMessageVariant != null && !jsonMessageVariant.equals(JsonValue.NULL) &&
-					(jsonMessageVariant instanceof JsonString)) {
-				response.setMessageVariant(((JsonString) jsonMessageVariant).getString());
-			}
-
-			// result of policies such as do not show to paying users
-			if (jsonObject.containsKey("doNotShow")) {
-				boolean doNotShow = jsonObject.getBoolean("doNotShow");
-				InAppMessageManager.sharedInstance().doNotShow(doNotShow);
-			} else {
-				// show it!
-				InAppMessageManager.sharedInstance().doNotShow(false);
-			}
-
-			jsonReader.close();
-
-		} catch (final Throwable t) {
-			Log.e(t.toString());
-			throw new RequestException("Cannot read Response", t);
-		}
-
-		return response;
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessage.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessage.java
deleted file mode 100755
index 24b59b83d..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	renamed from Ad to InAppMessage
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.io.Serializable;
-
-public interface InAppMessage extends Serializable {
-	int getType();
-
-	void setType(int adType);
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageListener.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageListener.java
deleted file mode 100755
index dd1ce22f1..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *     Changes: 	renamed from AdListener
- */
-
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public interface InAppMessageListener {
-	void inAppMessageClicked(String messageId);
-
-    void inAppMessageDismissed(String messageId);
-
-	void inAppMessageLoadSucceeded(String messageId);
-
-	void inAppMessageShown(String messageId, boolean succeeded);
-
-	void noInAppMessageFound(String messageId);
-
-    void inAppMessageClickedWithDynamicPrice(String messageId, Double price);
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageManager.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageManager.java
deleted file mode 100755
index 5df181900..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageManager.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	removed video, MRAID and custom ad-specific code
- *					renamed from AdManager
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import static com.playseeds.android.sdk.inappmessaging.Const.AD_EXTRA;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.location.Location;
-
-import android.os.Bundle;
-import android.os.Handler;
-
-import com.android.vending.billing.IInAppBillingService;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.playseeds.android.sdk.DeviceId;
-import com.playseeds.android.sdk.Seeds;
-
-public class InAppMessageManager {
-	private String mAppKey;
-	private boolean adDoNotTrack;
-	private static Context mContext;
-	private static IInAppBillingService mBillingService;
-	private HashMap<String, Thread> mRequestThreads;
-	private InAppMessageListener mListener;
-	private HashMap<String, InAppMessageResponse> mResponses;
-	private String interstitialRequestURL;
-	private String mDeviceID;
-	private DeviceId.Type mIdMode;
-	private boolean requestedHorizontalAd;
-	private Gender userGender;
-	private int userAge;
-	private List<String> keywords;
-
-	private boolean doNotShow = false;
-	private HashMap<String, InAppMessageRequest> mRequests = null;
-	private static HashMap<Long, InAppMessageManager> sRunningAds = new HashMap<>();
-
-	/**
-	 * Private Constructor
-	 */
-	private InAppMessageManager() {
-	}
-
-	/**
-	 * Returns the InAppMessageManager singleton.
-	 */
-	public static InAppMessageManager sharedInstance() {
-		return SingletonHolder.instance;
-	}
-
-	// see http://stackoverflow.com/questions/7048198/thread-safe-singletons-in-java
-	private static class SingletonHolder {
-		static final InAppMessageManager instance = new InAppMessageManager();
-	}
-
-	public void init(Context context, IInAppBillingService billingService, final String interstitialRequestURL, final String appKey, final String deviceID, final DeviceId.Type idMode) {
-		Util.prepareAndroidAdId(context);
-		InAppMessageManager.setmContext(context);
-		InAppMessageManager.setmBillingService(billingService);
-		this.interstitialRequestURL = interstitialRequestURL;
-		mAppKey = appKey;
-		mDeviceID= deviceID;
-		mIdMode = idMode;
-		mContext = context;
-
-        // Handle smoothly the case where message manager is initialized multiple times
-        // (don't remove already preloaded interstitials or interfere with the ongoing requests)
-		if (mResponses == null) mResponses = new HashMap<>();
-        if (mRequestThreads == null) mRequestThreads = new HashMap<>();
-        if (mRequests == null) mRequests = new HashMap<>();
-	}
-
-	public static void closeRunningInAppMessage(InAppMessageResponse ad) {
-		InAppMessageManager inAppMessageManager = sRunningAds.remove(ad.getTimestamp());
-
-		if (inAppMessageManager == null) {
-			Log.d("Cannot find InAppMessageManager with running ad:" + ad.getTimestamp());
-			return;
-		}
-	}
-
-	public static void notifyInAppMessageClick(InAppMessageResponse ad) {
-		InAppMessageManager inAppMessageManager = sRunningAds.get(ad.getTimestamp());
-		if (inAppMessageManager != null) {
-			inAppMessageManager.notifyAdClicked(ad);
-		}
-	}
-
-	public void requestInAppMessage(String messageId, String manualLocalizedPrice) {
-		requestInAppMessageInternal(messageId, manualLocalizedPrice);
-	}
-
-
-	private void requestInAppMessageInternal(final String messageId, final String manualLocalizedPrice) {
-		if (mRequestThreads.get(messageId) == null) {
-			Log.d("Requesting InAppMessage (v" + Const.VERSION + "-" + Const.PROTOCOL_VERSION + ")");
-			mResponses.remove(messageId);
-			mRequestThreads.put(messageId, getRequestThread(messageId, manualLocalizedPrice));
-			mRequestThreads.get(messageId).setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-
-				@Override
-				public void uncaughtException(Thread thread, Throwable ex) {
-					InAppMessageResponse mResponse = new InAppMessageResponse();
-					mResponse.setType(Const.AD_FAILED);
-					mResponse.setMessageId(messageId);
-					mResponses.put(messageId, mResponse);
-					Log.e("Handling exception in ad request thread", ex);
-					mRequestThreads.remove(messageId);
-				}
-			});
-
-			mRequestThreads.get(messageId).start();
-		} else {
-			Log.w("Request thread already running");
-		}
-	}
-
-	private Thread getRequestThread(final String messageId, final String manualLocalizedPrice) {
-		return new Thread(new Runnable() {
-			@Override
-			public void run() {
-				while (ResourceManager.isDownloading()) {
-					try {
-						Thread.sleep(200);
-					} catch (InterruptedException e) {
-					}
-				}
-				Log.d("starting request thread");
-				try {
-					GeneralInAppMessageProvider requestAd = new GeneralInAppMessageProvider();
-					mRequests.put(messageId, getInterstitialRequest(messageId));
-
-					try {
-						mResponses.put(messageId, requestAd.obtainInAppMessage(mRequests.get(messageId)));
-						mResponses.get(messageId).setMessageId(messageId);
-						mResponses.get(messageId).setManualLocalizedPrice(manualLocalizedPrice);
-					} catch (Exception e) {
-						File cachedInAppMessageFile = new File(mContext.getCacheDir(),
-								URLEncoder.encode(mRequests.get(messageId).countlyUriToString(), "UTF-8"));
-						if (cachedInAppMessageFile.exists()) {
-							BufferedReader cacheReader = new BufferedReader(new FileReader(cachedInAppMessageFile));
-							mResponses.put(messageId, new Gson().fromJson(cacheReader, InAppMessageResponse.class));
-							cacheReader.close();
-						} else {
-							throw e;
-						}
-					}
-
-					if (mResponses.get(messageId).getProductId() != null && (mBillingService != null)) {
-						try {
-							ArrayList<String> productsList = new ArrayList<String>();
-							productsList.add(mResponses.get(messageId).getProductId());
-							Bundle skuBundle = new Bundle();
-							skuBundle.putStringArrayList("ITEM_ID_LIST", productsList);
-
-							Bundle productsDetails;
-
-							productsDetails = mBillingService.getSkuDetails(3,
-									mContext.getPackageName(), "inapp", skuBundle);
-
-							if (productsDetails.getInt("RESPONSE_CODE", -1) == 0) {
-								ArrayList<String> productsDetailsCollection
-										= productsDetails.getStringArrayList("DETAILS_LIST");
-								Log.i("detailsCollection = " + productsDetailsCollection);
-
-								for (String productDetails : productsDetailsCollection) {
-									JsonObject jsonProductDetails = new JsonParser().parse(productDetails).getAsJsonObject();
-
-									String productId = jsonProductDetails.get("productId").getAsString();
-									if (!mResponses.get(messageId).getProductId().equals(productId))
-										continue;
-
-									String formattedPrice = jsonProductDetails.get("price").getAsString();
-									mResponses.get(messageId).setFormattedPrice(formattedPrice);
-
-									break;
-								}
-							}
-						} catch (Exception e) {
-							Log.e("BillingService", e);
-						}
-					}
-					String text = mResponses.get(messageId).getText();
-					text = text.replace("%{LocalizedPrice}",
-							mResponses.get(messageId).getFormattedPrice() != null
-									? mResponses.get(messageId).getFormattedPrice()
-									: "BUY");
-					mResponses.get(messageId).setText(text);
-
-					//TODO: remove debug code
-					Log.i("mResponse is: " + mResponses.get(messageId));
-
-					if ((mResponses.get(messageId).getType() == Const.TEXT ||
-							mResponses.get(messageId).getType() == Const.IMAGE) &&
-							messageId.equals(mResponses.get(messageId).getMessageId())) {
-
-						notifyAdLoaded(mResponses.get(messageId));
-
-						BufferedWriter cacheWriter = null;
-						try {
-							File cachedInAppMessageFile = new File(mContext.getCacheDir(),
-									URLEncoder.encode(mRequests.get(messageId).countlyUriToString(), "UTF-8"));
-							cacheWriter = new BufferedWriter(new FileWriter(cachedInAppMessageFile));
-							cacheWriter.write(new Gson().toJson(mResponses.get(messageId)));
-						} catch (Exception e) {
-							Log.e("Cache", e);
-						} finally {
-							try {
-								// Close the writer regardless of what happens...
-								cacheWriter.close();
-							} catch (Exception e) {
-							}
-						}
-					} else if (mResponses.get(messageId).getType() == Const.NO_AD) {
-						Log.d("response NO AD received");
-						notifyNoAdFound(messageId);
-					} else {
-						notifyNoAdFound(messageId);
-					}
-				} catch (Throwable t) {
-					Log.e("ad request failed", t);
-
-					mResponses.put(messageId, new InAppMessageResponse());
-					mResponses.get(messageId).setType(Const.AD_FAILED);
-					mResponses.get(messageId).setMessageId(messageId);
-					notifyNoAdFound(messageId);
-				}
-				Log.d("finishing ad request thread");
-				mRequestThreads.remove(messageId);
-			}
-		});
-	}
-
-	public void showInAppMessage(String messageId, String messageContext) {
-		InAppMessageResponse mResponse = mResponses.get(messageId);
-
-		if (((mResponse == null)
-				|| (mResponse.getType() == Const.NO_AD)
-				|| (mResponse.getType() == Const.AD_FAILED))
-				|| doNotShow) {
-			notifyAdShown(mResponse, false);
-			return;
-		}
-
-		if (messageId != null && !messageId.equals(mResponse.getMessageId())) {
-			notifyAdShown(mResponse, false);
-			return;
-		}
-
-		InAppMessageResponse ad = mResponse;
-		boolean result = false;
-		try {
-			ad.setTimestamp(System.currentTimeMillis());
-			ad.setHorizontalOrientationRequested(requestedHorizontalAd);
-			ad.setMessageId(messageId);
-			ad.setMessageContext(messageContext);
-
-			Log.v("Showing InAppMessage:" + ad);
-
-			Intent intent = new Intent(getContext(), RichMediaActivity.class);
-			intent.putExtra(AD_EXTRA, ad);
-			getContext().startActivity(intent);
-
-			result = true;
-			sRunningAds.put(ad.getTimestamp(), this);
-		} catch (Exception e) {
-			Log.e("Unknown exception when showing InAppMessage", e);
-		} finally {
-			notifyAdShown(ad, result);
-		}
-	}
-
-	public boolean isInAppMessageLoaded(String messageId) {
-		InAppMessageResponse mResponse = mResponses.get(messageId);
-
-		if (mResponse == null
-            || (mResponse.getType() == Const.NO_AD)
-            || (mResponse.getType() == Const.AD_FAILED))
-			return false;
-
-		return messageId == null || messageId.equals(mResponse.getMessageId());
-	}
-
-	private void notifyNoAdFound(final String messageId) {
-		if (mListener != null) {
-			Log.d("No ad found " + messageId);
-			sendNotification(new Runnable() {
-				@Override
-				public void run() {
-					mListener.noInAppMessageFound(messageId);
-				}
-			});
-		}
-		this.mResponses.put(messageId, null);
-	}
-
-	private void notifyAdClicked(final InAppMessageResponse ad) {
-		// Here the dynamic inAppMessageClickedWithDynamicPrice
-		String linkUrl = ad.getSeedsLinkUrl();
-
-		if (mListener != null) {
-			if (linkUrl != null && linkUrl.contains("/price/")) {
-				final Double price = Double.parseDouble(linkUrl.substring(linkUrl.lastIndexOf('/') + 1));
-				HashMap<String, String> customSegments = new HashMap<>();
-				customSegments.put("price", price.toString());
-				recordInterstitialEvent("dynamic price clicked", ad, customSegments);
-
-				sendNotification(new Runnable() {
-					@Override
-					public void run() {
-						mListener.inAppMessageClickedWithDynamicPrice(ad.getMessageId(), price);
-					}
-				});
-			} else if (linkUrl != null && linkUrl.contains("/social-share")) {
-				final String shareUrl = "http://playseeds.com/" + linkUrl.substring(linkUrl.lastIndexOf('/') + 1);
-
-				Intent i = new Intent(Intent.ACTION_SEND);
-				i.setType("text/plain");
-				i.putExtra(Intent.EXTRA_TEXT, shareUrl);
-				mContext.startActivity(Intent.createChooser(i, "Share URL"));
-
-				recordInterstitialEvent("social share clicked", ad);
-
-				sendNotification(new Runnable() {
-					@Override
-					public void run() {
-						mListener.inAppMessageClicked(ad.getMessageId());
-					}
-				});
-			} else if (linkUrl != null && linkUrl.contains("show-more")) {
-				recordInterstitialEvent("show more clicked", ad);
-			} else if (linkUrl != null && linkUrl.equals("about:close")) {
-				recordInterstitialEvent("message dismissed", ad);
-				sendNotification(new Runnable() {
-					@Override
-					public void run() {
-						mListener.inAppMessageDismissed(ad.getMessageId());
-					}
-				});
-			} else {
-				recordInterstitialEvent("message clicked", ad);
-				sendNotification(new Runnable() {
-					@Override
-					public void run() {
-						mListener.inAppMessageClicked(ad.getMessageId());
-					}
-				});
-			}
-		}
-	}
-
-	private void notifyAdLoaded(final InAppMessageResponse ad) {
-		if (mListener != null) {
-			sendNotification(new Runnable() {
-				@Override
-				public void run() {
-					mListener.inAppMessageLoadSucceeded(ad.getMessageId());
-				}
-			});
-		}
-	}
-
-	private void notifyAdShown(final InAppMessageResponse ad, final boolean ok) {
-		if (mListener != null) {
-			Log.d("InAppMessage Shown. Result:" + ok);
-			sendNotification(new Runnable() {
-				@Override
-				public void run() {
-					mListener.inAppMessageShown(ad.getMessageId(), ok);
-				}
-			});
-		}
-
-		if (ok) {
-			recordInterstitialEvent("message shown", ad);
-		}
-	}
-
-	private void notifyAdDismiss(final InAppMessageResponse ad, final boolean ok) {
-		if (mListener != null) {
-			Log.d("InAppMessage Close. Result:" + ok);
-			sendNotification(new Runnable() {
-				@Override
-				public void run() {
-					// TODO: Trigger this only when the interstitial is being dismissed
-
-				}
-			});
-		}
-	}
-
-	private InAppMessageRequest getInterstitialRequest(String messageId) {
-		if (this.mRequests.get(messageId) == null) {
-			this.mRequests.put(messageId, new InAppMessageRequest());
-
-			mRequests.get(messageId).setAdDoNotTrack(adDoNotTrack);
-			mRequests.get(messageId).setUserAgent(Util.getDefaultUserAgentString());
-			mRequests.get(messageId).setUserAgent2(Util.buildUserAgent());
-		}
-
-		InAppMessageRequest request = this.mRequests.get(messageId);
-
-		Location location = null;
-
-		// TODO Atte Keinänen 12/8/16
-		// Reduce the count of needed permissions by removing location tracking
-		request.setLatitude(0.0);
-		request.setLongitude(0.0);
-
-		if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-			requestedHorizontalAd = true;
-		} else {
-			requestedHorizontalAd = false;
-		}
-
-		request.setAdspaceStrict(false);
-
-		request.setConnectionType(Util.getConnectionType(getContext()));
-		request.setIpAddress(Util.getLocalIpAddress());
-		request.setTimestamp(System.currentTimeMillis());
-		request.setRequestURL(interstitialRequestURL);
-		request.setOrientation(getOrientation());
-		request.setAppKey(mAppKey);
-		request.setDeviceId(mDeviceID);
-		request.setIdMode(mIdMode);
-		request.setMessageId(messageId);
-		return request;
-	}
-
-	public void showInAppMessage() {
-		InAppMessageResponse mResponse = mResponses.get(null);
-		InAppMessageResponse ad = mResponse;
-
-		boolean result = false;
-
-		if (((mResponse == null)
-				|| (mResponse.getType() == Const.NO_AD)
-				|| (mResponse.getType() == Const.AD_FAILED))
-				|| doNotShow) {
-			notifyAdShown(mResponse, false);
-			return;
-		}
-
-		try {
-			if (Util.isNetworkAvailable(getContext())) {
-				ad.setTimestamp(System.currentTimeMillis());
-				ad.setHorizontalOrientationRequested(requestedHorizontalAd);
-				Log.v("Showing InAppMessage:" + ad);
-
-				Intent intent = new Intent(getContext(), RichMediaActivity.class);
-				intent.putExtra(AD_EXTRA, ad);
-				getContext().startActivity(intent);
-
-				result = true;
-				sRunningAds.put(ad.getTimestamp(), this);
-			} else {
-				Log.d("No network available. Cannot show InAppMessage.");
-			}
-		} catch (Exception e) {
-			Log.e("Unknown exception when showing InAppMessage", e);
-		} finally {
-			notifyAdShown(ad, result);
-		}
-	}
-
-	/**
-	 * This method handles sending notifications to the listeners
-	 */
-	private void sendNotification(Runnable runnable) {
-		// added for testing purposes
-		if (mContext.getPackageName().equals("com.playseeds.android.sdk")) {
-			new Thread(runnable).start();
-		}
-
-		Handler mainHandler = new Handler(mContext.getMainLooper());
-		mainHandler.post(runnable);
-	}
-
-	public void setListener(InAppMessageListener listener) {
-		this.mListener = listener;
-	}
-
-	protected void setRunningAds(HashMap<Long, InAppMessageManager> ads) {
-		sRunningAds = ads;
-	}
-
-	private String getOrientation() {
-		if (requestedHorizontalAd) {
-			return "landscape";
-		} else {
-			return "portrait";
-		}
-	}
-
-	private Context getContext() {
-		return getmContext();
-	}
-
-	private static Context getmContext() {
-		return mContext;
-	}
-
-	private static void setmContext(Context mContext) {
-		InAppMessageManager.mContext = mContext;
-	}
-
-	private static void setmBillingService(IInAppBillingService mBillingService) {
-		InAppMessageManager.mBillingService = mBillingService;
-	}
-
-	public void setUserGender(Gender userGender) {
-		this.userGender = userGender;
-	}
-
-	public void setUserAge(int userAge) {
-		this.userAge = userAge;
-	}
-
-	public void setKeywords(List<String> keywords) {
-		this.keywords = keywords;
-	}
-
-	public void recordInterstitialEvent(String key, InAppMessageResponse ad) {
-		recordInterstitialEvent(key, ad, null);
-	}
-
-	public void recordInterstitialEvent(String key, InAppMessageResponse ad, HashMap<String,String> customSegments) {
-		HashMap<String, String> segmentation = new HashMap<>();
-		segmentation.put("message", ad.getMessageId());
-		if (ad.getMessageContext().length() > 0) segmentation.put("context", ad.getMessageContext());
-		if (ad.getMessageVariant().length() > 0) segmentation.put("variant", ad.getMessageVariant());
-		if (customSegments != null) segmentation.putAll(customSegments);
-
-		Seeds.sharedInstance().recordEvent(key, segmentation, 1);
-	}
-
-	public void doNotShow(boolean doNotShow) {
-		this.doNotShow = doNotShow;
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageProvider.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageProvider.java
deleted file mode 100755
index 1221bda2e..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes:	renamed from RequestAd
- *
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
-public abstract class InAppMessageProvider<T> {
-
-	public T obtainInAppMessage(InAppMessageRequest request) throws RequestException {
-		Log.i("sendCountlyRequest");
-		Log.d("Parse Real");
-
-		String url = request.countlyUriToString();
-		HttpURLConnection urlConnection = null;
-
-		Log.i("InAppMessage RequestPerform HTTP Get Url: " + url);
-
-		try {
-			urlConnection = (HttpURLConnection) new URL(url).openConnection();
-			//urlConnection.setRequestProperty("User-Agent", System.getProperty("http.agent"));
-			InputStream inputStream = new BufferedInputStream(urlConnection.getInputStream());
-			int responseCode = urlConnection.getResponseCode();
-			if (responseCode == HttpURLConnection.HTTP_OK) {
-				return parseCountlyJSON(inputStream, urlConnection.getHeaderFields());
-			} else {
-				throw new RequestException("Server Error. Response code:"
-						+ responseCode);
-			}
-		} catch (Throwable t) {
-			throw new RequestException("Error in HTTP request", t);
-		} finally {
-			if (urlConnection != null)
-				urlConnection.disconnect();
-		}
-	}
-
-	protected abstract T parseCountlyJSON(InputStream inputStream,  Map<String, List<String>> headers) throws RequestException;
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageRequest.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageRequest.java
deleted file mode 100755
index f498ef313..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageRequest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	removed video, MRAID and custom ad-specific code
- *					renamed from AdRequest
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.util.List;
-
-import android.net.Uri;
-import android.os.Build;
-
-import com.playseeds.android.sdk.DeviceId;
-
-public class InAppMessageRequest {
-	private String userAgent;
-	private String userAgent2;
-	private String headers;
-	private String listAds;
-	private String requestURL;
-	private String protocolVersion;
-	private String appKey;
-	private String deviceId;
-	private DeviceId.Type idMode;
-	private String messageId;
-
-	private double longitude = 0.0;
-	private double latitude = 0.0;
-	private boolean adspaceStrict;
-	private int adspaceWidth;
-	private int adspaceHeight;
-	private Gender gender;
-	private int userAge;
-	private List<String> keywords;
-	private String ipAddress;
-	private String connectionType;
-	private long timestamp;
-	private String orientation;
-	private String androidAdId = "";
-	private boolean adDoNotTrack = false;
-	private static final String REQUEST_TYPE_ANDROID = "android_app";
-	// sleep in ms if device_id not loaded yet
-	private static final int DEVICE_ID_MS_DELAY = 500;
-
-	public void setDeviceId(String deviceId) {
-		this.deviceId = deviceId;
-	}
-
-	public void setGender(Gender gender) {
-		this.gender = gender;
-	}
-
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageId) {
-		this.messageId = messageId;
-	}
-
-	public void setUserAge(int userAge) {
-		this.userAge = userAge;
-	}
-
-	public void setKeywords(List<String> keywords) {
-		this.keywords = keywords;
-	}
-
-	public void setIdMode(DeviceId.Type idMode) {
-		this.idMode = idMode;
-	}
-
-	public void setConnectionType(final String connectionType) {
-		this.connectionType = connectionType;
-	}
-
-	public void setAdDoNotTrack(boolean adDoNotTrack) {
-		this.adDoNotTrack = adDoNotTrack;
-	}
-
-	public void setOrientation(String orientation) {
-		this.orientation = orientation;
-	}
-
-	public void setHeaders(final String headers) {
-		this.headers = headers;
-	}
-
-	public void setIpAddress(final String ipAddress) {
-		this.ipAddress = ipAddress;
-	}
-
-	public void setLatitude(final double latitude) {
-		this.latitude = latitude;
-	}
-
-	public void setListAds(final String listAds) {
-		this.listAds = listAds;
-	}
-
-	public void setLongitude(final double longitude) {
-		this.longitude = longitude;
-	}
-
-	public void setProtocolVersion(final String protocolVersion) {
-		this.protocolVersion = protocolVersion;
-	}
-
-	public void setAppKey(final String appKey) {
-		this.appKey = appKey;
-	}
-
-	public void setTimestamp(final long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public void setUserAgent(final String userAgent) {
-		this.userAgent = userAgent;
-	}
-
-	public void setUserAgent2(final String userAgent) {
-		this.userAgent2 = userAgent;
-	}
-
-	public void setRequestURL(String requestURL) {
-		this.requestURL = requestURL;
-	}
-
-	public void setAdspaceStrict(boolean adspaceStrict) {
-		this.adspaceStrict = adspaceStrict;
-	}
-
-	public void setAdspaceWidth(int adspaceWidth) {
-		this.adspaceWidth = adspaceWidth;
-	}
-
-	public void setAdspaceHeight(int adspaceHeight) {
-		this.adspaceHeight = adspaceHeight;
-	}
-
-	public void setAndroidAdId(String androidAdId) {
-		this.androidAdId = androidAdId;
-	}
-
-	public String countlyUriToString() {
-		return this.toCountlyUri().toString();
-	}
-
-	//TODO: make sure "deviceCategory" gets to server code
-	public Uri toCountlyUri() {
-		String countlyURL = requestURL;
-		String path = "/o/messages";
-		final Uri.Builder b = Uri.parse((countlyURL + path)).buildUpon();
-
-		b.appendQueryParameter("app_key", appKey);
-		b.appendQueryParameter("orientation", orientation);
-
-		if (deviceId == null || deviceId.isEmpty()) {
-			deviceId = Util.getAndroidAdId();
-			if (deviceId == null || deviceId.isEmpty()) {
-				try {
-					Thread.sleep(DEVICE_ID_MS_DELAY);
-				} catch (InterruptedException e) {
-					Log.e("Sleep interrupted: " + e);
-				}
-				deviceId = Util.getAndroidAdId();
-			}
-		}
-
-		if (deviceId == null || deviceId.isEmpty()) {
-			Log.e("Device Id could not be set");
-		}
-		b.appendQueryParameter("device_id", deviceId);
-		//b.appendQueryParameter("device_id_type", idMode.toString()); //currently unused
-		if (messageId != null)
-			b.appendQueryParameter("message_id", messageId);
-
-		return b.build();
-	}
-
-	public String getRequestURL() {
-		return requestURL;
-	}
-
-	public boolean isAdspaceStrict() {
-		return adspaceStrict;
-	}
-
-	public int getAdspaceWidth() {
-		return adspaceWidth;
-	}
-
-	public int getAdspaceHeight() {
-		return adspaceHeight;
-	}
-
-	public String getAndroidAdId() {
-		return androidAdId;
-	}
-
-	public Boolean hasAdDoNotTrack() {
-		return adDoNotTrack;
-	}
-
-	public String getOrientation() {
-		return orientation;
-	}
-
-	public DeviceId.Type getIdMode() {
-		return idMode;
-	}
-
-	public String getAndroidVersion() {
-		return Build.VERSION.RELEASE;
-	}
-
-	public String getConnectionType() {
-		return this.connectionType;
-	}
-
-	public String getDeviceMode() {
-		return Build.MODEL;
-	}
-
-	public String getDeviceId() {
-		return deviceId;
-	}
-
-
-	public String getHeaders() {
-		if (this.headers == null)
-			return "";
-		return this.headers;
-	}
-
-	public String getIpAddress() {
-		if (this.ipAddress == null)
-			return "";
-		return this.ipAddress;
-	}
-
-	public double getLatitude() {
-		return this.latitude;
-	}
-
-	public String getListAds() {
-		if (this.listAds != null)
-			return this.listAds;
-		else
-			return "";
-	}
-
-	public double getLongitude() {
-		return this.longitude;
-	}
-
-	public String getProtocolVersion() {
-		if (this.protocolVersion == null)
-			return Const.VERSION;
-		else
-			return this.protocolVersion;
-	}
-
-	public String getAppKey() {
-		if (this.appKey == null)
-			return "";
-		return this.appKey;
-	}
-
-	public String getRequestType() {
-		return InAppMessageRequest.REQUEST_TYPE_ANDROID;
-	}
-
-	public long getTimestamp() {
-		return this.timestamp;
-	}
-
-	public String getUserAgent() {
-		if (this.userAgent == null)
-			return "";
-		return this.userAgent;
-	}
-
-	public String getUserAgent2() {
-		if (this.userAgent2 == null)
-			return "";
-		return this.userAgent2;
-	}
-
-	public Gender getGender() {
-		return this.gender;
-	}
-
-	public int getUserAge() {
-		return this.userAge;
-	}
-
-	public List<String> getKeywords() {
-		return this.keywords;
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageResponse.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageResponse.java
deleted file mode 100755
index e549261c0..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageResponse.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	removed video and custom ad-specific code
- *				 	renamed from AdResponse
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public class  InAppMessageResponse implements InAppMessage {
-	public static final String OTHER = "other";
-	private static final long serialVersionUID = 3271938798582141269L;
-	private int type;
-	private int bannerWidth;
-	private int bannerHeight;
-	private String text;
-	private int skipOverlay = 0;
-	private String imageUrl;
-	private String productId;
-	private String formattedPrice;
-	private String manualLocalizedPrice;
-
-	public String getFormattedPrice() {
-		boolean overrideWithManuallyEnteredPrice = manualLocalizedPrice != null;
-
-		if (overrideWithManuallyEnteredPrice) {
-			return manualLocalizedPrice;
-		} else {
-			return formattedPrice;
-		}
-	}
-
-	public InAppMessageResponse setFormattedPrice(String formattedPrice) {
-		this.formattedPrice = formattedPrice;
-		return this;
-	}
-
-	private ClickType clickType;
-	private String clickUrl;
-	private String urlType;
-	private String seedsLinkUrl;
-	private int refresh;
-	private boolean scale;
-	private boolean skipPreflight;
-	private long timestamp;
-	private boolean horizontalOrientationRequested;
-	private String messageId;
-	private String messageVariant;
-	private String messageContext;
-
-	public String getProductId() {
-		return this.productId;
-	}
-
-	public boolean isScale() {
-		return this.scale;
-	}
-
-	public boolean isSkipPreflight() {
-		return this.skipPreflight;
-	}
-
-	public boolean isHorizontalOrientationRequested() {
-		return horizontalOrientationRequested;
-	}
-
-	public void setBannerHeight(final int bannerHeight) {
-		this.bannerHeight = bannerHeight;
-	}
-
-	public void setBannerWidth(final int bannerWidth) {
-		this.bannerWidth = bannerWidth;
-	}
-
-	public void setClickType(final ClickType clickType) {
-		this.clickType = clickType;
-	}
-
-	public void setClickUrl(final String clickUrl) {
-		this.clickUrl = clickUrl;
-	}
-
-	public void setSeedsLinkUrl(final String seedsLinkUrl) {
-		this.seedsLinkUrl = seedsLinkUrl;
-	}
-
-	public void setProductId(final String productId) {
-		this.productId = productId;
-	}
-
-	public void setImageUrl(final String imageUrl) {
-		this.imageUrl = imageUrl;
-	}
-
-	public void setRefresh(final int refresh) {
-		this.refresh = refresh;
-	}
-
-	public void setScale(final boolean scale) {
-		this.scale = scale;
-	}
-
-	public void setSkipPreflight(final boolean skipPreflight) {
-		this.skipPreflight = skipPreflight;
-	}
-
-	public void setText(final String text) {
-		this.text = text;
-	}
-
-	public void setUrlType(final String urlType) {
-		this.urlType = urlType;
-	}
-
-	@Override
-	public void setType(final int adType) {
-		this.type = adType;
-	}
-
-	public void setSkipOverlay(int skipOverlay) {
-		this.skipOverlay = skipOverlay;
-	}
-
-	public void setTimestamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public void setHorizontalOrientationRequested(boolean horizontalOrientationRequested) {
-		this.horizontalOrientationRequested = horizontalOrientationRequested;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	public int getBannerHeight() {
-		return this.bannerHeight;
-	}
-
-	public int getBannerWidth() {
-		return this.bannerWidth;
-	}
-
-	public ClickType getClickType() {
-		return this.clickType;
-	}
-
-	public String getClickUrl() {
-		return this.clickUrl;
-	}
-
-	public String getSeedsLinkUrl() {
-		return this.seedsLinkUrl;
-	}
-
-	public String getImageUrl() {
-		return this.imageUrl;
-	}
-
-	public int getRefresh() {
-		return this.refresh;
-	}
-
-	public String getText() {
-		return this.text;
-	}
-
-	public String getUrlType() {
-		return this.urlType;
-	}
-
-	@Override
-	public int getType() {
-		return this.type;
-	}
-
-	public String getString() {
-		return "Response [refresh=" + this.refresh + ", type=" + this.type
-				+ ", bannerWidth=" + this.bannerWidth + ", bannerHeight="
-				+ this.bannerHeight + ", text=" + this.text + ", imageUrl="
-				+ this.imageUrl + ", clickType=" + this.clickType
-				+ ", clickUrl=" + this.clickUrl + ", urlType=" + this.urlType
-				+ ", scale=" + this.scale + ", skipPreflight="
-				+ this.skipPreflight + "]";
-	}
-
-	public int getSkipOverlay() {
-		return skipOverlay;
-	}
-
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageIdRequested) {
-		this.messageId = messageIdRequested;
-	}
-
-	public String getMessageVariant() {
-		return messageVariant != null ? messageVariant : "";
-	}
-
-	public void setMessageVariant(String messageVariant) {
-		this.messageVariant = messageVariant;
-	}
-
-	public String getMessageContext() {
-		return messageContext != null ? messageContext : "";
-	}
-
-	public void setMessageContext(String messageContext) {
-		this.messageContext = messageContext;
-	}
-
-
-	public void setManualLocalizedPrice(String manualLocalizedPrice) {
-		this.manualLocalizedPrice = manualLocalizedPrice;
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageView.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageView.java
deleted file mode 100755
index c9b3f85f7..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppMessageView.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: 	moved from banner sub-package
- *					renamed from BannerAdView
- *					removed HttpClient
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.view.MotionEvent;
-import android.view.animation.Animation;
-import android.view.animation.TranslateAnimation;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.RelativeLayout;
-
-@SuppressLint({ "ViewConstructor", "SetJavaScriptEnabled" })
-public class InAppMessageView extends RelativeLayout {
-	private boolean animation;
-	private InAppMessageResponse response;
-	private WebSettings webSettings;
-	private WebView webView;
-	private int width;
-	private int height;
-	private BannerAdViewListener adListener;
-	private static Method mWebView_SetLayerType;
-	private static Field mWebView_LAYER_TYPE_SOFTWARE;
-
-	private boolean wasUserAction = false;
-	private Animation fadeInAnimation = null;
-	private Context mContext = null;
-
-	public InAppMessageView(final Context context, final InAppMessageResponse response, int width, int height, final boolean animation, final BannerAdViewListener adListener) {
-		super(context);
-		mContext = context;
-		this.response = response;
-		this.width = width;
-		this.height = height;
-		this.animation = animation;
-		this.adListener = adListener;
-		this.initialize();
-	}
-
-	private WebView createWebView() {
-		final WebView webView = new WebView(this.getContext()) {
-			@Override
-			public boolean onTouchEvent(MotionEvent event) {
-				wasUserAction = true;
-				return super.onTouchEvent(event);
-			}
-
-			@Override
-			public void draw(final Canvas canvas) {
-				if (this.getWidth() > 0 && this.getHeight() > 0)
-					super.draw(canvas);
-			}
-		};
-
-		this.webSettings = webView.getSettings();
-		this.webSettings.setJavaScriptEnabled(true);
-		webView.setBackgroundColor(Color.TRANSPARENT);
-		setLayer(webView);
-
-		webView.setWebViewClient(new WebViewClient() {
-			@Override
-			public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
-				if (wasUserAction) {
-					if (response.getSkipOverlay() == 1) {
-						doOpenUrl(url);
-						return true;
-					}
-					openLink();
-					return true;
-				}
-				return false;
-			}
-		});
-
-		webView.setVerticalScrollBarEnabled(false);
-		webView.setHorizontalScrollBarEnabled(false);
-
-		return webView;
-	}
-
-	private void doOpenUrl(final String url) {
-		if (this.response.getClickUrl() != null && this.response.getSkipOverlay() == 1) {
-			makeTrackingRequest(this.response.getClickUrl());
-		}
-
-		if (this.response.getClickType() != null && this.response.getClickType().equals(ClickType.INAPP) && (url.startsWith("http://") || url.startsWith("https://"))) {
-			if (url.endsWith(".mp4")) {
-				Intent i = new Intent(Intent.ACTION_VIEW);
-				i.setDataAndType(Uri.parse(url), "video/mp4");
-				startActivity(i);
-			} else {
-				final Intent intent = new Intent(this.getContext(), InAppWebView.class);
-				intent.putExtra(Const.REDIRECT_URI, url);
-				startActivity(intent);
-			}
-		} else {
-			this.response.setSeedsLinkUrl(url);
-			adListener.onClick();
-
-			// TODO Atte Keinänen 9/14
-			// When implementing a more comprehensive interstitial link protocol,
-			// refactor this to a higher abstraction layer
-			final boolean linkClosesInAppMessage =
-					!(url.contains("social-share") || url.contains("show-more")) || url.equals("about:close");
-
-			if (linkClosesInAppMessage) {
-				RichMediaActivity activity = (RichMediaActivity)getContext();
-				activity.close();
-			}
-		}
-	}
-
-	/**
-	 * This method allows the activity to be started from outside an activity
-	 */
-	private void startActivity(Intent i) {
-		if (!(getContext() instanceof Activity)) {
-			i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		}
-
-		try {
-			getContext().startActivity(i);
-		} catch (Exception e) {
-			Log.e("Failed to start activity using " + i.toString(), e);
-			adListener.onError();
-		}
-	}
-
-	private void makeTrackingRequest(final String clickUrl) {
-		AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-			@Override
-			protected Void doInBackground(Void... params) {
-				if (clickUrl.startsWith("market")) { // just to stay safe
-					return null;
-				}
-				HttpURLConnection urlConnection = null;
-				try {
-					urlConnection = (HttpURLConnection) new URL(clickUrl).openConnection();
-					urlConnection.setRequestProperty("User-Agent", System.getProperty("http.agent"));
-					InputStream inputStream = new BufferedInputStream(urlConnection.getInputStream());
-					byte[] data = new byte[16384];
-					while (inputStream.read(data, 0, data.length) != -1);
-				} catch (IOException e) {
-					e.printStackTrace();
-				} finally {
-					if (urlConnection != null)
-						urlConnection.disconnect();
-				}
-				return null;
-			}
-		};
-		task.execute();
-	}
-
-	static {
-		initCompatibility();
-	}
-
-	private static void initCompatibility() {
-		try {
-			for (Method m : WebView.class.getMethods()) {
-				if (m.getName().equals("setLayerType")) {
-					mWebView_SetLayerType = m;
-					break;
-				}
-			}
-
-			Log.v("set layer " + mWebView_SetLayerType);
-			mWebView_LAYER_TYPE_SOFTWARE = WebView.class.getField("LAYER_TYPE_SOFTWARE");
-			Log.v("set1 layer " + mWebView_LAYER_TYPE_SOFTWARE);
-
-		} catch (SecurityException e) {
-			Log.v("SecurityException");
-		} catch (NoSuchFieldException e) {
-			Log.v("NoSuchFieldException");
-		}
-	}
-
-	private static void setLayer(WebView webView) {
-		if (mWebView_SetLayerType != null && mWebView_LAYER_TYPE_SOFTWARE != null) {
-			try {
-				Log.v("Set Layer is supported");
-				mWebView_SetLayerType.invoke(webView, mWebView_LAYER_TYPE_SOFTWARE.getInt(WebView.class), null);
-			} catch (InvocationTargetException ite) {
-				Log.v("Set InvocationTargetException");
-			} catch (IllegalArgumentException e) {
-				Log.v("Set IllegalArgumentException");
-			} catch (IllegalAccessException e) {
-				Log.v("Set IllegalAccessException");
-			}
-		} else {
-			Log.v("Set Layer is not supported");
-		}
-	}
-
-	private void buildBannerView() {
-		this.webView = this.createWebView();
-		Log.d("Create view flipper");
-		if (this.response != null && this.response.getClickUrl() != null) {
-			final float scale = mContext.getResources().getDisplayMetrics().density;
-			if (width > 0 && height > 0) {
-				this.setLayoutParams(new RelativeLayout.LayoutParams((int) (width * scale + 0.5f), (int) (height * scale + 0.5f)));
-			} else {
-				this.setLayoutParams(new RelativeLayout.LayoutParams((int) (300 * scale + 0.5f), (int) (50 * scale + 0.5f)));
-			}
-		} else {
-			this.setLayoutParams(new RelativeLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-		}
-
-		final RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-		this.addView(this.webView, params);
-
-		Log.d("animation: " + this.animation);
-		if (this.animation) {
-			this.fadeInAnimation = new TranslateAnimation(Animation.RELATIVE_TO_PARENT, 0.0f, Animation.RELATIVE_TO_PARENT, 0.0f, Animation.RELATIVE_TO_PARENT, +1.0f, Animation.RELATIVE_TO_PARENT, 0.0f);
-			this.fadeInAnimation.setDuration(1000);
-			this.webView.setAnimation(fadeInAnimation);
-		}
-	}
-
-	private void initialize() {
-		initCompatibility();
-		buildBannerView();
-	}
-
-	private void openLink() {
-		if (this.response != null && this.response.getClickUrl() != null)
-			this.doOpenUrl(this.response.getClickUrl());
-	}
-
-	public void showContent() {
-		try {
-			if (this.response.getType() == Const.IMAGE) {
-
-				String text = MessageFormat.format(Const.IMAGE_BODY, this.response.getImageUrl(), this.response.getBannerWidth(), this.response.getBannerHeight());
-				Log.d("set image: " + text);
-				if (!text.contains("<html>")) {
-					text = "<html><head></head><body style='margin:0;padding:0;'>" + Const.HIDE_BORDER + text + "</body></html>";
-				}
-				webView.getSettings().setDefaultTextEncodingName("utf-8");
-				webView.loadData(text, "text/html; charset=utf-8", Const.ENCODING);
-				adListener.onLoad();
-			} else if (this.response.getType() == Const.TEXT) {
-				String text = this.response.getText();
-				Log.d("set text: " + text);
-				if (!text.contains("<html>")) {
-					text = "<html><head></head><body style='margin:0;padding:0;'>" + Const.HIDE_BORDER + text + "</body></html>";
-				}
-				webView.getSettings().setDefaultTextEncodingName("utf-8");
-				webView.loadData(text, "text/html; charset=utf-8", Const.ENCODING);
-				adListener.onLoad();
-			}
-			if (animation) {
-				webView.startAnimation(fadeInAnimation);
-			}
-		} catch (final Throwable t) {
-			Log.e("Exception in show content", t);
-		}
-	}
-
-	public interface BannerAdViewListener {
-		void onLoad();
-
-		void onClick();
-
-		void onError();
-	}
-
-	/**
-	 * This method is added to enable testing
-	 * See: InAppMessageViewTest
-	 * @return BannerAdViewListener
-     */
-	public BannerAdViewListener getAdListener() {
-		return adListener;
-	}
-
-	/**
-	 * This method is added to enable testing
-	 * See: InAppMessageViewTest
-	 * @return InAppMessageResponse
-	 */
-	public InAppMessageResponse getResponse() {
-		return response;
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppWebView.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppWebView.java
deleted file mode 100755
index f0acc3804..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/InAppWebView.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: moved from banner sub-package
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.Window;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Toast;
-
-public class InAppWebView extends Activity {
-
-	public static final String URL_EXTRA = "extra_url";
-
-	@Override
-	public void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		getWindow().requestFeature(Window.FEATURE_PROGRESS);
-		getWindow().setFeatureInt(Window.FEATURE_PROGRESS, Window.PROGRESS_VISIBILITY_ON);
-
-		final Intent intent = this.getIntent();
-
-		initializeWebView(intent);
-	}
-
-	@SuppressLint("SetJavaScriptEnabled")
-	private void initializeWebView(Intent intent) {
-		WebView webView = new WebView(this);
-		this.setContentView(webView);
-		WebSettings webSettings = webView.getSettings();
-
-		webSettings.setJavaScriptEnabled(true);
-
-		webSettings.setSupportZoom(true);
-		webSettings.setBuiltInZoomControls(true);
-		webSettings.setUseWideViewPort(true);
-		webView.setWebViewClient(new WebViewClient() {
-			@Override
-			public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-				Activity a = (Activity) view.getContext();
-				Toast.makeText(a, "MRAID error: " + description, Toast.LENGTH_SHORT).show();
-			}
-
-			@Override
-			public boolean shouldOverrideUrlLoading(WebView view, String url) {
-				if (url == null)
-					return false;
-
-				Uri uri = Uri.parse(url);
-				String host = uri.getHost();
-
-				if ((url.startsWith("http:") || url.startsWith("https:")) && !"play.google.com".equals(host) && !"market.android.com".equals(host) && !url.endsWith(".apk")) {
-					view.loadUrl(url);
-					return true;
-				}
-
-				try {
-					startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-				} catch (ActivityNotFoundException exception) {
-					Log.w("MoPub: Unable to start activity for " + url + ". " + "Ensure that your phone can handle this intent.");
-				}
-
-				finish();
-				return true;
-			}
-		});
-
-		webView.setWebChromeClient(new WebChromeClient() {
-			public void onProgressChanged(WebView view, int progress) {
-				Activity a = (Activity) view.getContext();
-				a.setTitle("Loading...");
-				a.setProgress(progress * 100);
-				if (progress == 100)
-					a.setTitle(view.getUrl());
-			}
-		});
-		webView.loadUrl(intent.getStringExtra(Const.REDIRECT_URI));
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Log.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Log.java
deleted file mode 100755
index c335201f8..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Log.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: TAG variable value
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public final class Log {
-
-	/*
-	 * Enable logging DEBUG logs on a device: 
-	 * adb shell setprop log.tag.ADSDK DEBUG
-	 */
-
-	public static final String TAG = "Seeds IAM";
-	public static final boolean LOG_AD_RESPONSES = false;
-
-	public static boolean isLoggable(int logLevel) {
-//		return android.util.Log.isLoggable(TAG, logLevel);
-		return true;
-	}
-
-	public static void d(final String msg) {
-		if (isLoggable(android.util.Log.DEBUG)) {
-			android.util.Log.d(TAG, msg);
-		}
-	}
-
-	public static void d(final String msg, final Throwable tr) {
-		if (isLoggable(android.util.Log.DEBUG)) {
-			android.util.Log.d(TAG, msg, tr);
-		}
-	}
-
-	public static void e(final String msg) {
-		if (isLoggable(android.util.Log.ERROR)) {
-			android.util.Log.e(TAG, msg);
-		}
-	}
-
-	public static void e(final String msg, final Throwable tr) {
-		if (isLoggable(android.util.Log.ERROR)) {
-			android.util.Log.w(TAG, msg, tr);
-		}
-	}
-
-	public static void i(final String msg) {
-		if (isLoggable(android.util.Log.INFO)) {
-			android.util.Log.i(TAG, msg);
-		}
-	}
-
-	public static void i(final String msg, final Throwable tr) {
-		if (isLoggable(android.util.Log.INFO)) {
-			android.util.Log.i(TAG, msg, tr);
-		}
-	}
-
-	public static void v(final String msg) {
-		if (isLoggable(android.util.Log.VERBOSE)) {
-			android.util.Log.v(TAG, msg);
-		}
-	}
-
-	public static void v(final String msg, final Throwable tr) {
-		if (isLoggable(android.util.Log.VERBOSE)) {
-			android.util.Log.v(TAG, msg, tr);
-		}
-	}
-
-	public static void w(final String msg) {
-		if (isLoggable(android.util.Log.WARN)) {
-			android.util.Log.w(TAG, msg);
-		}
-	}
-
-	public static void w(final String msg, final Throwable tr) {
-		if (isLoggable(android.util.Log.WARN)) {
-			android.util.Log.w(TAG, msg, tr);
-		}
-	}
-}
\ No newline at end of file
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RequestException.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RequestException.java
deleted file mode 100755
index a48890206..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RequestException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-public class RequestException extends Exception {
-
-	public RequestException() {
-		super();
-	}
-
-	public RequestException(final String detailMessage) {
-		super(detailMessage);
-	}
-
-	public RequestException(final String detailMessage,
-			final Throwable throwable) {
-		super(detailMessage, throwable);
-	}
-
-	public RequestException(final Throwable throwable) {
-		super(throwable);
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ResourceManager.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ResourceManager.java
deleted file mode 100755
index 8007fd2c4..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/ResourceManager.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: moved from video sub-package; removed HttpClient
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-
-import com.playseeds.android.sdk.BuildConfig;
-
-public class ResourceManager {
-	public static final int RESOURCE_LOADED_MSG = 100;
-	public static boolean sDownloading = false;
-	public static boolean sCancel = false;
-	public static final int DEFAULT_TOPBAR_BG_RESOURCE_ID = -1;
-	public static final int DEFAULT_BOTTOMBAR_BG_RESOURCE_ID = -2;
-	public static final int DEFAULT_PLAY_IMAGE_RESOURCE_ID = -11;
-	public static final int DEFAULT_PAUSE_IMAGE_RESOURCE_ID = -12;
-	public static final int DEFAULT_REPLAY_IMAGE_RESOURCE_ID = -13;
-	public static final int DEFAULT_BACK_IMAGE_RESOURCE_ID = -14;
-	public static final int DEFAULT_FORWARD_IMAGE_RESOURCE_ID = -15;
-	public static final int DEFAULT_RELOAD_IMAGE_RESOURCE_ID = -16;
-	public static final int DEFAULT_EXTERNAL_IMAGE_RESOURCE_ID = -17;
-	public static final int DEFAULT_SKIP_IMAGE_RESOURCE_ID = -18;
-	public static final int DEFAULT_CLOSE_BUTTON_NORMAL_RESOURCE_ID = -29;
-	public static final int DEFAULT_CLOSE_BUTTON_PRESSED_RESOURCE_ID = -30;
-	public static final String PLAY_IMAGE_DRAWABLE = "video_play";
-	public static final String PAUSE_IMAGE_DRAWABLE = "video_pause";
-	public static final String REPLAY_IMAGE_DRAWABLE = "video_replay";
-	public static final String BACK_IMAGE_DRAWABLE = "browser_back";
-	public static final String FORWARD_IMAGE_DRAWABLE = "browser_forward";
-	public static final String RELOAD_IMAGE_DRAWABLE = "browser_reload";
-	public static final String EXTERNAL_IMAGE_DRAWABLE = "browser_external";
-	public static final String SKIP_IMAGE_DRAWABLE = "skip";
-	public static final String BAR_IMAGE_DRAWABLE = "bar";
-	public static final String CLOSE_BUTTON_NORMAL_IMAGE_DRAWABLE = "close_button_normal";
-	public static final String CLOSE_BUTTON_PRESSED_IMAGE_DRAWABLE = "close_button_pressed";
-	private static HashMap<Integer, Drawable> sResources = new HashMap<>();
-	private HashMap<Integer, Drawable> mResources = new HashMap<>();
-
-	public ResourceManager() {
-	}
-
-	public void releaseInstance(){
-		Iterator<Entry<Integer, Drawable>> it = mResources.entrySet().iterator();
-		while(it.hasNext()) {
-			Entry<Integer, Drawable> pairsEntry = (Entry<Integer, Drawable>)it.next();
-			it.remove();
-			BitmapDrawable d = (BitmapDrawable) pairsEntry.getValue();
-
-		}
-		assert(mResources.size()==0);
-		System.gc();
-	}
-
-	private static void initDefaultResource(Context ctx, int resource) {
-		switch (resource) {
-		case DEFAULT_PLAY_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_PLAY_IMAGE_RESOURCE_ID, PLAY_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_PAUSE_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_PAUSE_IMAGE_RESOURCE_ID, PAUSE_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_REPLAY_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_REPLAY_IMAGE_RESOURCE_ID, REPLAY_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_BACK_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_BACK_IMAGE_RESOURCE_ID, BACK_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_FORWARD_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_FORWARD_IMAGE_RESOURCE_ID, FORWARD_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_RELOAD_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_RELOAD_IMAGE_RESOURCE_ID, RELOAD_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_EXTERNAL_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_EXTERNAL_IMAGE_RESOURCE_ID, EXTERNAL_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_SKIP_IMAGE_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_SKIP_IMAGE_RESOURCE_ID, SKIP_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_TOPBAR_BG_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_TOPBAR_BG_RESOURCE_ID, BAR_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_BOTTOMBAR_BG_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_BOTTOMBAR_BG_RESOURCE_ID, BAR_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_CLOSE_BUTTON_NORMAL_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_CLOSE_BUTTON_NORMAL_RESOURCE_ID,
-					CLOSE_BUTTON_NORMAL_IMAGE_DRAWABLE);
-			break;
-		case DEFAULT_CLOSE_BUTTON_PRESSED_RESOURCE_ID:
-			registerImageResource(ctx, DEFAULT_CLOSE_BUTTON_PRESSED_RESOURCE_ID,
-					CLOSE_BUTTON_PRESSED_IMAGE_DRAWABLE);
-			break;
-		}
-	}
-
-	private static void registerImageResource(Context ctx, int resId,
-											  String drawableName) {
-		Drawable d = buildDrawable(ctx, drawableName);
-		if (d != null) {
-			sResources.put(resId, d);
-		} else {
-			Log.i("registerImageResource: drawable was null " + drawableName);
-			Log.i("Context was " + ctx);
-		}
-	}
-
-	private static Drawable buildDrawable(Context ctx, String drawableName) {
-		try {
-			int resourceId = ctx.getResources().getIdentifier(drawableName, "drawable",
-					BuildConfig.APPLICATION_ID);
-			if (resourceId == 0) {
-				resourceId = ctx.getResources().getIdentifier(drawableName, "drawable",
-						ctx.getApplicationContext().getPackageName());
-			}
-
-			Bitmap b = BitmapFactory.decodeResource(ctx.getResources(), resourceId);
-			if (b != null) {
-
-				DisplayMetrics m = ctx.getResources().getDisplayMetrics();
-				int w = b.getWidth();
-				int h = b.getHeight();
-				int imageWidth = (int) TypedValue.applyDimension(
-						TypedValue.COMPLEX_UNIT_DIP, w, m);
-				int imageHeight = (int) TypedValue.applyDimension(
-						TypedValue.COMPLEX_UNIT_DIP, h, m);
-				if ((imageWidth != w) || (imageHeight != h)) {
-					b = Bitmap.createScaledBitmap(b, imageWidth, imageHeight,
-							false);
-				}
-				return new BitmapDrawable(ctx.getResources(), b);
-			} else {
-				throw new FileNotFoundException();
-			}
-		} catch (Exception e) {
-			Log.i("ResourceManager cannot find resource " + drawableName);
-		}
-		return null;
-	}
-
-	public static boolean isDownloading() {
-		return sDownloading;
-	}
-
-	public static void cancel() {
-		sCancel = true;
-		sResources.clear();
-	}
-
-	public Drawable getResource(Context ctx, int resourceId) {
-		BitmapDrawable d;
-		d = (BitmapDrawable) mResources.get(resourceId);
-		if(d!=null){
-			return d;
-		}
-		return ResourceManager.getStaticResource(ctx, resourceId);
-	}
-
-	public static Drawable getStaticResource(Context ctx, int resourceId) {
-		BitmapDrawable d = (BitmapDrawable) sResources.get(resourceId);
-		boolean isNull = d == null;
-		if (isNull || d.getBitmap().isRecycled()) {
-
-			initDefaultResource(ctx, resourceId);
-
-			d = (BitmapDrawable) sResources.get(resourceId);
-		}
-		return d;
-	}
-
-	protected HashMap<Integer, Drawable> getsResources() {
-		return sResources;
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RichMediaActivity.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RichMediaActivity.java
deleted file mode 100755
index 7f47803a0..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/RichMediaActivity.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *		Changes: moved from video sub-package, removed video, MRAID and custome event
- *		code
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.lang.ref.WeakReference;
-
-import java.util.TimerTask;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.graphics.Color;
-
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-
-import com.playseeds.android.sdk.inappmessaging.InAppMessageView.BannerAdViewListener;
-
-public class RichMediaActivity extends Activity {
-	private ResourceManager mResourceManager;
-	private FrameLayout mRootLayout;
-	private ImageView mSkipButton;
-	private InAppMessageResponse mAd;
-	private int mType;
-	private boolean mResult;
-
-	int skipButtonSizeLand = 40;
-	int skipButtonSizePort = 40;
-	public static final int TYPE_UNKNOWN = -1;
-	public static final int TYPE_BROWSER = 0;
-	public static final int TYPE_INTERSTITIAL = 2;
-
-	DisplayMetrics metrics;
-
-	static class ResourceHandler extends Handler {
-		WeakReference<RichMediaActivity> richMediaActivity;
-
-		public ResourceHandler(RichMediaActivity activity) {
-			richMediaActivity = new WeakReference<>(activity);
-		}
-
-		@Override
-		public void handleMessage(final Message msg) {
-			RichMediaActivity wRichMediaActivity = richMediaActivity.get();
-			if (wRichMediaActivity != null) {
-				wRichMediaActivity.handleMessage(msg);
-			}
-		}
-	}
-
-	public void handleMessage(final Message msg) {
-		switch (msg.what) {
-			case ResourceManager.RESOURCE_LOADED_MSG:
-				switch (msg.arg1) {
-					case ResourceManager.DEFAULT_SKIP_IMAGE_RESOURCE_ID:
-						if (RichMediaActivity.this.mSkipButton != null) {
-							RichMediaActivity.this.mSkipButton.setImageDrawable(mResourceManager.getResource(this, ResourceManager.DEFAULT_SKIP_IMAGE_RESOURCE_ID));
-						}
-					break;
-				}
-			break;
-		}
-	}
-
-	OnClickListener mOnInterstitialSkipListener = new OnClickListener() {
-		@Override
-		public void onClick(final View v) {
-			Log.v("###########TRACKING SKIP INTERSTITIAL");
-			RichMediaActivity.this.close();
-		}
-	};
-
-
-	@Override
-	public void finish() {
-		super.finish();
-
-		if (this.mAd != null) {
-			Log.d("Finish Activity type:" + this.mType + " ad Type:" + this.mAd.getType());
-			InAppMessageManager.closeRunningInAppMessage(this.mAd);
-		}
-	}
-
-	public void goBack() {
-		switch (this.mType) {
-			case TYPE_INTERSTITIAL:
-				this.mResult = true;
-				this.setResult(Activity.RESULT_OK);
-				this.finish();
-				break;
-			case TYPE_BROWSER:
-				this.finish();
-				break;
-		}
-	}
-
-	private void initInterstitialFromBannerView() {
-		final FrameLayout layout = new FrameLayout(this);
-		if (mAd.getType() == Const.TEXT || mAd.getType() == Const.IMAGE) {
-			final DisplayMetrics displayMetrics = this.getResources().getDisplayMetrics();
-			final float scale = displayMetrics.density;
-
-			int adWidth, adHeight;
-			if (mAd.isHorizontalOrientationRequested()) {
-				adWidth = 1080;
-				adHeight = 720;
-			} else {
-				adWidth = 720;
-				adHeight = 1080;
-			}
-
-			int width = (int)(displayMetrics.widthPixels / displayMetrics.density);
-			int height = (int)(displayMetrics.heightPixels / displayMetrics.density);
-
-			final float adAspectRatio = adWidth / (float) adHeight;
-			if (adAspectRatio >= 1.0f)
-				width = (int)(height * adAspectRatio + 0.5f);
-			else
-				height = (int)(width / adAspectRatio + 0.5f);
-
-			InAppMessageView banner = new InAppMessageView(this, mAd, width, height, false, createLocalAdListener());
-
-			if (mAd != null && mAd.getClickUrl() != null) {
-				banner.setLayoutParams(new FrameLayout.LayoutParams(
-						(int) (width * scale + 0.5f),
-						(int) (height * scale + 0.5f),
-						Gravity.CENTER));
-			} else {
-				banner.setLayoutParams(new FrameLayout.LayoutParams(
-						ViewGroup.LayoutParams.MATCH_PARENT,
-						ViewGroup.LayoutParams.MATCH_PARENT,
-						Gravity.CENTER));
-			}
-			banner.showContent();
-			layout.addView(banner);
-		}
-
-		if (mAd.getClickUrl() != null) {
-			this.mSkipButton = new ImageView(this);
-			this.mSkipButton.setAdjustViewBounds(false);
-
-			int buttonSize;
-			if (mAd.isHorizontalOrientationRequested()) {
-				buttonSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.skipButtonSizeLand, this.getResources().getDisplayMetrics());
-			} else {
-				buttonSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.skipButtonSizePort, this.getResources().getDisplayMetrics());
-			}
-
-			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(buttonSize, buttonSize, Gravity.TOP | Gravity.RIGHT);
-
-			final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8, this.getResources().getDisplayMetrics());
-			params.topMargin = margin;
-			params.rightMargin = margin;
-
-			this.mSkipButton.setImageDrawable(mResourceManager.getResource(this, ResourceManager.DEFAULT_SKIP_IMAGE_RESOURCE_ID));
-
-			this.mSkipButton.setOnClickListener(this.mOnInterstitialSkipListener);
-
-			this.mSkipButton.setVisibility(View.VISIBLE);
-
-			layout.addView(this.mSkipButton, params);
-		}
-
-		this.mRootLayout.addView(layout);
-	}
-
-	private BannerAdViewListener createLocalAdListener() {
-		return new BannerAdViewListener() {
-
-			@Override
-			public void onLoad() {
-			}
-
-			@Override
-			public void onClick() {
-				InAppMessageManager.notifyInAppMessageClick(mAd);
-			}
-
-			@Override
-			public void onError() {
-				finish();
-			}
-		};
-	}
-
-	private void initRootLayout() {
-		this.mRootLayout = new FrameLayout(this);
-		this.mRootLayout.setBackgroundColor(Color.argb(128, 0, 0, 0));
-	}
-
-	@Override
-	public void onConfigurationChanged(final Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
-		Log.d("RichMediaActivity onConfigurationChanged");
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public void onCreate(final Bundle icicle) {
-		super.onCreate(icicle);
-
-		try {
-			final Window win = this.getWindow();
-			final WindowManager wm = (WindowManager) this.getSystemService(Context.WINDOW_SERVICE);
-			final Display display = this.getWindowManager().getDefaultDisplay();
-			int mWindowWidth = display.getWidth();
-			int mWindowHeight = display.getHeight();
-			this.metrics = new DisplayMetrics();
-
-			this.mResult = false;
-			this.setResult(Activity.RESULT_CANCELED);
-			this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-			win.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-			win.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-			wm.getDefaultDisplay().getMetrics(this.metrics);
-			win.clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-
-			Log.d("RichMediaActivity Window Size:(" + mWindowWidth + "," + mWindowHeight + ")");
-/*
-			this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
-*/
-			this.mType = RichMediaActivity.TYPE_UNKNOWN;
-			final Intent intent = this.getIntent();
-			final Bundle extras = intent.getExtras();
-			if (extras == null || extras.getSerializable(Const.AD_EXTRA) == null) {
-				Uri uri = intent.getData();
-				Log.d("uri " + uri);
-
-				if (uri == null) {
-					this.finish();
-					return;
-				}
-
-				this.mType = RichMediaActivity.TYPE_BROWSER;
-			} else {
-				this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-			}
-
-			ResourceHandler mHandler = new ResourceHandler(this);
-			this.mResourceManager = new ResourceManager();
-			this.initRootLayout();
-
-				this.mAd = (InAppMessageResponse) extras.getSerializable(Const.AD_EXTRA);
-
-				this.mType = extras.getInt(Const.AD_TYPE_EXTRA, -1);
-				if (this.mType == -1) {
-					switch (this.mAd.getType()) {
-						case Const.TEXT:
-						case Const.IMAGE:
-							if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.GINGERBREAD) {
-								setOrientationOldApi();
-							} else {
-								setOrientation();
-							}
-							this.mType = TYPE_INTERSTITIAL;
-							break;
-					}
-				}
-			switch (this.mType) {
-				case TYPE_INTERSTITIAL:
-					Log.v("Type interstitial like banner");
-					this.initInterstitialFromBannerView();
-					break;
-			}
-
-			this.setContentView(this.mRootLayout);
-			Log.d("RichMediaActivity onCreate done");
-
-		} catch (Exception e) {
-			// in unlikely case something goes terribly wrong
-			finish();
-		}
-	}
-
-	private void setOrientationOldApi() {
-		if (mAd.isHorizontalOrientationRequested()) {
-			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-		} else {
-			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-		}
-	}
-
-	@TargetApi(Build.VERSION_CODES.GINGERBREAD)
-	private void setOrientation() {
-		if (mAd.isHorizontalOrientationRequested()) {
-			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-		} else {
-			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
-		}
-	}
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-
-		if (mResourceManager != null) {
-			mResourceManager.releaseInstance();
-		}
-	}
-
-	@Override
-	public boolean onKeyDown(final int keyCode, final KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK) {
-			this.goBack();
-			return true;
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-
-	@Override
-	protected void onPause() {
-		super.onPause();
-		Log.d("RichMediaActivity onPause");
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-
-		Log.d("RichMediaActivity onResume");
-		switch (this.mType) {
-			case TYPE_BROWSER:
-			break;
-		}
-	}
-
-	public void close() {
-		mResult = true;
-		setResult(Activity.RESULT_OK);
-		finish();
-	}
-
-	protected void setTypeInterstitial(int type) {
-		mType = type;
-	}
-}
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Util.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Util.java
deleted file mode 100755
index 6649dba84..000000000
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/inappmessaging/Util.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- *		Copyright 2015 MobFox
- *		Licensed under the Apache License, Version 2.0 (the "License");
- *		you may not use this file except in compliance with the License.
- *		You may obtain a copy of the License at
- *
- *		http://www.apache.org/licenses/LICENSE-2.0
- *
- *		Unless required by applicable law or agreed to in writing, software
- *		distributed under the License is distributed on an "AS IS" BASIS,
- *		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *		See the License for the specific language governing permissions and
- *		limitations under the License.
- *
- *
- */
-
-package com.playseeds.android.sdk.inappmessaging;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Locale;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.location.Location;
-import android.location.LocationManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-
-import com.google.android.gms.ads.identifier.AdvertisingIdClient;
-import com.google.android.gms.ads.identifier.AdvertisingIdClient.Info;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
-import com.google.android.gms.common.GooglePlayServicesRepairableException;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-
-public class Util {
-	private static String androidAdId;
-	private static boolean adDoNotTrack = false;
-	private static final float MINIMAL_ACCURACY = 1000;
-	private static final long MINIMAL_TIME_FROM_FIX = 1000 * 60 * 20;
-
-	public static boolean isNetworkAvailable(Context ctx) {
-		int networkStatePermission = ctx.checkCallingOrSelfPermission(Manifest.permission.ACCESS_NETWORK_STATE);
-
-		if (networkStatePermission == PackageManager.PERMISSION_GRANTED) {
-
-			ConnectivityManager mConnectivity = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-			// Skip if no connection, or background data disabled
-			NetworkInfo info = mConnectivity.getActiveNetworkInfo();
-			if (info == null) {
-				return false;
-			}
-			// Only update if WiFi
-			int netType = info.getType();
-			// int netSubtype = info.getSubtype();
-			if ((netType == ConnectivityManager.TYPE_WIFI) || (netType == ConnectivityManager.TYPE_MOBILE)) {
-				return info.isConnected();
-			} else {
-				return false;
-			}
-		} else {
-			return true;
-		}
-	}
-
-	public static String getConnectionType(Context context) {
-		int networkStatePermission = context.checkCallingOrSelfPermission(Manifest.permission.ACCESS_NETWORK_STATE);
-
-		if (networkStatePermission == PackageManager.PERMISSION_GRANTED) {
-			ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-			NetworkInfo info = cm.getActiveNetworkInfo();
-			if (info == null) {
-				return Const.CONNECTION_TYPE_UNKNOWN;
-			}
-			int netType = info.getType();
-			int netSubtype = info.getSubtype();
-			if (netType == ConnectivityManager.TYPE_WIFI) {
-				return Const.CONNECTION_TYPE_WIFI;
-			} else if (netType == 6) {
-				return Const.CONNECTION_TYPE_WIMAX;
-			} else if (netType == ConnectivityManager.TYPE_MOBILE) {
-				switch (netSubtype) {
-				case TelephonyManager.NETWORK_TYPE_1xRTT:
-					return Const.CONNECTION_TYPE_MOBILE_1xRTT;
-				case TelephonyManager.NETWORK_TYPE_CDMA:
-					return Const.CONNECTION_TYPE_MOBILE_CDMA;
-				case TelephonyManager.NETWORK_TYPE_EDGE:
-					return Const.CONNECTION_TYPE_MOBILE_EDGE;
-				case TelephonyManager.NETWORK_TYPE_EVDO_0:
-					return Const.CONNECTION_TYPE_MOBILE_EVDO_0;
-				case TelephonyManager.NETWORK_TYPE_EVDO_A:
-					return Const.CONNECTION_TYPE_MOBILE_EVDO_A;
-				case TelephonyManager.NETWORK_TYPE_GPRS:
-					return Const.CONNECTION_TYPE_MOBILE_GPRS;
-				case TelephonyManager.NETWORK_TYPE_UMTS:
-					return Const.CONNECTION_TYPE_MOBILE_UMTS;
-				case 14:
-					return Const.CONNECTION_TYPE_MOBILE_EHRPD;
-				case 12:
-					return Const.CONNECTION_TYPE_MOBILE_EVDO_B;
-				case 8:
-					return Const.CONNECTION_TYPE_MOBILE_HSDPA;
-				case 10:
-					return Const.CONNECTION_TYPE_MOBILE_HSPA;
-				case 15:
-					return Const.CONNECTION_TYPE_MOBILE_HSPAP;
-				case 9:
-					return Const.CONNECTION_TYPE_MOBILE_HSUPA;
-				case 11:
-					return Const.CONNECTION_TYPE_MOBILE_IDEN;
-				case 13:
-					return Const.CONNECTION_TYPE_MOBILE_LTE;
-				default:
-					return Const.CONNECTION_TYPE_MOBILE_UNKNOWN;
-				}
-			} else {
-				return Const.CONNECTION_TYPE_UNKNOWN;
-			}
-		} else {
-			return Const.CONNECTION_TYPE_UNKNOWN;
-		}
-	}
-
-	public static String getLocalIpAddress() {
-		try {
-			for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
-				NetworkInterface intf = en.nextElement();
-				for (Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
-					InetAddress inetAddress = enumIpAddr.nextElement();
-					if (!inetAddress.isLoopbackAddress()) {
-						return inetAddress.getHostAddress().toString();
-					}
-				}
-			}
-		} catch (SocketException ex) {
-			Log.e(ex.toString());
-		}
-		return null;
-	}
-
-	public static Location getLocation(Context context) {
-		boolean HasFineLocationPermission = false;
-		boolean HasCoarseLocationPermission = false;
-
-		if (context.checkCallingOrSelfPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-			HasFineLocationPermission = true;
-			HasCoarseLocationPermission = true;
-		} else if (context.checkCallingOrSelfPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-			HasCoarseLocationPermission = true;
-		}
-
-		LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-
-		if (locationManager != null && HasFineLocationPermission && locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-			Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-
-			if (location == null) {
-				return null;
-			}
-
-			long timeFromFix = Math.abs(System.currentTimeMillis() - location.getTime());
-			if (location.hasAccuracy() && location.getAccuracy() < MINIMAL_ACCURACY && timeFromFix < MINIMAL_TIME_FROM_FIX) {
-				return location;
-			}
-		}
-		if (locationManager != null && HasCoarseLocationPermission && locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
-			Location location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
-
-			if (location == null) {
-				return null;
-			}
-			long timeFromFix = Math.abs(System.currentTimeMillis() - location.getTime());
-			if (location.hasAccuracy() && location.getAccuracy() < MINIMAL_ACCURACY && timeFromFix < MINIMAL_TIME_FROM_FIX) {
-				return location;
-			}
-		}
-		return null;
-	}
-
-	public static String getDefaultUserAgentString() {
-		String userAgent = System.getProperty("http.agent");
-		return userAgent;
-	}
-
-	@SuppressLint("DefaultLocale")
-	public static String buildUserAgent() {
-		String androidVersion = Build.VERSION.RELEASE;
-		String model = Build.MODEL;
-		String androidBuild = Build.ID;
-		final Locale l = Locale.getDefault();
-		final String language = l.getLanguage();
-		String locale = "en";
-		if (language != null) {
-			locale = language.toLowerCase();
-			final String country = l.getCountry();
-			if (country != null) {
-				locale += "-" + country.toLowerCase();
-			}
-		}
-
-		String userAgent = String.format(Const.USER_AGENT_PATTERN, androidVersion, locale, model, androidBuild);
-		return userAgent;
-	}
-
-	public static int getMemoryClass(Context context) {
-		try {
-			Method getMemoryClassMethod = ActivityManager.class.getMethod("getMemoryClass");
-			ActivityManager ac = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-			return (Integer) getMemoryClassMethod.invoke(ac, new Object[] {});
-		} catch (Exception ex) {
-			return 16;
-		}
-	}
-
-	public static void prepareAndroidAdId(final Context context) {
-		if (androidAdId == null && GooglePlayServicesUtil.isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
-			Log.d("GooglePlayServices connected");
-			AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-
-				@Override
-				protected Void doInBackground(Void... params) {
-					Info adInfo = null;
-					try {
-						adInfo = AdvertisingIdClient.getAdvertisingIdInfo(context);
-						Log.d("adInfo " + adInfo);
-						androidAdId = adInfo.getId();
-						Log.d("adId " + androidAdId);
-						adDoNotTrack = adInfo.isLimitAdTrackingEnabled();
-					} catch (IOException e) {
-						e.printStackTrace();
-					} catch (GooglePlayServicesNotAvailableException e) {
-						e.printStackTrace();
-					} catch (IllegalStateException e) {
-						e.printStackTrace();
-					} catch (GooglePlayServicesRepairableException e) {
-						e.printStackTrace();
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-					return null;
-				}
-
-			};
-			task.execute();
-		}
-	}
-
-	public static String getAndroidAdId() {
-		if (androidAdId == null) {
-			return "";
-		}
-		return androidAdId;
-	}
-
-	public static Bitmap loadBitmap (String url) {
-		Bitmap bitmap = null;
-		try {
-			InputStream in = new URL(url).openStream();
-			bitmap = BitmapFactory.decodeStream(in);
-		} catch (Throwable t) { //to catch also out of memory error when decoding bitmap.
-			bitmap = null;
-			Log.e("Decoding bitmap failed!");
-		}
-		
-		return bitmap;
-	}
-}
diff --git a/seeds-sdk/src/main/java/org/openudid/OpenUDID_manager.java b/seeds-sdk/src/main/java/org/openudid/OpenUDID_manager.java
deleted file mode 100755
index ed8289e52..000000000
--- a/seeds-sdk/src/main/java/org/openudid/OpenUDID_manager.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.openudid;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.provider.Settings.Secure;
-import android.util.Log;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.TreeMap;
-
-
-public class OpenUDID_manager implements ServiceConnection{
-	public final static String PREF_KEY = "openudid";
-	public final static String PREFS_NAME = "openudid_prefs";
-	public final static String TAG = "OpenUDID";
-	
-	private final static boolean LOG = true; //Display or not debug message
-
-	private final Context mContext; //Application context
-	private List<ResolveInfo> mMatchingIntents; //List of available OpenUDID Intents
-	private Map<String, Integer> mReceivedOpenUDIDs; //Map of OpenUDIDs found so far
-
-	private final SharedPreferences mPreferences; //Preferences to store the OpenUDID
-	private final Random mRandom;
-	
-	private OpenUDID_manager(Context context) {
-		mPreferences =  context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-		mContext = context;
-		mRandom = new Random();
-		mReceivedOpenUDIDs = new HashMap<String, Integer>();
-	}
-	
-	@Override
-  	public void onServiceConnected(ComponentName className, IBinder service) {
-		//Get the OpenUDID from the remote service
-		try {
-			//Send a random number to the service
-			android.os.Parcel data = android.os.Parcel.obtain(); 
-			data.writeInt(mRandom.nextInt());
-			android.os.Parcel reply = android.os.Parcel.obtain(); 
-			service.transact(1, android.os.Parcel.obtain(), reply, 0);
-			if (data.readInt() == reply.readInt()) //Check if the service returns us this number
-			{
-				final String _openUDID = reply.readString();
-				if (_openUDID != null) { //if valid OpenUDID, save it
-					if (LOG) Log.d(TAG, "Received " + _openUDID);
-
-					if (mReceivedOpenUDIDs.containsKey(_openUDID)) mReceivedOpenUDIDs.put(_openUDID, mReceivedOpenUDIDs.get(_openUDID) + 1);
-					else mReceivedOpenUDIDs.put(_openUDID, 1);
-						
-				}
-			}
-		} catch (RemoteException e) {if (LOG) Log.e(TAG, "RemoteException: " + e.getMessage());}		    	    			
-		mContext.unbindService(this);
-		
-		startService(); //Try the next one
-  	}
-	
-	@Override
-	public void onServiceDisconnected(ComponentName className) {}
-	
-	private void storeOpenUDID() {
-    	final Editor e = mPreferences.edit();
-		e.putString(PREF_KEY, OpenUDID);
-		e.commit();
-	}
-	
-	/*
-	 * Generate a new OpenUDID
-	 */
-	private void generateOpenUDID() {
-		if (LOG) Log.d(TAG, "Generating openUDID");
-		//Try to get the ANDROID_ID
-		OpenUDID = Secure.getString(mContext.getContentResolver(), Secure.ANDROID_ID); 
-		if (OpenUDID == null || OpenUDID.equals("9774d56d682e549c") || OpenUDID.length() < 15 ) {
-			//if ANDROID_ID is null, or it's equals to the GalaxyTab generic ANDROID_ID or bad, generates a new one
-			final SecureRandom random = new SecureRandom();
-			OpenUDID = new BigInteger(64, random).toString(16);
-		}
-    }
-	
-	
-	/*
-	 * Start the oldest service
-	 */
-	private void startService() {
-		if (mMatchingIntents.size() > 0) { //There are some Intents untested
-			if (LOG) Log.d(TAG, "Trying service " + mMatchingIntents.get(0).loadLabel(mContext.getPackageManager()));
-		
-			final ServiceInfo servInfo = mMatchingIntents.get(0).serviceInfo;
-            final Intent i = new Intent();
-            i.setComponent(new ComponentName(servInfo.applicationInfo.packageName, servInfo.name));
-            mMatchingIntents.remove(0);
-            try	{	// try added by Lionscribe
-            	mContext.bindService(i, this,  Context.BIND_AUTO_CREATE);
-            }
-            catch (SecurityException e) {
-                startService();	// ignore this one, and start next one
-            }
-		} else { //No more service to ly.count.android.sdk.test
-			
-			getMostFrequentOpenUDID(); //Choose the most frequent
-	
-			if (OpenUDID == null) //No OpenUDID was chosen, generate one			
-				generateOpenUDID();
-			if (LOG) Log.d(TAG, "OpenUDID: " + OpenUDID);
-
-			storeOpenUDID();//Store it locally
-			mInitialized = true;
-		}
-	}
-	
-	private void getMostFrequentOpenUDID() {
-		if (mReceivedOpenUDIDs.isEmpty() == false) {
-			final TreeMap<String,Integer> sorted_OpenUDIDS = new TreeMap(new ValueComparator());
-			sorted_OpenUDIDS.putAll(mReceivedOpenUDIDs);
-        
-			OpenUDID = sorted_OpenUDIDS.firstKey();
-		}
-	}
-	
-	
-	private static String OpenUDID = null;
-	private static boolean mInitialized = false; 
-
-	/**
-	 * The Method to call to get OpenUDID
-	 * @return the OpenUDID
-	 */
-	public static String getOpenUDID() {
-		if (!mInitialized) Log.e("OpenUDID", "Initialisation isn't done");
-		return OpenUDID;
-	}
-	
-	/**
-	 * The Method to call to get OpenUDID
-	 * @return the OpenUDID
-	 */
-	public static boolean isInitialized() {
-		return mInitialized;
-	}
-	
-	/**
-	 * The Method the call at the init of your app
-	 * @param context	you current context
-	 */
-	public static void sync(Context context) {
-		//Initialise the Manager
-		OpenUDID_manager manager = new OpenUDID_manager(context);
-		
-		//Try to get the openudid from local preferences
-		OpenUDID = manager.mPreferences.getString(PREF_KEY, null);
-		if (OpenUDID == null) //Not found
-		{
-			//Get the list of all OpenUDID services available (including itself)
-			manager.mMatchingIntents = context.getPackageManager().queryIntentServices(new Intent("org.OpenUDID.GETUDID"), 0);
-			if (LOG) Log.d(TAG, manager.mMatchingIntents.size() + " services matches OpenUDID");
-			
-			if (manager.mMatchingIntents != null)
-				//Start services one by one
-				manager.startService();
-		
-		} else {//Got it, you can now call getOpenUDID()
-			if (LOG) Log.d(TAG, "OpenUDID: " + OpenUDID);
-			mInitialized = true;
-		}
-	}
-	
-	
-	
-	/*
-	 * Used to sort the OpenUDIDs collected by occurrence
-	 */
-	private class ValueComparator implements Comparator {
-		public int compare(Object a, Object b) {
-
-			if(mReceivedOpenUDIDs.get(a) < mReceivedOpenUDIDs.get(b)) {
-				return 1;
-		    } else if(mReceivedOpenUDIDs.get(a) == mReceivedOpenUDIDs.get(b)) {
-		    	return 0;
-		    } else {
-		    	return -1;
-		    }
-		 }
-	}
-}
diff --git a/seeds-sdk/src/main/java/org/openudid/OpenUDID_service.java b/seeds-sdk/src/main/java/org/openudid/OpenUDID_service.java
deleted file mode 100755
index 53c770f31..000000000
--- a/seeds-sdk/src/main/java/org/openudid/OpenUDID_service.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.openudid;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Binder;
-import android.os.IBinder;
-
-
-/*
- * You have to add this in your manifest
- 
-<service android:name="org.OpenUDID.OpenUDID_service">
-	<intent-filter>
-		<action android:name="org.OpenUDID.GETUDID" />
-	</intent-filter>
-</service>
-
-*/
-
-
-public class OpenUDID_service extends Service{
-	@Override
-	public IBinder onBind(Intent arg0) {
-		return new  Binder() {
-			@Override
-			public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) {
-				final SharedPreferences preferences = getSharedPreferences(OpenUDID_manager.PREFS_NAME, Context.MODE_PRIVATE);
-		
-				reply.writeInt(data.readInt()); //Return to the sender the input random number
-				reply.writeString(preferences.getString(OpenUDID_manager.PREF_KEY, null));
-				return true;
-			}
-		};
-	}
-}
diff --git a/seeds-sdk/src/main/res/drawable/bar.png b/seeds-sdk/src/main/res/drawable/bar.png
deleted file mode 100755
index aafb7af6f..000000000
Binary files a/seeds-sdk/src/main/res/drawable/bar.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/browser_back.png b/seeds-sdk/src/main/res/drawable/browser_back.png
deleted file mode 100755
index 5ef58954b..000000000
Binary files a/seeds-sdk/src/main/res/drawable/browser_back.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/browser_external.png b/seeds-sdk/src/main/res/drawable/browser_external.png
deleted file mode 100755
index 5a0c074f2..000000000
Binary files a/seeds-sdk/src/main/res/drawable/browser_external.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/browser_forward.png b/seeds-sdk/src/main/res/drawable/browser_forward.png
deleted file mode 100755
index 15ef62a27..000000000
Binary files a/seeds-sdk/src/main/res/drawable/browser_forward.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/browser_reload.png b/seeds-sdk/src/main/res/drawable/browser_reload.png
deleted file mode 100755
index b159c757e..000000000
Binary files a/seeds-sdk/src/main/res/drawable/browser_reload.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/close_button_normal.png b/seeds-sdk/src/main/res/drawable/close_button_normal.png
deleted file mode 100755
index 595384f2c..000000000
Binary files a/seeds-sdk/src/main/res/drawable/close_button_normal.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/close_button_pressed.png b/seeds-sdk/src/main/res/drawable/close_button_pressed.png
deleted file mode 100755
index 2669d8795..000000000
Binary files a/seeds-sdk/src/main/res/drawable/close_button_pressed.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/skip.png b/seeds-sdk/src/main/res/drawable/skip.png
deleted file mode 100755
index d58493e4a..000000000
Binary files a/seeds-sdk/src/main/res/drawable/skip.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/video_pause.png b/seeds-sdk/src/main/res/drawable/video_pause.png
deleted file mode 100755
index ac38f65bd..000000000
Binary files a/seeds-sdk/src/main/res/drawable/video_pause.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/video_play.png b/seeds-sdk/src/main/res/drawable/video_play.png
deleted file mode 100755
index 15ef62a27..000000000
Binary files a/seeds-sdk/src/main/res/drawable/video_play.png and /dev/null differ
diff --git a/seeds-sdk/src/main/res/drawable/video_replay.png b/seeds-sdk/src/main/res/drawable/video_replay.png
deleted file mode 100755
index b159c757e..000000000
Binary files a/seeds-sdk/src/main/res/drawable/video_replay.png and /dev/null differ
diff --git a/seeds-sdk/src/test/AndroidManifest.xml b/seeds-sdk/src/test/AndroidManifest.xml
deleted file mode 100644
index 74e6f0d87..000000000
--- a/seeds-sdk/src/test/AndroidManifest.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.playseeds.android.sdk"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="12"
-        android:targetSdkVersion="22" />
-    
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="true" />
-
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="18" />
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-
-    <application>
-        <!-- Include the AdActivity and InAppPurchaseActivity configChanges and themes. -->
-        <activity
-            android:name="com.google.android.gms.ads.AdActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-            android:theme="@android:style/Theme.Translucent" />
-        <activity
-            android:name="com.google.android.gms.ads.purchase.InAppPurchaseActivity"
-            android:theme="@style/Theme.IAPTheme" />
-
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-        <meta-data
-            android:name="com.google.android.gms.wallet.api.enabled"
-            android:value="true" />
-
-        <receiver
-            android:name="com.google.android.gms.wallet.EnableWalletOptimizationReceiver"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="com.google.android.gms.wallet.ENABLE_WALLET_OPTIMIZATION" />
-            </intent-filter>
-        </receiver>
-
-        <!-- MobFox activities declaration -->
-        <activity
-            android:name="com.playseeds.android.sdk.inappmessaging.RichMediaActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-            android:hardwareAccelerated="false" />
-        <activity
-            android:name="com.playseeds.android.sdk.inappmessaging.InAppWebView"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 60df51733..aa64f9dd7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':shared'
-include 'Habitica', ':Habitica', ':seeds-sdk'
\ No newline at end of file
+include 'Habitica', ':Habitica'
\ No newline at end of file
diff --git a/shared/build.gradle b/shared/build.gradle
index 8d01d504e..3b55245a7 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-multiplatform'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
 
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/HLogger.kt
similarity index 98%
rename from shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
rename to shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/HLogger.kt
index 912824958..1026cc353 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/HLogger.kt
@@ -13,7 +13,7 @@ enum class LogLevel {
   ERROR, INFO, DEBUG
 }
 
-class Logger {
+class HLogger {
 
   companion object {
     private val platformLogger = PlatformLogger()