diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts
index 9e9ec042b..bec177368 100644
--- a/Habitica/build.gradle.kts
+++ b/Habitica/build.gradle.kts
@@ -106,6 +106,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
+    hilt {
+        enableAggregatingTask = true
+    }
+
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
@@ -116,8 +120,9 @@ android {
     }
 
     lint {
-        abortOnError = false
-        disable.addAll(listOf("MissingTranslation", "InvalidPackage"))
+        checkReleaseBuilds = false
+        abortOnError = true
+        disable.addAll(listOf("MissingTranslation"))
         enable.addAll(listOf("LogConditional", "IconExpectedSize", "MissingRegistered", "TypographyQuotes"))
     }
 
@@ -157,7 +162,6 @@ dependencies {
 
     // IAP Handling / Verification
     implementation(libs.billing)
-    implementation(libs.viewPagerIndicator) { exclude(group = "com.google.android") }
 
     implementation(libs.coil.compose)
 
diff --git a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png
index 69420d189..5ee9633e6 100644
Binary files a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_art.png b/Habitica/res/drawable-hdpi/adventure_guide_art.png
index 5d070259e..88266a1be 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_art.png and b/Habitica/res/drawable-hdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_left.png b/Habitica/res/drawable-hdpi/adventure_guide_left.png
index d392ca65a..3731cb769 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_left.png and b/Habitica/res/drawable-hdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-hdpi/adventure_guide_right.png b/Habitica/res/drawable-hdpi/adventure_guide_right.png
index 9084277fb..811d5c70b 100644
Binary files a/Habitica/res/drawable-hdpi/adventure_guide_right.png and b/Habitica/res/drawable-hdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_background.png b/Habitica/res/drawable-hdpi/armoire_background.png
index 786e741c9..df363c778 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_background.png and b/Habitica/res/drawable-hdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_circle.png b/Habitica/res/drawable-hdpi/armoire_circle.png
index 1cd176a08..e37234947 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_circle.png and b/Habitica/res/drawable-hdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-hdpi/armoire_experience.png b/Habitica/res/drawable-hdpi/armoire_experience.png
index 0cbc6046b..45731db18 100644
Binary files a/Habitica/res/drawable-hdpi/armoire_experience.png and b/Habitica/res/drawable-hdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-hdpi/assign.png b/Habitica/res/drawable-hdpi/assign.png
index 7350842d7..7cb775b3c 100644
Binary files a/Habitica/res/drawable-hdpi/assign.png and b/Habitica/res/drawable-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_gifts.png b/Habitica/res/drawable-hdpi/birthday_gifts.png
index 107c301b2..45408a694 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_gifts.png and b/Habitica/res/drawable-hdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_header.png b/Habitica/res/drawable-hdpi/birthday_header.png
index b0d7a4fce..8a6d29f23 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_header.png and b/Habitica/res/drawable-hdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_menu_gems.png b/Habitica/res/drawable-hdpi/birthday_menu_gems.png
index 04d168809..cd5b0a2d8 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_menu_gems.png and b/Habitica/res/drawable-hdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_menu_text.png b/Habitica/res/drawable-hdpi/birthday_menu_text.png
index 891d0b5f6..4d32a1d64 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_menu_text.png and b/Habitica/res/drawable-hdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_left.png b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png
index ddb2ccda2..dd170cdbd 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_right.png b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png
index 06dfcfd7b..32c0a850c 100644
Binary files a/Habitica/res/drawable-hdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png
index 3c5f373ce..a1d60a730 100644
Binary files a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-hdpi/checkmark_small.png b/Habitica/res/drawable-hdpi/checkmark_small.png
index c23aec127..b9b621b01 100644
Binary files a/Habitica/res/drawable-hdpi/checkmark_small.png and b/Habitica/res/drawable-hdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-hdpi/contributor_icon.png b/Habitica/res/drawable-hdpi/contributor_icon.png
index a7b6892e7..62973544f 100644
Binary files a/Habitica/res/drawable-hdpi/contributor_icon.png and b/Habitica/res/drawable-hdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png
index 0a7ac2a6b..5df493c36 100644
Binary files a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_background.png b/Habitica/res/drawable-hdpi/customization_background.png
index 898b3976f..4421320fb 100644
Binary files a/Habitica/res/drawable-hdpi/customization_background.png and b/Habitica/res/drawable-hdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-hdpi/customization_mix.png b/Habitica/res/drawable-hdpi/customization_mix.png
index eeaa15008..e22f03ba0 100644
Binary files a/Habitica/res/drawable-hdpi/customization_mix.png and b/Habitica/res/drawable-hdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-hdpi/diamond_button_white.9.png b/Habitica/res/drawable-hdpi/diamond_button_white.9.png
index f9f657f99..ce13f3b4d 100644
Binary files a/Habitica/res/drawable-hdpi/diamond_button_white.9.png and b/Habitica/res/drawable-hdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-hdpi/empty_slot.png b/Habitica/res/drawable-hdpi/empty_slot.png
index 13eec4f21..50dc71363 100644
Binary files a/Habitica/res/drawable-hdpi/empty_slot.png and b/Habitica/res/drawable-hdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_left.png b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png
index 77687431c..6d195f1d0 100644
Binary files a/Habitica/res/drawable-hdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_right.png b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png
index 8339d0c60..e0fd2a396 100644
Binary files a/Habitica/res/drawable-hdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_21.png b/Habitica/res/drawable-hdpi/fall_gems_21.png
index f766d9486..bef48ecf1 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_21.png and b/Habitica/res/drawable-hdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_4.png b/Habitica/res/drawable-hdpi/fall_gems_4.png
index 8c09f0cd5..1891c5c7d 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_4.png and b/Habitica/res/drawable-hdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_42.png b/Habitica/res/drawable-hdpi/fall_gems_42.png
index 7025fcba3..fcc6b0f40 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_42.png and b/Habitica/res/drawable-hdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_84.png b/Habitica/res/drawable-hdpi/fall_gems_84.png
index e5409b7fc..30e9af878 100644
Binary files a/Habitica/res/drawable-hdpi/fall_gems_84.png and b/Habitica/res/drawable-hdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_promo_title.png b/Habitica/res/drawable-hdpi/fall_promo_title.png
index 14bb37c52..5e85626ca 100644
Binary files a/Habitica/res/drawable-hdpi/fall_promo_title.png and b/Habitica/res/drawable-hdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-hdpi/flag_flap.png b/Habitica/res/drawable-hdpi/flag_flap.png
index e67ac259f..2ceefd3e7 100644
Binary files a/Habitica/res/drawable-hdpi/flag_flap.png and b/Habitica/res/drawable-hdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png
index 96f5d9fa3..12959c0d1 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_right.png
index fc31a9285..aac2b88e5 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png
index 8c3b33645..4495d2202 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png
index 917c06821..3a941253a 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_footer.png b/Habitica/res/drawable-hdpi/gem_footer.png
index de0e245d4..85ba6a6ed 100644
Binary files a/Habitica/res/drawable-hdpi/gem_footer.png and b/Habitica/res/drawable-hdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_gold_left.png b/Habitica/res/drawable-hdpi/gem_gold_left.png
index 1ddd560c5..78a2461b9 100644
Binary files a/Habitica/res/drawable-hdpi/gem_gold_left.png and b/Habitica/res/drawable-hdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-hdpi/gem_gold_right.png b/Habitica/res/drawable-hdpi/gem_gold_right.png
index bd25070bc..3f10c01d6 100644
Binary files a/Habitica/res/drawable-hdpi/gem_gold_right.png and b/Habitica/res/drawable-hdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_21.png b/Habitica/res/drawable-hdpi/gems_21.png
index a391879cc..b32d0a122 100644
Binary files a/Habitica/res/drawable-hdpi/gems_21.png and b/Habitica/res/drawable-hdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_4.png b/Habitica/res/drawable-hdpi/gems_4.png
index 15cadf5f9..deb5b8e50 100644
Binary files a/Habitica/res/drawable-hdpi/gems_4.png and b/Habitica/res/drawable-hdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_42.png b/Habitica/res/drawable-hdpi/gems_42.png
index b3ac79b72..dbfb8fe61 100644
Binary files a/Habitica/res/drawable-hdpi/gems_42.png and b/Habitica/res/drawable-hdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/gems_84.png b/Habitica/res/drawable-hdpi/gems_84.png
index cebdba72d..4c3dfdb5e 100644
Binary files a/Habitica/res/drawable-hdpi/gems_84.png and b/Habitica/res/drawable-hdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/gift_sub_gift.png b/Habitica/res/drawable-hdpi/gift_sub_gift.png
index 5cacbeb60..16226de8f 100644
Binary files a/Habitica/res/drawable-hdpi/gift_sub_gift.png and b/Habitica/res/drawable-hdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-hdpi/gift_subscription_bg.png b/Habitica/res/drawable-hdpi/gift_subscription_bg.png
index b55e65035..610fd6a52 100644
Binary files a/Habitica/res/drawable-hdpi/gift_subscription_bg.png and b/Habitica/res/drawable-hdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/gold_coins_left.png b/Habitica/res/drawable-hdpi/gold_coins_left.png
index f1e0e5b91..99d7d073c 100644
Binary files a/Habitica/res/drawable-hdpi/gold_coins_left.png and b/Habitica/res/drawable-hdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-hdpi/gold_coins_right.png b/Habitica/res/drawable-hdpi/gold_coins_right.png
index 733f64877..c8cb53a77 100644
Binary files a/Habitica/res/drawable-hdpi/gold_coins_right.png and b/Habitica/res/drawable-hdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png
index bff338276..6606c71d5 100644
Binary files a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png
index bfccb5195..598139d62 100644
Binary files a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_birthday.png b/Habitica/res/drawable-hdpi/icon_birthday.png
index de0b86208..4cba17f86 100644
Binary files a/Habitica/res/drawable-hdpi/icon_birthday.png and b/Habitica/res/drawable-hdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_boss_health.png b/Habitica/res/drawable-hdpi/icon_boss_health.png
index 8c42c61a5..de71e8e76 100644
Binary files a/Habitica/res/drawable-hdpi/icon_boss_health.png and b/Habitica/res/drawable-hdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_boss_rage.png b/Habitica/res/drawable-hdpi/icon_boss_rage.png
index a0527dec0..c7e0d227c 100644
Binary files a/Habitica/res/drawable-hdpi/icon_boss_rage.png and b/Habitica/res/drawable-hdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_eggs.png b/Habitica/res/drawable-hdpi/icon_eggs.png
index b2fd0cb57..28d622e55 100644
Binary files a/Habitica/res/drawable-hdpi/icon_eggs.png and b/Habitica/res/drawable-hdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_food.png b/Habitica/res/drawable-hdpi/icon_food.png
index d4ad2f7e5..71f8cc10c 100644
Binary files a/Habitica/res/drawable-hdpi/icon_food.png and b/Habitica/res/drawable-hdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_hatchingpotions.png b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png
index cac75518b..38e366bcf 100644
Binary files a/Habitica/res/drawable-hdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_lock.png b/Habitica/res/drawable-hdpi/icon_lock.png
index e83bc8636..3960a21e0 100644
Binary files a/Habitica/res/drawable-hdpi/icon_lock.png and b/Habitica/res/drawable-hdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_messages.png b/Habitica/res/drawable-hdpi/icon_messages.png
index b68875367..517d615db 100644
Binary files a/Habitica/res/drawable-hdpi/icon_messages.png and b/Habitica/res/drawable-hdpi/icon_messages.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_quests.png b/Habitica/res/drawable-hdpi/icon_quests.png
index f8dfab6ab..451891f51 100644
Binary files a/Habitica/res/drawable-hdpi/icon_quests.png and b/Habitica/res/drawable-hdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_shops.png b/Habitica/res/drawable-hdpi/icon_shops.png
index 26cd85f34..0ec7855f8 100644
Binary files a/Habitica/res/drawable-hdpi/icon_shops.png and b/Habitica/res/drawable-hdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_special.png b/Habitica/res/drawable-hdpi/icon_special.png
index 98021f474..877dcf6db 100644
Binary files a/Habitica/res/drawable-hdpi/icon_special.png and b/Habitica/res/drawable-hdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-hdpi/indicator_subscribe.png b/Habitica/res/drawable-hdpi/indicator_subscribe.png
index 9ffc0beee..c6dbe30ef 100644
Binary files a/Habitica/res/drawable-hdpi/indicator_subscribe.png and b/Habitica/res/drawable-hdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-hdpi/limited.png b/Habitica/res/drawable-hdpi/limited.png
index 06a7eb218..a5a53e20c 100644
Binary files a/Habitica/res/drawable-hdpi/limited.png and b/Habitica/res/drawable-hdpi/limited.png differ
diff --git a/Habitica/res/drawable-hdpi/looking_for_party_empty.png b/Habitica/res/drawable-hdpi/looking_for_party_empty.png
index b9acf1933..d27eb88ea 100644
Binary files a/Habitica/res/drawable-hdpi/looking_for_party_empty.png and b/Habitica/res/drawable-hdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-hdpi/npc_gradient.png b/Habitica/res/drawable-hdpi/npc_gradient.png
index 3c6ba82bc..5065b7b89 100644
Binary files a/Habitica/res/drawable-hdpi/npc_gradient.png and b/Habitica/res/drawable-hdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-hdpi/payment_gift.png b/Habitica/res/drawable-hdpi/payment_gift.png
index 2b9716bca..f7d3f4409 100644
Binary files a/Habitica/res/drawable-hdpi/payment_gift.png and b/Habitica/res/drawable-hdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-hdpi/separator_fancy.png b/Habitica/res/drawable-hdpi/separator_fancy.png
index 547a3d4ff..8bfeda35c 100644
Binary files a/Habitica/res/drawable-hdpi/separator_fancy.png and b/Habitica/res/drawable-hdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-hdpi/shop_header_sparkle.png b/Habitica/res/drawable-hdpi/shop_header_sparkle.png
index b2c3dd568..abb593112 100644
Binary files a/Habitica/res/drawable-hdpi/shop_header_sparkle.png and b/Habitica/res/drawable-hdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_21.png b/Habitica/res/drawable-hdpi/spooky_gems_21.png
index 3a17e23c9..1e9d50876 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_21.png and b/Habitica/res/drawable-hdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_4.png b/Habitica/res/drawable-hdpi/spooky_gems_4.png
index 479663474..f89624e31 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_4.png and b/Habitica/res/drawable-hdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_42.png b/Habitica/res/drawable-hdpi/spooky_gems_42.png
index 8434f2cc5..4508d8c9a 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_42.png and b/Habitica/res/drawable-hdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_84.png b/Habitica/res/drawable-hdpi/spooky_gems_84.png
index fc52ff518..6758e065f 100644
Binary files a/Habitica/res/drawable-hdpi/spooky_gems_84.png and b/Habitica/res/drawable-hdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png
index 7610b85a7..fa8003762 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_faint.png b/Habitica/res/drawable-hdpi/sub_benefits_faint.png
index 5bda4304b..a8e75bedb 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_faint.png and b/Habitica/res/drawable-hdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_gems.png b/Habitica/res/drawable-hdpi/sub_benefits_gems.png
index 2fe4ba4a3..3d3922cb2 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_gems.png and b/Habitica/res/drawable-hdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png
index 629b818c8..2f09dc795 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_benefits_pet.png b/Habitica/res/drawable-hdpi/sub_benefits_pet.png
index 7470f53ea..67c765b3f 100644
Binary files a/Habitica/res/drawable-hdpi/sub_benefits_pet.png and b/Habitica/res/drawable-hdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-hdpi/sub_plus.png b/Habitica/res/drawable-hdpi/sub_plus.png
index 6ca472fa0..540d02475 100644
Binary files a/Habitica/res/drawable-hdpi/sub_plus.png and b/Habitica/res/drawable-hdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png
index 516e0f92f..b50bf131d 100644
Binary files a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_bg.png b/Habitica/res/drawable-hdpi/subscription_bg.png
index 8e6b8b427..7890ee227 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_bg.png and b/Habitica/res/drawable-hdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_promo_gold.png b/Habitica/res/drawable-hdpi/subscription_promo_gold.png
index 81f74fe13..e1c3a7bea 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_promo_gold.png and b/Habitica/res/drawable-hdpi/subscription_promo_gold.png differ
diff --git a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png
index af84be92b..d621d0652 100644
Binary files a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-hdpi/survey_art_left.png b/Habitica/res/drawable-hdpi/survey_art_left.png
index 0edf01c36..ab7873687 100644
Binary files a/Habitica/res/drawable-hdpi/survey_art_left.png and b/Habitica/res/drawable-hdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png
index 6f24923b6..725c8026a 100644
Binary files a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-mdpi/adventure_guide_art.png b/Habitica/res/drawable-mdpi/adventure_guide_art.png
index a61511181..9801480e8 100644
Binary files a/Habitica/res/drawable-mdpi/adventure_guide_art.png and b/Habitica/res/drawable-mdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-mdpi/arrow_back.png b/Habitica/res/drawable-mdpi/arrow_back.png
index 5a6ce17d7..ace7c756c 100644
Binary files a/Habitica/res/drawable-mdpi/arrow_back.png and b/Habitica/res/drawable-mdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-mdpi/assign.png b/Habitica/res/drawable-mdpi/assign.png
index 20b6a498e..7e35c5270 100644
Binary files a/Habitica/res/drawable-mdpi/assign.png and b/Habitica/res/drawable-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_gifts.png b/Habitica/res/drawable-mdpi/birthday_gifts.png
index 107c301b2..45408a694 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_gifts.png and b/Habitica/res/drawable-mdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_header.png b/Habitica/res/drawable-mdpi/birthday_header.png
index f0807b1b0..c601763bb 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_header.png and b/Habitica/res/drawable-mdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_menu_gems.png b/Habitica/res/drawable-mdpi/birthday_menu_gems.png
index 2a64b0505..21b3ec611 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_menu_gems.png and b/Habitica/res/drawable-mdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_menu_text.png b/Habitica/res/drawable-mdpi/birthday_menu_text.png
index 5900a3063..95f02527f 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_menu_text.png and b/Habitica/res/drawable-mdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_left.png b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png
index 6375fcd64..fbf01c101 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_right.png b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png
index eaff13566..9acdfd86e 100644
Binary files a/Habitica/res/drawable-mdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-mdpi/checkmark_small.png b/Habitica/res/drawable-mdpi/checkmark_small.png
index 8365cc635..d41f09f15 100644
Binary files a/Habitica/res/drawable-mdpi/checkmark_small.png and b/Habitica/res/drawable-mdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-mdpi/cloud_1.png b/Habitica/res/drawable-mdpi/cloud_1.png
index b67075dc4..361910ab9 100644
Binary files a/Habitica/res/drawable-mdpi/cloud_1.png and b/Habitica/res/drawable-mdpi/cloud_1.png differ
diff --git a/Habitica/res/drawable-mdpi/completed.png b/Habitica/res/drawable-mdpi/completed.png
index 128347272..724283bdf 100644
Binary files a/Habitica/res/drawable-mdpi/completed.png and b/Habitica/res/drawable-mdpi/completed.png differ
diff --git a/Habitica/res/drawable-mdpi/contributor_icon.png b/Habitica/res/drawable-mdpi/contributor_icon.png
index 3c0559b9f..0efaf3b60 100644
Binary files a/Habitica/res/drawable-mdpi/contributor_icon.png and b/Habitica/res/drawable-mdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_background.png b/Habitica/res/drawable-mdpi/customization_background.png
index 5e7dcae61..6d448aef7 100644
Binary files a/Habitica/res/drawable-mdpi/customization_background.png and b/Habitica/res/drawable-mdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-mdpi/customization_mix.png b/Habitica/res/drawable-mdpi/customization_mix.png
index 0dd5aa4cf..43886ca14 100644
Binary files a/Habitica/res/drawable-mdpi/customization_mix.png and b/Habitica/res/drawable-mdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button.9.png b/Habitica/res/drawable-mdpi/diamond_button.9.png
index b1fec171b..738a50f8b 100644
Binary files a/Habitica/res/drawable-mdpi/diamond_button.9.png and b/Habitica/res/drawable-mdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-mdpi/diamond_button_white.9.png b/Habitica/res/drawable-mdpi/diamond_button_white.9.png
index 40a72bd90..b35c9c546 100644
Binary files a/Habitica/res/drawable-mdpi/diamond_button_white.9.png and b/Habitica/res/drawable-mdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-mdpi/empty_slot.png b/Habitica/res/drawable-mdpi/empty_slot.png
index 3dd8e85fc..a28f660ee 100644
Binary files a/Habitica/res/drawable-mdpi/empty_slot.png and b/Habitica/res/drawable-mdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_left.png b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png
index 062a3996c..258fdd537 100644
Binary files a/Habitica/res/drawable-mdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_right.png b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png
index 132499cad..843b5e65d 100644
Binary files a/Habitica/res/drawable-mdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-mdpi/fall_promo_title.png b/Habitica/res/drawable-mdpi/fall_promo_title.png
index d00a79cbb..7fa1484a5 100644
Binary files a/Habitica/res/drawable-mdpi/fall_promo_title.png and b/Habitica/res/drawable-mdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_base.png b/Habitica/res/drawable-mdpi/feed_base.png
index da6110c19..ef8f1f327 100644
Binary files a/Habitica/res/drawable-mdpi/feed_base.png and b/Habitica/res/drawable-mdpi/feed_base.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_blue.png b/Habitica/res/drawable-mdpi/feed_blue.png
index 59450f890..2a29d39e5 100644
Binary files a/Habitica/res/drawable-mdpi/feed_blue.png and b/Habitica/res/drawable-mdpi/feed_blue.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_desert.png b/Habitica/res/drawable-mdpi/feed_desert.png
index 218fcfd4f..512578087 100644
Binary files a/Habitica/res/drawable-mdpi/feed_desert.png and b/Habitica/res/drawable-mdpi/feed_desert.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_golden.png b/Habitica/res/drawable-mdpi/feed_golden.png
index b3d7856be..c0664c25d 100644
Binary files a/Habitica/res/drawable-mdpi/feed_golden.png and b/Habitica/res/drawable-mdpi/feed_golden.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_pink.png b/Habitica/res/drawable-mdpi/feed_pink.png
index 03ed882ce..33ee4c1ef 100644
Binary files a/Habitica/res/drawable-mdpi/feed_pink.png and b/Habitica/res/drawable-mdpi/feed_pink.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_red.png b/Habitica/res/drawable-mdpi/feed_red.png
index 322ca2a3f..2c2be50bf 100644
Binary files a/Habitica/res/drawable-mdpi/feed_red.png and b/Habitica/res/drawable-mdpi/feed_red.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_saddle.png b/Habitica/res/drawable-mdpi/feed_saddle.png
index 687142fb1..fb88f034c 100644
Binary files a/Habitica/res/drawable-mdpi/feed_saddle.png and b/Habitica/res/drawable-mdpi/feed_saddle.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_shade.png b/Habitica/res/drawable-mdpi/feed_shade.png
index c73a90c51..83ebaf29e 100644
Binary files a/Habitica/res/drawable-mdpi/feed_shade.png and b/Habitica/res/drawable-mdpi/feed_shade.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_skeleton.png b/Habitica/res/drawable-mdpi/feed_skeleton.png
index 2906d3b38..2e86b5e33 100644
Binary files a/Habitica/res/drawable-mdpi/feed_skeleton.png and b/Habitica/res/drawable-mdpi/feed_skeleton.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_white.png b/Habitica/res/drawable-mdpi/feed_white.png
index 0465dab6d..98715dff4 100644
Binary files a/Habitica/res/drawable-mdpi/feed_white.png and b/Habitica/res/drawable-mdpi/feed_white.png differ
diff --git a/Habitica/res/drawable-mdpi/feed_zombie.png b/Habitica/res/drawable-mdpi/feed_zombie.png
index 0f21364fb..c51b94e27 100644
Binary files a/Habitica/res/drawable-mdpi/feed_zombie.png and b/Habitica/res/drawable-mdpi/feed_zombie.png differ
diff --git a/Habitica/res/drawable-mdpi/flag_flap.png b/Habitica/res/drawable-mdpi/flag_flap.png
index fbf095f59..44f7e10de 100644
Binary files a/Habitica/res/drawable-mdpi/flag_flap.png and b/Habitica/res/drawable-mdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png
index 31dd195cd..f07035c5f 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png
index a277e90cf..6eb23a082 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_right.png
index 30cf6ebff..2acc53d5d 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png
index f78e0afa4..8652c7be1 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png
index e761fd38f..7d52e7aa2 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png
index 1ed05c97d..c6686e154 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_gold_left.png b/Habitica/res/drawable-mdpi/gem_gold_left.png
index a24dd4b00..c383fd2c9 100644
Binary files a/Habitica/res/drawable-mdpi/gem_gold_left.png and b/Habitica/res/drawable-mdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_gold_right.png b/Habitica/res/drawable-mdpi/gem_gold_right.png
index bb9383d4f..7a9703dc4 100644
Binary files a/Habitica/res/drawable-mdpi/gem_gold_right.png and b/Habitica/res/drawable-mdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png
index 8671dae77..f235e1c69 100644
Binary files a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-mdpi/gift_sub_gift.png b/Habitica/res/drawable-mdpi/gift_sub_gift.png
index 694da1399..633b3bfb8 100644
Binary files a/Habitica/res/drawable-mdpi/gift_sub_gift.png and b/Habitica/res/drawable-mdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-mdpi/gift_subscription_bg.png b/Habitica/res/drawable-mdpi/gift_subscription_bg.png
index ebd0a34ea..9e1e932c5 100644
Binary files a/Habitica/res/drawable-mdpi/gift_subscription_bg.png and b/Habitica/res/drawable-mdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/gold_coins_right.png b/Habitica/res/drawable-mdpi/gold_coins_right.png
index 0ced28cff..5c564ff65 100644
Binary files a/Habitica/res/drawable-mdpi/gold_coins_right.png and b/Habitica/res/drawable-mdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png
index a6ff670ea..ac2a94e28 100644
Binary files a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png
index 292f8099e..58a632589 100644
Binary files a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png
index 6b77b8224..3d9ba7f24 100644
Binary files a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_birthday.png b/Habitica/res/drawable-mdpi/icon_birthday.png
index ca27379e5..03913d802 100644
Binary files a/Habitica/res/drawable-mdpi/icon_birthday.png and b/Habitica/res/drawable-mdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_boss_health.png b/Habitica/res/drawable-mdpi/icon_boss_health.png
index 764c499f8..b8209da5f 100644
Binary files a/Habitica/res/drawable-mdpi/icon_boss_health.png and b/Habitica/res/drawable-mdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_boss_rage.png b/Habitica/res/drawable-mdpi/icon_boss_rage.png
index 9dd9fe767..9f4b1d997 100644
Binary files a/Habitica/res/drawable-mdpi/icon_boss_rage.png and b/Habitica/res/drawable-mdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_eggs.png b/Habitica/res/drawable-mdpi/icon_eggs.png
index 1a3a58ebb..65c40edff 100644
Binary files a/Habitica/res/drawable-mdpi/icon_eggs.png and b/Habitica/res/drawable-mdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_food.png b/Habitica/res/drawable-mdpi/icon_food.png
index cd8b8fc38..a05781a84 100644
Binary files a/Habitica/res/drawable-mdpi/icon_food.png and b/Habitica/res/drawable-mdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_gift_subscription.png b/Habitica/res/drawable-mdpi/icon_gift_subscription.png
index a44156262..b4ddaa45d 100644
Binary files a/Habitica/res/drawable-mdpi/icon_gift_subscription.png and b/Habitica/res/drawable-mdpi/icon_gift_subscription.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_hatchingpotions.png b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png
index 1483a1693..2489e4ff7 100644
Binary files a/Habitica/res/drawable-mdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_lock.png b/Habitica/res/drawable-mdpi/icon_lock.png
index 181b86336..d4d1f926a 100644
Binary files a/Habitica/res/drawable-mdpi/icon_lock.png and b/Habitica/res/drawable-mdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_quests.png b/Habitica/res/drawable-mdpi/icon_quests.png
index 9e18dae9c..3f2c69772 100644
Binary files a/Habitica/res/drawable-mdpi/icon_quests.png and b/Habitica/res/drawable-mdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_shops.png b/Habitica/res/drawable-mdpi/icon_shops.png
index 7ae1882c1..6462cf19c 100644
Binary files a/Habitica/res/drawable-mdpi/icon_shops.png and b/Habitica/res/drawable-mdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_special.png b/Habitica/res/drawable-mdpi/icon_special.png
index 191f7ecdd..73e6d037c 100644
Binary files a/Habitica/res/drawable-mdpi/icon_special.png and b/Habitica/res/drawable-mdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-mdpi/justin_textbox.png b/Habitica/res/drawable-mdpi/justin_textbox.png
index 1142419d4..06785edf9 100644
Binary files a/Habitica/res/drawable-mdpi/justin_textbox.png and b/Habitica/res/drawable-mdpi/justin_textbox.png differ
diff --git a/Habitica/res/drawable-mdpi/limited.png b/Habitica/res/drawable-mdpi/limited.png
index 47bfbef16..ce7223101 100644
Binary files a/Habitica/res/drawable-mdpi/limited.png and b/Habitica/res/drawable-mdpi/limited.png differ
diff --git a/Habitica/res/drawable-mdpi/looking_for_party_empty.png b/Habitica/res/drawable-mdpi/looking_for_party_empty.png
index 4437f521e..9ffddc15d 100644
Binary files a/Habitica/res/drawable-mdpi/looking_for_party_empty.png and b/Habitica/res/drawable-mdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-mdpi/npc_gradient.png b/Habitica/res/drawable-mdpi/npc_gradient.png
index fedf7e5b9..a3caa26ee 100644
Binary files a/Habitica/res/drawable-mdpi/npc_gradient.png and b/Habitica/res/drawable-mdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-mdpi/onboarding_done_art.png b/Habitica/res/drawable-mdpi/onboarding_done_art.png
index 960b76e86..64efa33b0 100644
Binary files a/Habitica/res/drawable-mdpi/onboarding_done_art.png and b/Habitica/res/drawable-mdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-mdpi/payment_gift.png b/Habitica/res/drawable-mdpi/payment_gift.png
index 527420f50..61576352f 100644
Binary files a/Habitica/res/drawable-mdpi/payment_gift.png and b/Habitica/res/drawable-mdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-mdpi/separator_fancy.png b/Habitica/res/drawable-mdpi/separator_fancy.png
index a71f3c720..5d7c9694a 100644
Binary files a/Habitica/res/drawable-mdpi/separator_fancy.png and b/Habitica/res/drawable-mdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-mdpi/shop_header_sparkle.png b/Habitica/res/drawable-mdpi/shop_header_sparkle.png
index ad5159125..74a559ee5 100644
Binary files a/Habitica/res/drawable-mdpi/shop_header_sparkle.png and b/Habitica/res/drawable-mdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png
index 54f2dbef6..e5f542f54 100644
Binary files a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png and b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_april.png b/Habitica/res/drawable-mdpi/stable_tile_april.png
index d5cd1e021..945b7fa9a 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_april.png and b/Habitica/res/drawable-mdpi/stable_tile_april.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_august.png b/Habitica/res/drawable-mdpi/stable_tile_august.png
index 29afec140..719c82dde 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_august.png and b/Habitica/res/drawable-mdpi/stable_tile_august.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_december.png b/Habitica/res/drawable-mdpi/stable_tile_december.png
index cf8678da0..a31d02e71 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_december.png and b/Habitica/res/drawable-mdpi/stable_tile_december.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_february.png b/Habitica/res/drawable-mdpi/stable_tile_february.png
index bfaf85ede..43dd03a1d 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_february.png and b/Habitica/res/drawable-mdpi/stable_tile_february.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_janurary.png b/Habitica/res/drawable-mdpi/stable_tile_janurary.png
index 6a84632c6..0c9d9d8c4 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_janurary.png and b/Habitica/res/drawable-mdpi/stable_tile_janurary.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_july.png b/Habitica/res/drawable-mdpi/stable_tile_july.png
index 371d7e5e4..8031d532e 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_july.png and b/Habitica/res/drawable-mdpi/stable_tile_july.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_june.png b/Habitica/res/drawable-mdpi/stable_tile_june.png
index aaea748e0..fe5bd7df0 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_june.png and b/Habitica/res/drawable-mdpi/stable_tile_june.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_march.png b/Habitica/res/drawable-mdpi/stable_tile_march.png
index 393d6a665..8a9cefd3f 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_march.png and b/Habitica/res/drawable-mdpi/stable_tile_march.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_may.png b/Habitica/res/drawable-mdpi/stable_tile_may.png
index bb017c40b..1567de282 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_may.png and b/Habitica/res/drawable-mdpi/stable_tile_may.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_november.png b/Habitica/res/drawable-mdpi/stable_tile_november.png
index 565958f4e..4c3907d5c 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_november.png and b/Habitica/res/drawable-mdpi/stable_tile_november.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_october.png b/Habitica/res/drawable-mdpi/stable_tile_october.png
index 7841588a5..16f9e512d 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_october.png and b/Habitica/res/drawable-mdpi/stable_tile_october.png differ
diff --git a/Habitica/res/drawable-mdpi/stable_tile_september.png b/Habitica/res/drawable-mdpi/stable_tile_september.png
index e6faa878b..bf7223a36 100644
Binary files a/Habitica/res/drawable-mdpi/stable_tile_september.png and b/Habitica/res/drawable-mdpi/stable_tile_september.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png
index 5a56e6106..48aec1eb2 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_faint.png b/Habitica/res/drawable-mdpi/sub_benefits_faint.png
index b0bbc1569..9276ee4ec 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_faint.png and b/Habitica/res/drawable-mdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_gems.png b/Habitica/res/drawable-mdpi/sub_benefits_gems.png
index 7813ffe13..e66bce05d 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_gems.png and b/Habitica/res/drawable-mdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png
index d1da3835a..b1366d124 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_benefits_pet.png b/Habitica/res/drawable-mdpi/sub_benefits_pet.png
index 544b74a9e..e0338d1b3 100644
Binary files a/Habitica/res/drawable-mdpi/sub_benefits_pet.png and b/Habitica/res/drawable-mdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-mdpi/sub_plus.png b/Habitica/res/drawable-mdpi/sub_plus.png
index d1c1db1b8..c114da48f 100644
Binary files a/Habitica/res/drawable-mdpi/sub_plus.png and b/Habitica/res/drawable-mdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-mdpi/subscription_bg.png b/Habitica/res/drawable-mdpi/subscription_bg.png
index 3cfc3b068..4a85da342 100644
Binary files a/Habitica/res/drawable-mdpi/subscription_bg.png and b/Habitica/res/drawable-mdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/subscription_selected_indicator.png b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png
index 505075158..1f3f8211a 100644
Binary files a/Habitica/res/drawable-mdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-mdpi/survey_art_left.png b/Habitica/res/drawable-mdpi/survey_art_left.png
index 51eb64832..f43b08b69 100644
Binary files a/Habitica/res/drawable-mdpi/survey_art_left.png and b/Habitica/res/drawable-mdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-mdpi/survey_art_right.png b/Habitica/res/drawable-mdpi/survey_art_right.png
index 27325c199..6b6dba896 100644
Binary files a/Habitica/res/drawable-mdpi/survey_art_right.png and b/Habitica/res/drawable-mdpi/survey_art_right.png differ
diff --git a/Habitica/res/drawable-night/indicator_subscribe.png b/Habitica/res/drawable-night/indicator_subscribe.png
index 9ffc0beee..c6dbe30ef 100644
Binary files a/Habitica/res/drawable-night/indicator_subscribe.png and b/Habitica/res/drawable-night/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png
index 6d5b7a686..eb95efb17 100644
Binary files a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_art.png b/Habitica/res/drawable-xhdpi/adventure_guide_art.png
index 9ddd2fbc0..361f59c89 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xhdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_left.png b/Habitica/res/drawable-xhdpi/adventure_guide_left.png
index b4d69cb11..9ce4e9b80 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_left.png and b/Habitica/res/drawable-xhdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_right.png b/Habitica/res/drawable-xhdpi/adventure_guide_right.png
index 7402a88cb..d4ff2dd3d 100644
Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_right.png and b/Habitica/res/drawable-xhdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_background.png b/Habitica/res/drawable-xhdpi/armoire_background.png
index f8b5f68a7..091689efa 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_background.png and b/Habitica/res/drawable-xhdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_circle.png b/Habitica/res/drawable-xhdpi/armoire_circle.png
index 4311171b5..269764a2f 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_circle.png and b/Habitica/res/drawable-xhdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-xhdpi/armoire_experience.png b/Habitica/res/drawable-xhdpi/armoire_experience.png
index 1cc7e208a..bffe1a441 100644
Binary files a/Habitica/res/drawable-xhdpi/armoire_experience.png and b/Habitica/res/drawable-xhdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-xhdpi/arrow_back.png b/Habitica/res/drawable-xhdpi/arrow_back.png
index eb2fd3b18..4ce40a745 100644
Binary files a/Habitica/res/drawable-xhdpi/arrow_back.png and b/Habitica/res/drawable-xhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xhdpi/assign.png b/Habitica/res/drawable-xhdpi/assign.png
index bb10ca5ef..9a3d59f94 100644
Binary files a/Habitica/res/drawable-xhdpi/assign.png and b/Habitica/res/drawable-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_gems.png b/Habitica/res/drawable-xhdpi/birthday_gems.png
index e93642d5e..bab5e9d5f 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_gems.png and b/Habitica/res/drawable-xhdpi/birthday_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_gifts.png b/Habitica/res/drawable-xhdpi/birthday_gifts.png
index d77d67769..3d7a59a7b 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_gifts.png and b/Habitica/res/drawable-xhdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_header.png b/Habitica/res/drawable-xhdpi/birthday_header.png
index 4478f734e..2223a56b5 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_header.png and b/Habitica/res/drawable-xhdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png
index b283b86aa..ee38c98af 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_menu_gems.png and b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_menu_text.png b/Habitica/res/drawable-xhdpi/birthday_menu_text.png
index 4c5915a3b..0edb773c1 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_menu_text.png and b/Habitica/res/drawable-xhdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png
index 63b4af0d9..f748482aa 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png
index a9144b9e2..ce128b69c 100644
Binary files a/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png
index 2e5acc59b..cb4f559f0 100644
Binary files a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xhdpi/checkmark_small.png b/Habitica/res/drawable-xhdpi/checkmark_small.png
index 4545f631f..9efd57c26 100644
Binary files a/Habitica/res/drawable-xhdpi/checkmark_small.png and b/Habitica/res/drawable-xhdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/completed.png b/Habitica/res/drawable-xhdpi/completed.png
index 21bcf2a91..cba883db0 100644
Binary files a/Habitica/res/drawable-xhdpi/completed.png and b/Habitica/res/drawable-xhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_background.png b/Habitica/res/drawable-xhdpi/customization_background.png
index 83c6baf54..41c1edb1e 100644
Binary files a/Habitica/res/drawable-xhdpi/customization_background.png and b/Habitica/res/drawable-xhdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/customization_mix.png b/Habitica/res/drawable-xhdpi/customization_mix.png
index e2f14931d..c33790524 100644
Binary files a/Habitica/res/drawable-xhdpi/customization_mix.png and b/Habitica/res/drawable-xhdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png
index c3564d0e5..266f7afd2 100644
Binary files a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/empty_slot.png b/Habitica/res/drawable-xhdpi/empty_slot.png
index ba14ec0ac..7a1650335 100644
Binary files a/Habitica/res/drawable-xhdpi/empty_slot.png and b/Habitica/res/drawable-xhdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png
index c362404a2..6e66857dc 100644
Binary files a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png and b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png differ
diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png
index 597a47570..3ea778026 100644
Binary files a/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png
index baf951bae..2114ef610 100644
Binary files a/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_21.png b/Habitica/res/drawable-xhdpi/fall_gems_21.png
index 69b81a672..00cdfc5c5 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_21.png and b/Habitica/res/drawable-xhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_4.png b/Habitica/res/drawable-xhdpi/fall_gems_4.png
index cad6e540d..b3cd76304 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_4.png and b/Habitica/res/drawable-xhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_42.png b/Habitica/res/drawable-xhdpi/fall_gems_42.png
index 02f8c8343..859a1caf8 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_42.png and b/Habitica/res/drawable-xhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_84.png b/Habitica/res/drawable-xhdpi/fall_gems_84.png
index 97768873e..375ead94d 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_gems_84.png and b/Habitica/res/drawable-xhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_promo_title.png b/Habitica/res/drawable-xhdpi/fall_promo_title.png
index 20f5b4613..8b9fca1f7 100644
Binary files a/Habitica/res/drawable-xhdpi/fall_promo_title.png and b/Habitica/res/drawable-xhdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-xhdpi/flag_flap.png b/Habitica/res/drawable-xhdpi/flag_flap.png
index 4cdb4a573..7a85c9a77 100644
Binary files a/Habitica/res/drawable-xhdpi/flag_flap.png and b/Habitica/res/drawable-xhdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png
index 252291e5e..a438f2158 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png
index ecd4aa36a..ea86b0b9a 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png
index 1e96e7513..3e50669a8 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png
index 04fa91802..ffcc27521 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png
index 37df461cd..6b89f67b1 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png
index ad9ba537a..6b5c59508 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png
index 46de9ec09..183300bff 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png
index 2eceaffae..1f1e6fd0d 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_footer.png b/Habitica/res/drawable-xhdpi/gem_footer.png
index c74eb76a1..537183b2b 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_footer.png and b/Habitica/res/drawable-xhdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_gold_left.png b/Habitica/res/drawable-xhdpi/gem_gold_left.png
index cb8a9643b..3f7cea2e0 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_gold_left.png and b/Habitica/res/drawable-xhdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_gold_right.png b/Habitica/res/drawable-xhdpi/gem_gold_right.png
index a992da7ab..3102b9fc8 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_gold_right.png and b/Habitica/res/drawable-xhdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png
index 6b74258d1..309332d96 100644
Binary files a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_21.png b/Habitica/res/drawable-xhdpi/gems_21.png
index 7b847e42e..5162c8d2b 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_21.png and b/Habitica/res/drawable-xhdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_4.png b/Habitica/res/drawable-xhdpi/gems_4.png
index bc3ab9ebc..441e95989 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_4.png and b/Habitica/res/drawable-xhdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_42.png b/Habitica/res/drawable-xhdpi/gems_42.png
index 9d5e031e0..0bf63dc8f 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_42.png and b/Habitica/res/drawable-xhdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/gems_84.png b/Habitica/res/drawable-xhdpi/gems_84.png
index c5d02e5dc..85e52f6e8 100644
Binary files a/Habitica/res/drawable-xhdpi/gems_84.png and b/Habitica/res/drawable-xhdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/gift_sub_gift.png b/Habitica/res/drawable-xhdpi/gift_sub_gift.png
index 9ffb340e5..aef886d3e 100644
Binary files a/Habitica/res/drawable-xhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xhdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-xhdpi/gift_subscription_bg.png b/Habitica/res/drawable-xhdpi/gift_subscription_bg.png
index 1eca3939d..932bc69e1 100644
Binary files a/Habitica/res/drawable-xhdpi/gift_subscription_bg.png and b/Habitica/res/drawable-xhdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/gold_coins_left.png b/Habitica/res/drawable-xhdpi/gold_coins_left.png
index 898a9cb8a..f760f90c9 100644
Binary files a/Habitica/res/drawable-xhdpi/gold_coins_left.png and b/Habitica/res/drawable-xhdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/gold_coins_right.png b/Habitica/res/drawable-xhdpi/gold_coins_right.png
index 830a2b4e7..809e66ca4 100644
Binary files a/Habitica/res/drawable-xhdpi/gold_coins_right.png and b/Habitica/res/drawable-xhdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_minus.png b/Habitica/res/drawable-xhdpi/habit_minus.png
index 98d386e93..8b7d51dd1 100644
Binary files a/Habitica/res/drawable-xhdpi/habit_minus.png and b/Habitica/res/drawable-xhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_plus.png b/Habitica/res/drawable-xhdpi/habit_plus.png
index a8a708fe4..3c80abab8 100644
Binary files a/Habitica/res/drawable-xhdpi/habit_plus.png and b/Habitica/res/drawable-xhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png
index 855b6d3e9..eb64ef1f0 100644
Binary files a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png
index e69459274..4f81c476d 100644
Binary files a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png
index 3e6f53609..694179bd4 100644
Binary files a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png
index 9a8d9d838..20085d861 100644
Binary files a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_birthday.png b/Habitica/res/drawable-xhdpi/icon_birthday.png
index ddaa802bf..0726a0f62 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_birthday.png and b/Habitica/res/drawable-xhdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_boss_health.png b/Habitica/res/drawable-xhdpi/icon_boss_health.png
index bbd8a71a5..60464e286 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_boss_health.png and b/Habitica/res/drawable-xhdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_boss_rage.png b/Habitica/res/drawable-xhdpi/icon_boss_rage.png
index f7662ba11..b895946e6 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_boss_rage.png and b/Habitica/res/drawable-xhdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_eggs.png b/Habitica/res/drawable-xhdpi/icon_eggs.png
index 9eef23c5b..52e4c1f7c 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_eggs.png and b/Habitica/res/drawable-xhdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_food.png b/Habitica/res/drawable-xhdpi/icon_food.png
index 21850ec28..ed896ea5f 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_food.png and b/Habitica/res/drawable-xhdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_gift_gems.png b/Habitica/res/drawable-xhdpi/icon_gift_gems.png
index 072958a4a..fcef42045 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_gift_gems.png and b/Habitica/res/drawable-xhdpi/icon_gift_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png
index 6bf2d0e5c..71f6359e5 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_lock.png b/Habitica/res/drawable-xhdpi/icon_lock.png
index 70e12a938..fc59dc2ea 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_lock.png and b/Habitica/res/drawable-xhdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_quests.png b/Habitica/res/drawable-xhdpi/icon_quests.png
index e09b5fd39..2d9015164 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_quests.png and b/Habitica/res/drawable-xhdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_shops.png b/Habitica/res/drawable-xhdpi/icon_shops.png
index c9cc3e58a..cde0d2805 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_shops.png and b/Habitica/res/drawable-xhdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_special.png b/Habitica/res/drawable-xhdpi/icon_special.png
index 9f4b7f26c..f5b4465b9 100644
Binary files a/Habitica/res/drawable-xhdpi/icon_special.png and b/Habitica/res/drawable-xhdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-xhdpi/indicator_subscribe.png b/Habitica/res/drawable-xhdpi/indicator_subscribe.png
index 84bf95ac7..4ff6d2a5b 100644
Binary files a/Habitica/res/drawable-xhdpi/indicator_subscribe.png and b/Habitica/res/drawable-xhdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xhdpi/limited.png b/Habitica/res/drawable-xhdpi/limited.png
index d1c2a21be..b09af198b 100644
Binary files a/Habitica/res/drawable-xhdpi/limited.png and b/Habitica/res/drawable-xhdpi/limited.png differ
diff --git a/Habitica/res/drawable-xhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png
index 3023e1280..ad66b6f36 100644
Binary files a/Habitica/res/drawable-xhdpi/looking_for_party_empty.png and b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-xhdpi/npc_gradient.png b/Habitica/res/drawable-xhdpi/npc_gradient.png
index 63a6a2096..ef7ee7c7a 100644
Binary files a/Habitica/res/drawable-xhdpi/npc_gradient.png and b/Habitica/res/drawable-xhdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-xhdpi/onboarding_done_art.png b/Habitica/res/drawable-xhdpi/onboarding_done_art.png
index 407a1bdb1..64ebcdc6b 100644
Binary files a/Habitica/res/drawable-xhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xhdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-xhdpi/payment_gift.png b/Habitica/res/drawable-xhdpi/payment_gift.png
index ac4799cd6..b7553901c 100644
Binary files a/Habitica/res/drawable-xhdpi/payment_gift.png and b/Habitica/res/drawable-xhdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-xhdpi/payment_stripe.png b/Habitica/res/drawable-xhdpi/payment_stripe.png
index 4dd9aba31..b2466fb68 100644
Binary files a/Habitica/res/drawable-xhdpi/payment_stripe.png and b/Habitica/res/drawable-xhdpi/payment_stripe.png differ
diff --git a/Habitica/res/drawable-xhdpi/separator_fancy.png b/Habitica/res/drawable-xhdpi/separator_fancy.png
index f35a8ad93..62123c6f2 100644
Binary files a/Habitica/res/drawable-xhdpi/separator_fancy.png and b/Habitica/res/drawable-xhdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-xhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png
index 209842b32..5895aaaf2 100644
Binary files a/Habitica/res/drawable-xhdpi/shop_header_sparkle.png and b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_21.png b/Habitica/res/drawable-xhdpi/spooky_gems_21.png
index c9ff5ba6b..afd201486 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_21.png and b/Habitica/res/drawable-xhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_4.png b/Habitica/res/drawable-xhdpi/spooky_gems_4.png
index 81241006e..897feba0b 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_4.png and b/Habitica/res/drawable-xhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_42.png b/Habitica/res/drawable-xhdpi/spooky_gems_42.png
index 3bce039f5..d6b2d76d3 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_42.png and b/Habitica/res/drawable-xhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_84.png b/Habitica/res/drawable-xhdpi/spooky_gems_84.png
index a8d3a378e..ea3eaf3f2 100644
Binary files a/Habitica/res/drawable-xhdpi/spooky_gems_84.png and b/Habitica/res/drawable-xhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png
index 5ffbd7d57..faeafad19 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png
index c7a785969..2551fe85b 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_faint.png and b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png
index 0f4d127d7..7040a7381 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png
index f81398fef..28a03db9c 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png
index 83b22025c..b9d861e34 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-xhdpi/sub_plus.png b/Habitica/res/drawable-xhdpi/sub_plus.png
index ac5bbf974..c4102f37b 100644
Binary files a/Habitica/res/drawable-xhdpi/sub_plus.png and b/Habitica/res/drawable-xhdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_bg.png b/Habitica/res/drawable-xhdpi/subscription_bg.png
index 23037e347..27c3a2591 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_bg.png and b/Habitica/res/drawable-xhdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png
index 84ed86782..17ae60958 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png and b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png differ
diff --git a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png
index f01900954..e8581e3ea 100644
Binary files a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-xhdpi/survey_art_left.png b/Habitica/res/drawable-xhdpi/survey_art_left.png
index 6555bae8a..eb8a61b4c 100644
Binary files a/Habitica/res/drawable-xhdpi/survey_art_left.png and b/Habitica/res/drawable-xhdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png
index 9a5e6294f..3d2063c2c 100644
Binary files a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png and b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png
index a107821a9..37bdededf 100644
Binary files a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png
index fdeacdcdf..36feb214b 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_left.png b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png
index 802b3a727..b3cb5d6bf 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_left.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_right.png b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png
index 713ed8ff4..a44fadb00 100644
Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_right.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_background.png b/Habitica/res/drawable-xxhdpi/armoire_background.png
index db4955ec8..0632e59f2 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_background.png and b/Habitica/res/drawable-xxhdpi/armoire_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_circle.png b/Habitica/res/drawable-xxhdpi/armoire_circle.png
index c54039f9f..5481fa464 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_circle.png and b/Habitica/res/drawable-xxhdpi/armoire_circle.png differ
diff --git a/Habitica/res/drawable-xxhdpi/armoire_experience.png b/Habitica/res/drawable-xxhdpi/armoire_experience.png
index 5f505e3ac..251d2510e 100644
Binary files a/Habitica/res/drawable-xxhdpi/armoire_experience.png and b/Habitica/res/drawable-xxhdpi/armoire_experience.png differ
diff --git a/Habitica/res/drawable-xxhdpi/arrow_back.png b/Habitica/res/drawable-xxhdpi/arrow_back.png
index 92e71e95d..65f6329df 100644
Binary files a/Habitica/res/drawable-xxhdpi/arrow_back.png and b/Habitica/res/drawable-xxhdpi/arrow_back.png differ
diff --git a/Habitica/res/drawable-xxhdpi/assign.png b/Habitica/res/drawable-xxhdpi/assign.png
index bf0578c8c..493747f39 100644
Binary files a/Habitica/res/drawable-xxhdpi/assign.png and b/Habitica/res/drawable-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_gems.png b/Habitica/res/drawable-xxhdpi/birthday_gems.png
index 875268c4c..ea6ce0a6e 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_gems.png and b/Habitica/res/drawable-xxhdpi/birthday_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_gifts.png b/Habitica/res/drawable-xxhdpi/birthday_gifts.png
index dfe56bf16..ee621360e 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_gifts.png and b/Habitica/res/drawable-xxhdpi/birthday_gifts.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_header.png b/Habitica/res/drawable-xxhdpi/birthday_header.png
index 641778429..3f68fd3f6 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_header.png and b/Habitica/res/drawable-xxhdpi/birthday_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png
index 1dcb0097e..5025ec99a 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png and b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_menu_text.png b/Habitica/res/drawable-xxhdpi/birthday_menu_text.png
index e365e2274..6e078b399 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_menu_text.png and b/Habitica/res/drawable-xxhdpi/birthday_menu_text.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png
index 7e0544f67..5822c6728 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png
index 736fcbab7..f4bda60ff 100644
Binary files a/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png
index 9daee8f9e..24f453fcc 100644
Binary files a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-xxhdpi/checkmark_small.png b/Habitica/res/drawable-xxhdpi/checkmark_small.png
index d35a15dac..061f1a5de 100644
Binary files a/Habitica/res/drawable-xxhdpi/checkmark_small.png and b/Habitica/res/drawable-xxhdpi/checkmark_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/completed.png b/Habitica/res/drawable-xxhdpi/completed.png
index d84b65cb2..2f5d8b78f 100644
Binary files a/Habitica/res/drawable-xxhdpi/completed.png and b/Habitica/res/drawable-xxhdpi/completed.png differ
diff --git a/Habitica/res/drawable-xxhdpi/contributor_icon.png b/Habitica/res/drawable-xxhdpi/contributor_icon.png
index 01aa3b052..4579bdafc 100644
Binary files a/Habitica/res/drawable-xxhdpi/contributor_icon.png and b/Habitica/res/drawable-xxhdpi/contributor_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_background.png b/Habitica/res/drawable-xxhdpi/customization_background.png
index b9999cf4d..4f6b3f3f6 100644
Binary files a/Habitica/res/drawable-xxhdpi/customization_background.png and b/Habitica/res/drawable-xxhdpi/customization_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/customization_mix.png b/Habitica/res/drawable-xxhdpi/customization_mix.png
index 1729c7032..198e5594b 100644
Binary files a/Habitica/res/drawable-xxhdpi/customization_mix.png and b/Habitica/res/drawable-xxhdpi/customization_mix.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button.9.png b/Habitica/res/drawable-xxhdpi/diamond_button.9.png
index 317538c09..9db00d747 100644
Binary files a/Habitica/res/drawable-xxhdpi/diamond_button.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png
index 2317f8522..f307977c1 100644
Binary files a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/empty_slot.png b/Habitica/res/drawable-xxhdpi/empty_slot.png
index 74ac9c25b..67d1d9a11 100644
Binary files a/Habitica/res/drawable-xxhdpi/empty_slot.png and b/Habitica/res/drawable-xxhdpi/empty_slot.png differ
diff --git a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png
index 578cb397e..f1717f451 100644
Binary files a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png and b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png differ
diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png
index 74b2e70ef..d14dfc591 100644
Binary files a/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png
index e19371219..5c6d6e25a 100644
Binary files a/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxhdpi/fall_gems_21.png
index 2e59c48c6..51b5ab55a 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_21.png and b/Habitica/res/drawable-xxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxhdpi/fall_gems_4.png
index 3b54a666d..996311238 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_4.png and b/Habitica/res/drawable-xxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxhdpi/fall_gems_42.png
index 8dd7c1aa8..9ebc2a0aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_42.png and b/Habitica/res/drawable-xxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxhdpi/fall_gems_84.png
index 8757d1300..f18383a83 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_gems_84.png and b/Habitica/res/drawable-xxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_promo_title.png b/Habitica/res/drawable-xxhdpi/fall_promo_title.png
index 846418d8f..2a49c02fb 100644
Binary files a/Habitica/res/drawable-xxhdpi/fall_promo_title.png and b/Habitica/res/drawable-xxhdpi/fall_promo_title.png differ
diff --git a/Habitica/res/drawable-xxhdpi/flag_flap.png b/Habitica/res/drawable-xxhdpi/flag_flap.png
index b9d656371..ca02603af 100644
Binary files a/Habitica/res/drawable-xxhdpi/flag_flap.png and b/Habitica/res/drawable-xxhdpi/flag_flap.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png
index 0db595070..9dbb03c00 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png
index 2a7e4472c..484b54d76 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png
index 3a6730ad1..de15d7eb0 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png
index 7c77ff9b2..4409f987d 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png
index c704cc43e..86ad00159 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png
index 9a608b8e9..f0e644d4f 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_footer.png b/Habitica/res/drawable-xxhdpi/gem_footer.png
index 3df5c85ad..cd25fd630 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_footer.png and b/Habitica/res/drawable-xxhdpi/gem_footer.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_left.png b/Habitica/res/drawable-xxhdpi/gem_gold_left.png
index 4321b394b..7d71c80fb 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_gold_left.png and b/Habitica/res/drawable-xxhdpi/gem_gold_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_right.png b/Habitica/res/drawable-xxhdpi/gem_gold_right.png
index 6bd13abf9..84ce13156 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_gold_right.png and b/Habitica/res/drawable-xxhdpi/gem_gold_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png
index bbeafadfc..9ce6c5f34 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png
index e31809027..2d28aa92f 100644
Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_21.png b/Habitica/res/drawable-xxhdpi/gems_21.png
index ad89c7759..a9d796129 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_21.png and b/Habitica/res/drawable-xxhdpi/gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_4.png b/Habitica/res/drawable-xxhdpi/gems_4.png
index f18f173a6..62cc2a8f1 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_4.png and b/Habitica/res/drawable-xxhdpi/gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_42.png b/Habitica/res/drawable-xxhdpi/gems_42.png
index 033c88781..c2966c312 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_42.png and b/Habitica/res/drawable-xxhdpi/gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gems_84.png b/Habitica/res/drawable-xxhdpi/gems_84.png
index 815987af1..82b29c445 100644
Binary files a/Habitica/res/drawable-xxhdpi/gems_84.png and b/Habitica/res/drawable-xxhdpi/gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png
index a154b401f..38ca925b9 100644
Binary files a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png b/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png
index 0e66be2cd..d8ed80ff0 100644
Binary files a/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png and b/Habitica/res/drawable-xxhdpi/gift_subscription_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_left.png b/Habitica/res/drawable-xxhdpi/gold_coins_left.png
index e1caf33d6..a516a5e00 100644
Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_left.png and b/Habitica/res/drawable-xxhdpi/gold_coins_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_right.png b/Habitica/res/drawable-xxhdpi/gold_coins_right.png
index ebd64b89e..99d70c64d 100644
Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_right.png and b/Habitica/res/drawable-xxhdpi/gold_coins_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.png b/Habitica/res/drawable-xxhdpi/habit_minus.png
index 03c457811..a4e60765b 100644
Binary files a/Habitica/res/drawable-xxhdpi/habit_minus.png and b/Habitica/res/drawable-xxhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_plus.png b/Habitica/res/drawable-xxhdpi/habit_plus.png
index 6609fef8c..7f1db95aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/habit_plus.png and b/Habitica/res/drawable-xxhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png
index 521fbe768..a99d877ed 100644
Binary files a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png
index 1581c7ca5..c3b3c5866 100644
Binary files a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png
index 5d03558c5..3bfd91d8e 100644
Binary files a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png
index c4d55365d..a881c32ac 100644
Binary files a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_birthday.png b/Habitica/res/drawable-xxhdpi/icon_birthday.png
index e03d2b3ca..f26d5e0cb 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_birthday.png and b/Habitica/res/drawable-xxhdpi/icon_birthday.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_health.png b/Habitica/res/drawable-xxhdpi/icon_boss_health.png
index 54f7c4919..b6e0bf9db 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_boss_health.png and b/Habitica/res/drawable-xxhdpi/icon_boss_health.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_rage.png b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png
index cdc741ab2..259cc4024 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_boss_rage.png and b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_eggs.png b/Habitica/res/drawable-xxhdpi/icon_eggs.png
index 15a83f6df..f590b6cd2 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_eggs.png and b/Habitica/res/drawable-xxhdpi/icon_eggs.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_food.png b/Habitica/res/drawable-xxhdpi/icon_food.png
index 1100d90c0..3fc7a2977 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_food.png and b/Habitica/res/drawable-xxhdpi/icon_food.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png
index f0527ce5b..315bd82e0 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png and b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_lock.png b/Habitica/res/drawable-xxhdpi/icon_lock.png
index 7a694af4b..6b0ea9420 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_lock.png and b/Habitica/res/drawable-xxhdpi/icon_lock.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_quests.png b/Habitica/res/drawable-xxhdpi/icon_quests.png
index a17600b05..a713864dc 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_quests.png and b/Habitica/res/drawable-xxhdpi/icon_quests.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_shops.png b/Habitica/res/drawable-xxhdpi/icon_shops.png
index e51098343..e85600161 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_shops.png and b/Habitica/res/drawable-xxhdpi/icon_shops.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_special.png b/Habitica/res/drawable-xxhdpi/icon_special.png
index 5802414e6..19cacf108 100644
Binary files a/Habitica/res/drawable-xxhdpi/icon_special.png and b/Habitica/res/drawable-xxhdpi/icon_special.png differ
diff --git a/Habitica/res/drawable-xxhdpi/indicator_subscribe.png b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png
index cb4d663b6..d817304b6 100644
Binary files a/Habitica/res/drawable-xxhdpi/indicator_subscribe.png and b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/limited.png b/Habitica/res/drawable-xxhdpi/limited.png
index 408a9abae..5f6e16a18 100644
Binary files a/Habitica/res/drawable-xxhdpi/limited.png and b/Habitica/res/drawable-xxhdpi/limited.png differ
diff --git a/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png
index 3a058a6f8..a310e9f0f 100644
Binary files a/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png and b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png differ
diff --git a/Habitica/res/drawable-xxhdpi/no_background.png b/Habitica/res/drawable-xxhdpi/no_background.png
index 6ca2077d4..b4f4aa192 100644
Binary files a/Habitica/res/drawable-xxhdpi/no_background.png and b/Habitica/res/drawable-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/npc_gradient.png b/Habitica/res/drawable-xxhdpi/npc_gradient.png
index eb89f7b9b..91e493d68 100644
Binary files a/Habitica/res/drawable-xxhdpi/npc_gradient.png and b/Habitica/res/drawable-xxhdpi/npc_gradient.png differ
diff --git a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png
index d9cc8ec0b..298ce31b3 100644
Binary files a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png differ
diff --git a/Habitica/res/drawable-xxhdpi/party_invite_reject.png b/Habitica/res/drawable-xxhdpi/party_invite_reject.png
index c351769ae..e0606bca2 100644
Binary files a/Habitica/res/drawable-xxhdpi/party_invite_reject.png and b/Habitica/res/drawable-xxhdpi/party_invite_reject.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_gift.png b/Habitica/res/drawable-xxhdpi/payment_gift.png
index d2fb03a2b..a81af8ee2 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_gift.png and b/Habitica/res/drawable-xxhdpi/payment_gift.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_google.png b/Habitica/res/drawable-xxhdpi/payment_google.png
index 5589b141e..3780cb794 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_google.png and b/Habitica/res/drawable-xxhdpi/payment_google.png differ
diff --git a/Habitica/res/drawable-xxhdpi/payment_stripe.png b/Habitica/res/drawable-xxhdpi/payment_stripe.png
index 030c1dacf..3319a2b49 100644
Binary files a/Habitica/res/drawable-xxhdpi/payment_stripe.png and b/Habitica/res/drawable-xxhdpi/payment_stripe.png differ
diff --git a/Habitica/res/drawable-xxhdpi/pet_checkmark.png b/Habitica/res/drawable-xxhdpi/pet_checkmark.png
index ead809425..f20881199 100644
Binary files a/Habitica/res/drawable-xxhdpi/pet_checkmark.png and b/Habitica/res/drawable-xxhdpi/pet_checkmark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/separator_fancy.png b/Habitica/res/drawable-xxhdpi/separator_fancy.png
index 7b4687ee8..5115bcd6e 100644
Binary files a/Habitica/res/drawable-xxhdpi/separator_fancy.png and b/Habitica/res/drawable-xxhdpi/separator_fancy.png differ
diff --git a/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png
index ed6378d1d..eaeeeb8da 100644
Binary files a/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png and b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sparkles_left.png b/Habitica/res/drawable-xxhdpi/sparkles_left.png
index 9885b9ec4..db84f84a2 100644
Binary files a/Habitica/res/drawable-xxhdpi/sparkles_left.png and b/Habitica/res/drawable-xxhdpi/sparkles_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png
index 701b30ff9..9737275e4 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png
index 6704caf80..8f875e800 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png
index 815b74f08..ecc795f5d 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png
index ab73f510c..97eac988c 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png and b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png
index 426b1aa9f..e84fd8bba 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png
index 6b3b23f1d..b01369bc1 100644
Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/star.png b/Habitica/res/drawable-xxhdpi/star.png
index 44da3b86f..1ba7d46aa 100644
Binary files a/Habitica/res/drawable-xxhdpi/star.png and b/Habitica/res/drawable-xxhdpi/star.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png
index b6f271428..8a56eb414 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png
index f6a97fd09..13e1e2fe4 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png
index b17dc9503..8f12be290 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png
index 07dac9e0b..3ea287e20 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png
index b588d14fa..cdaff2b5c 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png differ
diff --git a/Habitica/res/drawable-xxhdpi/sub_plus.png b/Habitica/res/drawable-xxhdpi/sub_plus.png
index 053926a82..29d1aaba7 100644
Binary files a/Habitica/res/drawable-xxhdpi/sub_plus.png and b/Habitica/res/drawable-xxhdpi/sub_plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscribe_header.png b/Habitica/res/drawable-xxhdpi/subscribe_header.png
index 3fa324fdc..97b346595 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscribe_header.png and b/Habitica/res/drawable-xxhdpi/subscribe_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png
index 3f5f0e1b2..04dec7fe0 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_header.png b/Habitica/res/drawable-xxhdpi/subscriber_header.png
index baa6a7465..309733378 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_header.png and b/Habitica/res/drawable-xxhdpi/subscriber_header.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscription_bg.png b/Habitica/res/drawable-xxhdpi/subscription_bg.png
index 152afc073..09669dcda 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscription_bg.png and b/Habitica/res/drawable-xxhdpi/subscription_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png
index 9eb1dba33..d47fcef41 100644
Binary files a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png and b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png differ
diff --git a/Habitica/res/drawable-xxhdpi/survey_art_left.png b/Habitica/res/drawable-xxhdpi/survey_art_left.png
index e68f99f34..f7cc9c604 100644
Binary files a/Habitica/res/drawable-xxhdpi/survey_art_left.png and b/Habitica/res/drawable-xxhdpi/survey_art_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/survey_art_right.png b/Habitica/res/drawable-xxhdpi/survey_art_right.png
index f5733eea4..ecb647e27 100644
Binary files a/Habitica/res/drawable-xxhdpi/survey_art_right.png and b/Habitica/res/drawable-xxhdpi/survey_art_right.png differ
diff --git a/Habitica/res/drawable/death_ghost.png b/Habitica/res/drawable/death_ghost.png
index bfa6b0130..8adbcb34d 100644
Binary files a/Habitica/res/drawable/death_ghost.png and b/Habitica/res/drawable/death_ghost.png differ
diff --git a/Habitica/res/drawable/indicator_diamond.xml b/Habitica/res/drawable/indicator_diamond.xml
index 249abe868..1d24e209c 100644
--- a/Habitica/res/drawable/indicator_diamond.xml
+++ b/Habitica/res/drawable/indicator_diamond.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/indicator_diamond_selected" />
-    <item android:drawable="@drawable/indicator_diamond_unselected" />
-</selector>
\ No newline at end of file
+    <item android:state_selected="true">
+        <layer-list>
+            <item android:drawable="@drawable/indicator_diamond_selected" android:height="24dp" />
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item android:drawable="@drawable/indicator_diamond_unselected" android:height="24dp" />
+        </layer-list>
+    </item>
+</selector>
diff --git a/Habitica/res/drawable/party_seeking.png b/Habitica/res/drawable/party_seeking.png
index e025cf329..d640f7857 100644
Binary files a/Habitica/res/drawable/party_seeking.png and b/Habitica/res/drawable/party_seeking.png differ
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 150073bce..62ec597c4 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:background="@color/brand">
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <RelativeLayout
-        android:orientation="vertical" android:layout_width="match_parent"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
-        <com.viewpagerindicator.IconPageIndicator
-            android:id="@+id/view_pager_indicator"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="16dp" />
+        android:layout_width="match_parent"
+        tools:background="@color/brand">
+
+    <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    <RelativeLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true">
+
+        <com.google.android.material.tabs.TabLayout
+                android:id="@+id/view_pager_indicator"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_alignParentBottom="true"
+                app:tabGravity="center"
+                app:tabBackground="@drawable/indicator_diamond"
+                android:background="@color/transparent"
+                app:tabIndicator="@null" />
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/skip_button"
-            android:id="@+id/skipButton"
-            android:layout_alignParentBottom="false"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="6dp"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="@dimen/spacing_small"
-            android:textColor="@android:color/white"
-            android:background="@color/transparent" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/skip_button"
+                android:id="@+id/skipButton"
+                android:layout_alignParentBottom="false"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="6dp"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:textColor="@android:color/white"
+                android:background="@color/transparent" />
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/intro_finish_button"
-            android:id="@+id/finishButton"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="6dp"
-            android:background="@color/transparent"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/intro_finish_button"
+                android:id="@+id/finishButton"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="6dp"
+                android:background="@color/transparent"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:visibility="gone"
+                tools:visibility="visible" />
     </RelativeLayout>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index 6bfe64afc..cf7ca194c 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,44 +1,52 @@
 <?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="match_parent"
-    android:orientation="vertical">
-
-    <com.habitrpg.android.habitica.ui.views.FadingViewPager
-        android:id="@+id/viewPager"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
     <RelativeLayout
-        android:id="@+id/bottomBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/background_brand"
-        android:gravity="center_vertical"
-        android:elevation="8dp">
-        <com.viewpagerindicator.IconPageIndicator
-            android:id="@+id/view_pager_indicator"
+            android:id="@+id/bottomBar"
+            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
+            android:layout_height="56dp"
+            android:background="@color/background_brand"
+            android:gravity="center_vertical"
+            android:elevation="8dp">
+
+        <com.google.android.material.tabs.TabLayout
+                android:id="@+id/view_pager_indicator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                app:tabBackground="@drawable/indicator_diamond"
+                android:background="@color/transparent"
+                app:tabIndicator="@null" />
+
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/previousButton"
-            android:drawableStart="@drawable/back_arrow_disabled"
-            android:background="@color/transparent"
-            android:drawablePadding="12dp"
-            android:textColor="@color/white"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/previousButton"
+                android:drawableStart="@drawable/back_arrow_disabled"
+                android:background="@color/transparent"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white" />
+
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next_button"
-            android:id="@+id/nextButton"
-            android:drawablePadding="12dp"
-            android:textColor="@color/white"
-            android:drawableEnd="@drawable/forward_arrow_enabled"
-            android:background="@color/transparent"
-            android:layout_alignParentEnd="true"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/next_button"
+                android:id="@+id/nextButton"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white"
+                android:drawableEnd="@drawable/forward_arrow_enabled"
+                android:background="@color/transparent"
+                android:layout_alignParentEnd="true" />
     </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 12537066c..b58a5d865 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -295,13 +295,12 @@
                         android:textColor="@color/white"
                         style="@style/Caption2"
                         android:drawablePadding="@dimen/spacing_medium" />
-                <View
-                    android:id="@+id/bottom_spacing"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="30dp"
-                    android:background="@color/red_5"/>
             </LinearLayout>
         </FrameLayout>
+        <View
+                android:id="@+id/bottom_spacing"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/brand_400"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_subscription_content.xml b/Habitica/res/layout/fragment_subscription_content.xml
index 497122fe0..e207785c2 100644
--- a/Habitica/res/layout/fragment_subscription_content.xml
+++ b/Habitica/res/layout/fragment_subscription_content.xml
@@ -400,7 +400,7 @@
                 android:background="@color/brand_400"
                 android:orientation="vertical"
                 android:paddingTop="6dp"
-                android:paddingBottom="32dp"
+                android:paddingBottom="10dp"
                 android:paddingHorizontal="24dp">
 
             <TextView
@@ -422,5 +422,10 @@
                     android:visibility="gone"
                 />
         </LinearLayout>
+        <View
+                android:id="@+id/bottom_spacing"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:background="@color/brand_400"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 995a155ea..5808ff829 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -531,11 +531,11 @@
     <string name="world_boss">Световен главатар</string>
     <string name="boss_art">Графика на главатаря</string>
     <string name="world_boss_description">Описание на световния главатар</string>
-    <string name="rage_strike_count">Яростни удари: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Яростни удари: %d/%d</string>
     <string name="pending_strike_title">Изчакващ удар</string>
     <string name="strike_description_title">Какво е яростен удар?</string>
     <string name="strike_active_title">%s беше нападнат!</string>
-    <string name="strike_active_description">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
+    <string name="strike_active_description">Нашият %1$s беше съсипан когато %2$s разби %3$s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
     <string name="questShop">Магазинът за мисии</string>
     <string name="market_owner_long">Алекс Търговеца</string>
     <string name="tavern_owner_long">Даниел Кръчмаря</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 8205a8b6c..6b70cb247 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -532,12 +532,12 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="world_boss">Weltboss</string>
     <string name="boss_art">Boss-Grafik</string>
     <string name="world_boss_description">Weltboss-Beschreibung</string>
-    <string name="rage_strike_count">Raserei-Angriff: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Raserei-Angriff: %d/%d</string>
     <string name="pending_strike_title">Ausstehender Angriff</string>
     <string name="strike_description_title">Was ist ein Raserei-Angriff\?</string>
     <string name="strike_active_title">%s wurde angegriffen!</string>
-    <string name="strike_active_description">%s war am Boden zerstört, als der %s das %s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
-    <string name="questShop">Quests</string>
+    <string name="strike_active_description">%1$s war am Boden zerstört, als der %2$s das %3$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>
     <string name="stable_owner_long">Matt der Herr aller Bestien</string>
@@ -698,7 +698,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="local">lokale</string>
     <string name="authentication_methods">Authentifizierungsmethoden</string>
     <string name="someone">Jemand</string>
-    <string name="invitation_title">%s hat Dich eingeladen der Gruppe %s beizutreten</string>
+    <string name="invitation_title">%1$s hat Dich eingeladen der Gruppe %2$s beizutreten</string>
     <string name="password_too_short">Das Passwort muss mindestens %d Zeichen haben</string>
     <string name="copy_username">Benutzernamen kopieren</string>
     <string name="id_copied">Benutzer-ID in die Zwischenablage kopiert</string>
@@ -828,7 +828,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="task_title">Aufgaben-Titel</string>
     <string name="add_local_authentication">Lokale Authentifizierung hinzufügen</string>
     <string name="defeat">Niederlage</string>
-    <string name="gift_confirmation_text_sub">Du hast %s ein %s-monatiges Abo für Habitica geschickt.</string>
+    <string name="gift_confirmation_text_sub">Du hast %1$s ein %2$s-monatiges Abo für Habitica geschickt.</string>
     <string name="gift_confirmation_text_sub_g1g1">Du hast %1$s ein %2$s-monatiges Abo für Habitica geschickt und das gleiche Abo wurde Deinem Konto gutgeschrieben, dank unserer \"Verschenke ein Abo und erhalte eins gratis\"-Aktion!</string>
     <string name="join_party_description_guild">Gib den untenstehenden Benutzernamen einem Freund, oder geh zur %s um potenzielle Verbündete zu treffen!</string>
     <string name="empty_title_rewards_filtered">Keine Belohnungen</string>
@@ -1013,11 +1013,11 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="delete_challenge_task_title">Herausforderungsaufgabe löschen\?</string>
     <string name="use_saddle">Magischen Sattel geben</string>
     <string name="unhatched_pet">Nicht ausgebrütetes Haustier</string>
-    <string name="can_hatch_pet">Kombiniere Dein %s Ei und %s Elixier, um dieses Haustier auszubrüten!</string>
-    <string name="suggest_pet_hatch_again_missing_both">Du brauchst noch ein %s und %s Elixier, um dieses Haustier erneut auszubrüten</string>
+    <string name="can_hatch_pet">Kombiniere Dein %1$s Ei und %2$s Elixier, um dieses Haustier auszubrüten!</string>
+    <string name="suggest_pet_hatch_again_missing_both">Du brauchst noch ein %1$s und %2$s Elixier, um dieses Haustier erneut auszubrüten</string>
     <string name="suggest_pet_hatch_again_missing_potion">Du brauchst noch ein %s Elixier, um dieses Haustier erneut auszubrüten</string>
     <string name="suggest_pet_hatch_again_missing_egg">Du brauchst noch ein %s Ei, um dieses Haustier erneut auszubrüten</string>
-    <string name="suggest_pet_hatch_missing_both">Du brauchst noch ein %s und %s Elixier, um dieses Haustier auszubrüten</string>
+    <string name="suggest_pet_hatch_missing_both">Du brauchst noch ein %1$s und %2$s Elixier, um dieses Haustier auszubrüten</string>
     <string name="suggest_pet_hatch_missing_potion">Du brauchst noch ein %s Elixier, um dieses Haustier auszubrüten</string>
     <string name="suggest_pet_hatch_missing_egg">Du brauchst noch ein %s Ei, um dieses Haustier auszubrüten</string>
     <string name="hatch_pet_title">Ein neues Haustier ausbrüten</string>
@@ -1033,15 +1033,15 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="block">Blockieren</string>
     <string name="block_user_description">Blockierte Spieler*innen können Dir keine Privaten Nachrichten schicken, aber Du wirst Ihre Posts in der Taverne und in Gilden weiterhin sehen. Blockieren wird nicht funktionieren, wenn die Person zurzeit ein Moderator ist oder in Zukunft wird</string>
     <string name="block_user_title">%s blockieren\?</string>
-    <string name="unblock_user">Spieler*in entblocken</string>
-    <string name="block_user">Spieler*in blockieren</string>
-    <string name="x_to_y">%s bis %s</string>
+    <string name="unblock_user">User entblocken</string>
+    <string name="block_user">User blockieren</string>
+    <string name="x_to_y">%1$s bis %2$s</string>
     <string name="usually_x_gems">Üblicherweise %d Edelsteine</string>
     <string name="limitations">Einschränkungen</string>
     <string name="how_it_works">So funktioniert es</string>
-    <string name="fall_promo_info_instructions">Zwischen %s und %s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
+    <string name="fall_promo_info_instructions">Zwischen %1$s und %2$s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="spooky_promo_info_prompt">Der Edelstein-Sonderverkauf ist zurück! Das ist die letzte Chance, mehr Edelsteine als je zuvor zu bekommen, also füll\' Deine Lager solange Du noch kannst!</string>
-    <string name="spooky_promo_info_instructions">Zwischen %s und %s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
+    <string name="spooky_promo_info_instructions">Zwischen %1$s und %2$s kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="view_gem_bundles">Edelstein-Pakete anzeigen</string>
     <string name="fall_promo_info_prompt">Die Herbstgala ist in vollem Gange. Deshalb haben wir gedacht, dass dies der perfekte Zeitpunkt für den allerersten Edelstein-Sonderverkauf ist! Jetzt bekommst Du mit jedem Einkauf mehr Edelsteine als je zuvor.</string>
     <string name="quest_items_found">Du hast %d Questgegenstände gefunden</string>
@@ -1136,12 +1136,12 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="password_not_matching">Die eingegebenen Passwörter stimmen nicht überein.</string>
     <string name="email_invalid">Ungültige E-Mail-Adresse</string>
     <string name="discard">Verwerfen</string>
-    <string name="class_confirmation_price">Möchtest Du Deine Klasse in %s ändern für %d Edelsteine\?</string>
+    <string name="class_confirmation_price">Möchtest Du Deine Klasse in %1$s ändern für %2$d Edelsteine\?</string>
     <string name="use_item">Wende Gegenstand auf Party Mitglied an</string>&gt;
     <string name="unsaved_changes">Ungesicherte Änderungen</string>
     <string name="discard_changes_to_task_message">Bist Du sicher, dass Du die Änderungen an dieser Aufgabe verwerfen möchtest\?</string>
     <string name="gem_purchase_confirmation">Du hast %s Edelsteine erhalten.</string>
-    <string name="gift_confirmation_text_gems_new">Du hast %s %s Edelsteine geschickt.</string>
+    <string name="gift_confirmation_text_gems_new">Du hast %1$s %2$s Edelsteine geschickt.</string>
     <string name="sale_ends_in">Angebot endet in %s</string>
     <string name="my_account">Mein Konto</string>
     <string name="added_social_auth">%s Authentifizierung hinzugefügt</string>
@@ -1201,9 +1201,9 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="buy_set">Set kaufen</string>
     <string name="tutorial_reset_confirmation">Deine Einführung wurde zurückgesetzt</string>
     <string name="death_description">Aber Du kannst sie alle mit harter Arbeit zurückerlangen! Viel Erfolg - Du wirst das schaffen.</string>
-    <string name="faint_broken_equipment">Defekte Ausrüstung kann auf dem Marktplatz
-\nzurückgekauft werden</string>
-    <string name="faint_loss_description">Du fällst zurück auf Level <b>%d</b>, verlierst <b>%d</b> Gold und <b>ein Ausrüstungsgegenstand</b> wird zerstört… Du kannst mit harter Arbeit alles wieder zurückerlangen!</string>
+    <string name="faint_broken_equipment">Zerstörte Ausrüstungsgegenstände können 
+\nim Belohnungen-Bereich zurückgekauft werden</string>
+    <string name="faint_loss_description">Du fällst zurück auf Level <b>%1$d</b>, verlierst <b>%2$d</b> Gold und <b>ein Ausrüstungsgegenstand</b> wird zerstört…</string>
     <string name="account_reset">Account zurücksetzen</string>
     <string name="avatar_skin_customization">Avatar Haut Anpassung</string>
     <string name="avatar_beard_customization">Avatar Bart Anpassung</string>
@@ -1263,274 +1263,4 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="positive_sentence">positiv</string>
     <string name="title">Titel</string>
     <string name="negative_sentence">negativ</string>
-    <string name="x_and_y">%1$s und %2$s</string>
-    <string name="subscribe_incentive_button_armoire">Abonniere, um kostenlos erneut zu öffnen!</string>
-    <string name="subscriber_button_armoire">Erneut kostenlos öffnen!</string>
-    <string name="subscribe_listitemArmoire_description_2">Jedes Mal, wenn Du den Schrank öffnest, kannst Du ihn erneut kostenlos öffnen!</string>
-    <string name="change_class_message">Dadurch wird Deine aktuelle Klasse entfernt, Du bekommst alle Wertepunkte zurück und kannst eine neue Klasse wählen</string>
-    <string name="subscribe_listitemFaint_description">Behalte deinen Fortschritt mit einer sofortigen Heilung pro Tag, sobald deine Gesundheit aufgebraucht ist!</string>
-    <string name="reset_account_description_no_pw">Du wirst alle deine Level, Gold und Erfahrung verlieren. Alle Ihre Aufgaben und ihre historischen Daten werden gelöscht (Herausforderungsaufgaben bleiben erhalten). Du wirst alle Ausrüstungsgegenstände verlieren, mit Ausnahme von Abonnenten-Gegenständen und kostenlosen Erinnerungsgegenständen, aber du wirst sie zurückkaufen können. Du wirst der richtigen Klasse angehören müssen, um klassenspezifische Ausrüstung wieder zu kaufen. Du behältst deine aktuelle Klasse, deine Errungenschaften sowie deine Haustiere und Reittiere. Wenn du dir ganz sicher bist, gib RESET in das Textfeld unten ein.</string>
-    <string name="x_checkins">%d Anmeldungen</string>
-    <plurals name="x_days">
-        <item quantity="one">%d Tag</item>
-        <item quantity="other">%d Tage</item>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="one">%d Stunde</item>
-        <item quantity="other">%d Stunden</item>
-    </plurals>
-    <plurals name="x_minutes">
-        <item quantity="one">%d Minute</item>
-        <item quantity="other">%d Minuten</item>
-    </plurals>
-    <string name="subscription_hourglasses_3month_timeframe">Sanduhr in 3 Monaten</string>
-    <string name="class_equipment_shop_dialog_new">Dieser Gegenstand ist nur für %s verfügbar. Öffne die Einstellungen, um die Klasse zu ändern.</string>
-    <string name="insufficient_level_equipment_dialog_new">Dieser Gegenstand ist nur für %s verfügbar. Nach Level 10 kannst du eine Klasse wählen.</string>
-    <string name="opt_out_description">In diesem Fall wird Dir keine Klasse zugewiesen. Du kannst jederzeit wieder eine Klasse auswählen, indem Du das Klassensystem in den Einstellungen aktivierst.</string>
-    <string name="enable_class_description">Wähle eine Klasse, um Fähigkeiten, Werte und Mana zu aktivieren</string>
-    <string name="choosing_class_progress">Klasse wählen</string>
-    <string name="change_class_selected_confirmation">Willst Du Deine Klasse in %1$s ändern\?</string>
-    <string name="change_class_confirmation_message">Dadurch wird geändert, welche Ausrüstungsgegenstände in den Geschäften freigeschaltet sind und Deine verfügbaren Fähigkeiten ändern sich</string>
-    <string name="your_tags">Deine Tags</string>
-    <string name="challenge_tags">Herausforderungs Tags</string>
-    <string name="group_tags">Gruppen Tags</string>
-    <string name="subscribe_listitemFaint">Bekomme eine zweite Chance</string>
-    <string name="challenges">Herausforderungen</string>
-    <string name="reset_account_description_new">Du wirst alle deine Level, Gold und Erfahrung verlieren. Alle Ihre Aufgaben und ihre historischen Daten werden gelöscht (Herausforderungsaufgaben bleiben erhalten). Du wirst alle Ausrüstungsgegenstände verlieren, mit Ausnahme von Abonnenten-Gegenständen und kostenlosen Erinnerungsgegenständen, aber du wirst sie zurückkaufen können. Du wirst der richtigen Klasse angehören müssen, um klassenspezifische Ausrüstung wieder zu kaufen. Du behältst deine aktuelle Klasse, deine Errungenschaften sowie deine Haustiere und Reittiere. Um das Zurücksetzen zu bestätigen, gib dein Passwort unten ein.</string>
-    <string name="invited_to_guild_notification">&lt;font color=#925CF3&gt;%2$s&lt;/font&gt; hat Dich eingeladen der Gruppe &lt;b&gt;%1$s&lt;/b&gt; beizutreten</string>
-    <string name="need_help_description">Du kannst Dich an uns wenden und ein Mitglied unseres Teams wird sein Bestes tun, um Dir zu helfen!</string>
-    <string name="level_abbreviated">Level %d</string>
-    <string name="insufficient_level_equipment_dialog">Dieser Gegenstand ist nur für eine bestimmte Klasse verfügbar. Nach Level 10 kannst Du eine Klasse wählen.</string>
-    <string name="report_message_explanation">Du solltest nur Beiträge melden, die die [Community Guidelines](https://habitica.com/static/community-guidelines) and/or [Terms of Service](https://habitica.com/static/terms) verletzen.
-\nZweckwidrige Meldungen verletzen Habiticas Nutzungsbedingungen.</string>
-    <string name="report_player_title">%s melden\?</string>
-    <string name="report_hint">Begründung der Meldung</string>
-    <string name="report_reason_title_message">Warum meldest du diese Nachricht\?</string>
-    <string name="stripe_payment">Stripe</string>
-    <string name="limited_edition">Limitierte Ausgabe</string>
-    <string name="positive_and_negative">Positiv und Negativ</string>
-    <string name="assigned_to">Zugewiesen zu</string>
-    <string name="completed_at">Erledigt am %s</string>
-    <string name="assign">Zuweisen</string>
-    <string name="plenty_of_potions">Jede menge Tränke</string>
-    <string name="buy_for_x">Für %s kaufen</string>
-    <string name="buy_for">Kaufen für</string>
-    <string name="report_successful">%s gemeldet</string>
-    <string name="shadow_mute_user">Heimlich stummen</string>
-    <string name="mute_user">Spieler*in stumm schalten</string>
-    <string name="ban_user_confirm">Willst du diese Spieler*in bannen\?</string>
-    <string name="unban_user_confirm">Willst du diese Spieler*in entmannen\?</string>
-    <string name="task_summary">Aufgabenzusammenfassung</string>
-    <string name="habit_summary_description">Dies ist eine **%1$s** Gewohnheit, die **%2$s** ist.</string>
-    <string name="assign_to">Zuweisen zu…</string>
-    <string name="manager">Manager*in</string>
-    <string name="member_list">Mitgliederliste</string>
-    <string name="ban_user">Spieler*in bannen</string>
-    <string name="on_x">Am %s</string>
-    <string name="on_weekdays">An Wochentagen</string>
-    <string name="on_weekends">An Wochenenden</string>
-    <string name="on_every_day_of_week">An jedem Tag der Woche</string>
-    <string name="first">Zuerst</string>
-    <string name="second">zweitens</string>
-    <string name="third">drittens</string>
-    <string name="fourth">vierten</string>
-    <string name="fifth">fünften</string>
-    <string name="animated_gryphatrice_pet">Jubilierender Greifatrix Haustier</string>
-    <string name="thanks_for_support">Danke für deine Unterstützung!</string>
-    <string name="visit_market">Markt besuchen</string>
-    <string name="report_player">Spieler*in melden</string>
-    <string name="report_reason_title_player">Warum meldest du diese Spieler*in\?</string>
-    <string name="report_reason_title_challenge">Warum meldest du diese Herausforderung\?</string>
-    <string name="report_formatted_name">%1$s
-\n@%2$s</string>
-    <string name="report_user_description">Dies wird @%s auch blockieren</string>
-    <string name="report_message">Nachricht melden</string>
-    <string name="report_player_toolbar_title">%s melden</string>
-    <string name="send_invite">Einladung versenden</string>
-    <string name="not_set" tools:override="true">Nicht gesetzt</string>
-    <string name="never">Niemals</string>
-    <string name="status">Status</string>
-    <string name="regular_access">Regulärer Zugriff</string>
-    <string name="message_flagged">Nachricht %d mal gemeldet.</string>
-    <string name="amazon">Amazon</string>
-    <string name="apple_pay">Apple Pay</string>
-    <string name="google_pay">Google Pay</string>
-    <string name="paypal">PayPal</string>
-    <string name="visit_the_market">Markt besuchen</string>
-    <string name="exclusive_items_await">Exklusive Gegenstände und Geschenke warten</string>
-    <string name="username_or_email">Benutzername oder E-Mail-Adresse</string>
-    <string name="cancel_subscription_apple_description">Du möchtest kein Abonnement mehr\? Aufgrund deines gewählten Zahlungsverfahrens musst du in den Einstellungen deines iOS Gerätes unter deiner Apple ID kündigen.</string>
-    <string name="subscribers_mythic_hourglasses"><i>Abonnenten erhalten Mystische Sanduhren innerhalb der ersten drei Tage des Monats.</i></string>
-    <string name="resubscribe_description_gift">Möchtest du weiterhin Abonnement Vorteile erhalten\? Du kannst ein wiederkehrendes Abonnement abschließen um deine Vorteile aktiv zu halten.</string>
-    <string name="todo_summary_description_duedate">Dies ist eine **%1$s** Aufgabe, fällig **%2$s**.</string>
-    <string name="daily_summary_description">Dies ist eine **%1$s** Aufgabe die sich **%2$s%3$s** wiederholt.</string>
-    <string name="edit_assignees">Zuweisungen bearbeiten</string>
-    <string name="promote_to_manager">Zum Manager befördern</string>
-    <string name="mute_user_confirm">Möchtest du den Zugriff zum Chat für diesen Spieler widerrufen\?</string>
-    <string name="unmute_user_confirm">Möchtest du diesem Spieler wieder Zugriff zum Chat geben\?</string>
-    <string name="shadowmute_user_confirm">Möchtest du diesen Spieler unsichtbar stummschalten\?</string>
-    <string name="unshadowmute_user_confirm">Möchtest du die unsichtbare Stummschaltung aufheben\?</string>
-    <string name="shadow_muted_hidden">Unsichtbar stumm, ausgeblendet</string>
-    <string name="gryphatrice_description">Der seltene Jubilierende Greifatrix kommt zur Geburtstagsfeier! Verpasse nicht deine Chance auf dieses exklusive animierte Haustier.</string>
-    <string name="for_for_free">Vier für umsonst</string>
-    <string name="plenty_of_potions_description">Wir bringen 10 eurer liebsten magischen Schlüpfelixiere zurück. Gehe zum Marktplatz um dein Inventar zu füllen!</string>
-    <string name="background">Hintergrund</string>
-    <string name="resume_damage_1_description">Bosse fügen weiterhin Schaden zu wenn
-\nandere Mitglieder ihre Tagesaufgaben verpassen</string>
-    <string name="resume_damage_3_title">Dein Quest-Fortschritt wird wieder angewandt</string>
-    <string name="pause_damage_2_title">Deine Strähnen und Zähler werden nicht zurückgesetzt</string>
-    <string name="pause_damage_2_description">Zähler für tägliche Strähnen und Gewohnheiten steigen nur, wenn dies eingeschaltet ist</string>
-    <string name="pause_damage_3_title">Der Fortschritt deines Quests verbleibt bei Ausstehend</string>
-    <string name="by_invite">Per Einladung</string>
-    <string name="habiticans_looking_party">Hier ist die Liste der Spieler, welche einer Party beitreten möchten</string>
-    <string name="invited">Eingeladen</string>
-    <string name="habiticans_send_invite">Sende eine Einladung direkt an Spieler die du kennst</string>
-    <string name="invite_with_username_email">Versende Einladungen per @Benutzername oder E-Mail</string>
-    <string name="subscribe_listitem3_description_alt">Schmücke dich mit der neuesten exklusiven Ausrüstung. Abboniere jetzt um %1$ss %2$s zu erhalten!</string>
-    <string name="see_other_sub_options">Siehe andere Abonnement Optionen</string>
-    <string name="benefits_end">Vorteile enden %s</string>
-    <string name="faint_loss_description_alt">Du fällst auf Level <b>%d</b> zurück, verlierst <b>%d</b> Gold und deine Erfahrung ... Du kannst mit harter Arbeit alles wieder zurückerlangen!</string>
-    <string name="find_new_member">Finde Mitglieder</string>
-    <string name="change_class_to_x">Wechsel Klasse zu %s</string>
-    <string name="equipment_class_locked">Diese Ausrüstung ist aufgrund seiner Klasse gesperrt</string>
-    <string name="gems_promo_info_limitations_fixed">Diese Aktion gilt nur während des Events. Das Event startet am %1$s (%2$s) und endet am %3$s (%4$s). Die Aktion gilt nur für Edelsteine welche du für dich selbst kaufst.</string>
-    <string name="on_the_x">am %s</string>
-    <string name="on_the_x_of_month">am %1$s %2$s des Monats</string>
-    <string name="seeking_party_title">Suchst du nach einer Party\?</string>
-    <string name="resume_damage_3_description">Ausstehender Schaden oder Sammelgegenstände werden beim nächsten Tages-Reset angewandt</string>
-    <string name="look_for_party">Suche eine Party</string>
-    <string name="you_re_looking_for_party">Du suchst eine Party!</string>
-    <string name="seeking_hint">Halte Ausschau nach Einladungen oder starte jederzeit eine eigene Party</string>
-    <string name="empty_quests_description">Bekomme Quests vom Leveln, Anmeldebonus oder dem [Quest Shop](/shops/quests)!</string>
-    <string name="shop_armoire_title">Du besitzt bereits alle %s-Ausrüstung</string>
-    <string name="empty_food_description">Beende Aufgaben, kaufe einen Schrank oder gehe zum [Marktplatz](/shops/market) um mehr zu erhalten!</string>
-    <string name="no_x">Kein %s</string>
-    <string name="open_settings">Öffne Einstellungen</string>
-    <string name="day_x">Tag %d</string>
-    <string name="a_party_robe">Eine Party-Robe</string>
-    <string name="twenty_gems">20 Edelsteine</string>
-    <string name="pause_damage_summary">Schaden ist aktiv. Mehr erfahren.</string>
-    <string name="resume_damage_summary">Schaden ist pausiert.</string>
-    <string name="pause_damage">Pausiere Schaden</string>
-    <string name="list">Liste</string>
-    <string name="pause_damage_3_description">Schaden an einem Boss oder gefundene Sammelgegenstände wird gespeichert bis du Schaden wieder einschaltest</string>
-    <string name="seeking_party_description">Möchtest du einer Party mit anderen beitreten, kennst aber niemanden\? Lasse Party-Leiter wissen, dass du auf der Suche bist!</string>
-    <string name="todo_summary_description">Dies ist eine **%1$s** Aufgabe die keine Fälligkeit hat.</string>
-    <string name="assigned_to_you_by">Dir zugeordnet von @%1$s in %2$s</string>
-    <string name="birthday_title_description">Feiere Habiticas 10. Geburtstag mit Geschenken und exklusiven Gegenständen!</string>
-    <string name="jubilant_gryphatrice_confirmation_gift">Du hast den Jubilierenden Greifatrix verschenkt!</string>
-    <string name="resume_damage_2_description">Erfüllst du eine Tagesaufgabe nicht, wird deine Strähne und der Zähler normal zurückgesetzt.</string>
-    <string name="pause_damage_1_title">"Deine verpassten Tagesaufgaben fügen dir keinen Schaden zu "</string>
-    <string name="pause_damage_1_description">Bosse fügen dir weiterhin Schaden zu, wenn andere Gruppenmitglieder ihre Tagesaufgaben verpapssen</string>
-    <string name="habiticans_looking_party_empty">Gerade sucht niemand nach einer Party. Du kannst später noch mal nachschauen!</string>
-    <string name="report_user_explanation">Du solltest einen Spieler nur melden, wenn er gegen die [Community Richtlinien](https://habitica.com/static/community-guidelines) und/oder [AGB](https://habitica.com/static/terms) verstößt. Eine Falschmeldung ist ein Verstoß gegen Habiticas Community Richtlinien.</string>
-    <string name="report_challenge_explanation">Du solltest eine Herausforderung nur melden, wenn sie gegen die [Community Richtlinien](https://habitica.com/static/community-guidelines) und/oder [AGB](https://habitica.com/static/terms) verstößt. Eine Falschmeldung ist ein Verstoß gegen Habiticas Community Richtlinien.</string>
-    <string name="report_failure">Melden fehlgeschlagen, bitte versuche es später erneut</string>
-    <string name="g1g1_promo_info_limitations_noutc">Dies ist ein zeitlich begrenztes Event das am %1$s startet und am %2$s endet. Die Aktion gilt nur für Geschenke an andere Benutzer. Wenn du oder der Empfänger des Geschenks bereits ein Abonnement haben, werden die Monate als Guthaben an das Abonnement angehängt und benutzt, sobald das aktuelle Abonnement endet oder gekündigt wird.</string>
-    <string name="find_more_members">Finde mehr Mitglieder</string>
-    <string name="go_to_settings">Gehe zu Einstellungen</string>
-    <string name="resume_damage">Schaden fortsetzen</string>
-    <string name="resume_damage_1_title">Deine verpassten Tagesaufgaben werden dir keinen Schaden zufügen</string>
-    <string name="resume_damage_2_title">Deine Strähnen und Zähler werden zurückgesetzt</string>
-    <string name="shop_armoire_description">Neue Ausrüstung wird zu saisonalen Galas veröffentlicht. Bis dahin gibt es %d Ausrüstungsgegenstände im Verzauberten Schrank zu finden!</string>
-    <string name="shop_armoire_empty_description">Neue Ausrüstung wird zu saisonalen Galas veröffentlicht. Auch der Verzauberte Schrank bekommt monatlich neue Gegenstände!</string>
-    <string name="unlock_gear_and_skills">Schalte %s Ausrüstung und Fähigkeiten frei</string>
-    <string name="rescind_invite">Beende Einladung</string>
-    <string name="rescinded">Aufgehoben</string>
-    <string name="pending_invite">Einladung ausstehend</string>
-    <string name="invalid_input">Eingabe ungültig</string>
-    <string name="username_requirements">Darf nur die Buchstaben a-z, Nummern, Bindestrich und Unterstrich enthalten</string>
-    <string name="visit_faq">Besuche FAQ</string>
-    <string name="unban_user">Spieler-Bann aufheben</string>
-    <string name="unshadowmute_user">Entferne unsichtbare Stummschaltung</string>
-    <string name="unmute_user">Stummschaltung aufheben</string>
-    <string name="for_for_free_description">Um die Party in Schwung zu halten, verschenken wir Party-Roben, 20 Edelsteine sowie ein limitiertes Umhang-Set und Hintergrund!</string>
-    <string name="ends_in_x">Endet in %s</string>
-    <string name="see_more">Mehr anzeigen</string>
-    <string name="jubilant_gryphatrice_confirmation">Du hast den Jubilierenden Greifatrix gekauft!</string>
-    <string name="undo">Rückgängig</string>
-    <string name="birthday_set">Geburtstags-Set</string>
-    <string name="you_equipped_x">Du hast dich mit %s ausgerüstet</string>
-    <string name="purchase_gryphatrice_confirmation">Kaufe den Jubilierenden Greifatrix für %d Edelsteine\?</string>
-    <string name="empty_potions_description">Schließe Aufgaben oder Elixier-Quests ab, oder gehe zum [Marktplatz](/shops/market) um mehr zu erhalten!</string>
-    <string name="customization_shop_check_out">Besuche den Markt für Individualisierungen, um die vielen Möglichkeiten zur Anpassung Deines Avatar zu durchstöbern!</string>
-    <string name="customization_shop_more">Im Anpassungsshop findest du noch mehr Möglichkeiten, deinen Avatar individuell zu gestalten!</string>
-    <string name="exact_alarm_system_settings_title">„Wecker und Erinnerungen“ deaktiviert</string>
-    <string name="exact_alarm_system_settings_description">Erlaube „Wecker und Erinnerungen“ in der App Einstellungen, damit Erinnerungen exakt zur richtigen Zeit erscheinen</string>
-    <string name="exact_alarm_system_settings_reminders">Erinnerungen könnten verzögert sein, da die Berechtigungen nicht aktiviert sind. Tippe, um die Berechtigungen anzuzeigen und zu aktualisieren.</string>
-    <string name="sell_confirmation_title">Bist Du sicher, dass Du %s verkaufen willst\?</string>
-    <string name="leave_party_confirmation_quest">Bist Du sicher, dass Du diese Party verlassen willst\?</string>
-    <string name="birthday_limitations">Dies ist eine zeitlich begrenzte Veranstaltung, die am %1$s beginnt und am %2$s endet. Die limitierte Ausgabe des Jubilierenden Greifatrix und der zehn Magischen Schlüpfelixiere können in dieser Zeit gekauft werden. Die anderen Geschenke im Gratis-Bereich werden automatisch an alle Accounts ausgegeben, die in den 30 Tagen vor dem Datum der Geschenkübergabe aktiv waren. Accounts, die nach der Geschenkübergabe erstellt wurden, haben keinen Anspruch darauf.</string>
-    <string name="rejoin_party_quest_leader">Du kannst dieser Party ohne Einladung nicht erneut beitreten.
-\n
-\nWenn du diese Party verlässt, beendet du auch die aktuelle Quest.</string>
-    <string name="rejoin_party_quest">Du kannst dieser Party ohne Einladung nicht erneut beitreten.
-\n
-\nWenn du diese Party verlässt, nimmst du auch nicht mehr an deiner aktuellen Quest teil.</string>
-    <string name="contributor_tiers">Mitwirkenden-Level</string>
-    <string name="contrib_tier_description">Wenn du einen Account mit farbigem Benutzernamen und einem Symbol siehst, dann handelt es sich um einen Mitwirkenden-Rang der Person. Ränge werden an Personen vergeben, die im Zusammenhang mit Habitica mitgeholfen haben, z.B. durch Übersetzungen, Code oder hilfreiches Verhalten. Je höher der Rang, desto mehr hat die Person zu Habitica beigetragen.</string>
-    <string name="gem_cap">Edelsteinobergrenze</string>
-    <string name="set">Set</string>
-    <string name="get_12_mystic_hourglasses">Erhalte nach Abschluss deines ersten 12-monatigen Abonnements sofort 12 Mystische Sanduhren!</string>
-    <string name="rescrubscribe_to_pick_up">Abonniere erneut, um dort weiterzumachen, wo Du aufgehört hast!</string>
-    <string name="open_habitica_website">Habitica Webseite öffnen</string>
-    <string name="gem_cap_extra">%d/%d Edelsteinobergrenze</string>
-    <string name="thanks_for_subscribing">Danke für dein Abonnement</string>
-    <string name="twelve_mystic_hourglasses">12 Mystische Sanduhren</string>
-    <string name="valentines">Valentinstag</string>
-    <string name="nye">Silvester</string>
-    <string name="turkey_day">Truthahntag</string>
-    <string name="search_equipment">Ausrüstung suchen</string>
-    <plurals name="items_pending">
-        <item quantity="one">%d Gegenstand wartet</item>
-        <item quantity="other">%d Gegenstände warten</item>
-    </plurals>
-    <plurals name="repeat_yearly">
-        <item quantity="one">jedes Jahr</item>
-        <item quantity="other">alle %d Jahre</item>
-    </plurals>
-    <plurals name="repeat_monthly">
-        <item quantity="one">jeden Monat</item>
-        <item quantity="other">alle %d Monate</item>
-    </plurals>
-    <plurals name="repeat_weekly">
-        <item quantity="one">jede Woche</item>
-        <item quantity="other">alle %d Wochen</item>
-    </plurals>
-    <plurals name="repeat_daily">
-        <item quantity="one">jeden Tag</item>
-        <item quantity="other">alle %d Tage</item>
-    </plurals>
-    <string name="item_footer_title">Bekommst du nicht das richtige %s aus Aufgaben\?</string>
-    <string name="potions">Tränke</string>
-    <string name="quests_footer_description">Schau im [Quest-Shop](/shops/quests) vorbei, um zu sehen, was verfügbar ist!</string>
-    <string name="eggs_footer_description">Schau im [Markt](/shops/market) vorbei, um genau die Eier zu kaufen, die du brauchst!</string>
-    <string name="empty_eggs_description">Schließe Aufgaben und Ei-Quests ab oder besuche den [Markt](/shops/market), um dich einzudecken!</string>
-    <string name="quests_footer_title">Möchtest du mehr Quests\?</string>
-    <string name="empty_special_description_subscribed">Erhalte Verwandlungsgegenstände während der saisonalen Galas, und Mystery-Boxen mit Abonnenten-Ausrüstung werden zu Beginn jedes Monats geliefert!</string>
-    <string name="item_footer_description">Schau im [Markt](/shops/market) vorbei, um genau das zu kaufen, was du brauchst!</string>
-    <string name="sub_perk">ABO-VORTEIL</string>
-    <string name="subscribe_incentive_text_armoire">Erhalte jede Mal eine zusätzliche Chance auf den Schrank, wenn du ihn mit einem Abonnement kaufst</string>
-    <string name="subscriber_button_faint">Zweite Chance: Halte durch mit 1HP!</string>
-    <string name="quest_mechanics">Quest-Mechaniken</string>
-    <string name="quest_mechanics_boss_title">Einem Boss Schaden zufügen</string>
-    <string name="hatchingPotions_footer_description">Schau im [Markt](/shops/market) vorbei, um Standard- und saisonale Bruttränke zu kaufen!</string>
-    <string name="share_avatar">Avatar teilen</string>
-    <string name="customize_avatar">Avatar anpassen</string>
-    <string name="subscribe_listitemArmoire">Doppelte Schrank-Belohnungen</string>
-    <string name="subscribe_listitemArmoire_description">Erhalte jedes Mal zwei Chancen, neue Ausrüstung zu bekommen, wenn du den Verzauberten Schrank öffnest!</string>
-    <string name="subscribe_incentive_text_faint">Mit einem Abonnement erhälst du jeden Tag eine zweite Chance, um zu verhindern, dass dir die HP ausgehen</string>
-    <string name="subscriber_benefit_used_faint">Du hast deine zweite Chance heute bereits genutzt. Sie ist wieder verfügbar in %s</string>
-    <string name="subriber_benefit_notification_faint">Du hast eine zweite Chance mit 1HP erhalten!</string>
-    <string name="quest_mechanics_collecting_title">Quest-Gegenstände sammeln</string>
-    <string name="quest_mechanics_boss_description">Schließe jede Art von Aufgabe ab oder nutze Fähigkeiten, um ausstehende Schäden zu sammeln! Der Schaden wird beim nächsten Tages-Reset angewendet. Stärke beeinflusst, wie viel Schaden du anrichtest.</string>
-    <string name="quest_mechanics_collecting_description">Wenn du auf einer Sammel-Quest bist, schließe deine Aufgaben ab, um eine zufällige Chance zu haben, einen Quest-Gegenstand zu finden. Ausstehende Gegenstände werden beim nächsten Tages-Reset angewendet. Wahrnehmung erhöht die Wahrscheinlichkeit, Gegenstände zu finden.</string>
-    <string name="quest_mechanics_damage_title">Bosse schlagen zurück, wenn tägliche Aufgaben verpasst werden</string>
-    <string name="open_profile">Profil öffnen</string>
-    <string name="subscribe_second_chance_incentive_text">Abonnenten erhalten jeden Tag eine zweite Chance im Leben und diese weiteren Vorteile!</string>
-    <string name="watch_ad_to_hang_on">Schau dir eine Werbung an, um mit 1HP durchzuhalten!</string>
-    <string name="subscribe_second_armoire_open_text">Abonnenten erhalten zusätzliche Chancen auf den Schrank und diese weiteren Vorteile!</string>
-    <string name="auth_get_credentials_error">Fehler beim Abrufen der Anmeldedaten zur Authentifizierung.</string>
-    <string name="auth_invalid_credentials">Ungültige Anmeldedaten erhalten.</string>
-    <string name="auth_unknown_error">Unbekannter Fehler bei der Authentifizierung.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 7dbea2a1d..f826e9c31 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -537,11 +537,11 @@
     <string name="world_boss">World Boss</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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="strike_active_description">Our beloved %1$s was devastated when the %2$s shattered the %3$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>
@@ -677,7 +677,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Authentication Methods</string>
     <string name="someone">Someone</string>
-    <string name="invitation_title">%s invited you to join their group %s</string>
+    <string name="invitation_title">%1$s invited you to join their group %2$s</string>
     <string name="password_too_short">Your password has to be at least %d characters long</string>
     <string name="copy_username">Copy Username</string>
     <string name="id_copied">Copied User ID to clipboard</string>
@@ -829,8 +829,8 @@
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
-    <string name="gift_confirmation_text_sub">You sent %s a %s-month Habitica subscription.</string>
-    <string name="gift_confirmation_text_sub_g1g1">You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
+    <string name="gift_confirmation_text_sub">You sent %1$s a %2$s-month Habitica subscription.</string>
+    <string name="gift_confirmation_text_sub_g1g1">You sent %1$s a %2$s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
     <string name="gift_gems_subtitle">Choose the gem packet you’d like to gift below!</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="insufficientGoldTitle">Not Enough Gold</string>
@@ -979,16 +979,16 @@
     <string name="hatch_pet_again">Hatch Pet again</string>
     <string name="unhatched_pet">Unhatched Pet</string>
     <string name="hatch_pet">Hatch Pet</string>
-    <string name="suggest_pet_hatch_again_missing_both">You need a %s and %s Potion to hatch this pet again</string>
+    <string name="suggest_pet_hatch_again_missing_both">You need a %1$s and %2$s Potion to hatch this pet again</string>
     <string name="suggest_pet_hatch_again_missing_potion">You still need a %s Potion to hatch this pet again</string>
     <string name="suggest_pet_hatch_again_missing_egg">You still need a %s Egg to hatch this pet again</string>
-    <string name="suggest_pet_hatch_missing_both">You need a %s and %s Potion to hatch this pet</string>
+    <string name="suggest_pet_hatch_missing_both">You need a %1$s and %2$s Potion to hatch this pet</string>
     <string name="suggest_pet_hatch_missing_potion">You still need a %s Potion to hatch this pet</string>
     <string name="suggest_pet_hatch_missing_egg">You still need a %s Egg to hatch this pet</string>
     <string name="view_onboarding_tasks">View Onboarding Tasks</string>
     <string name="equip">Equip</string>
     <string name="unequip">Unequip</string>
-    <string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %s3$s\?</string>
+    <string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %3$ss\?</string>
     <string name="purchaseX">Purchase %d</string>
     <string name="excessItemsXLeft">You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d\?</string>
     <string name="excess_items">Excess Items</string>
@@ -1007,7 +1007,7 @@
     <string name="purchasedEquipmentTitle">Purchased Equipment</string>
     <string name="fedPetTitle">Fed a Pet</string>
     <string name="hatchedPetTitle">Hatched a Pet</string>
-    <string name="can_hatch_pet">Combine your %s Egg and %s Potion to hatch this pet!</string>
+    <string name="can_hatch_pet">Combine your %1$s Egg and %2$s Potion to hatch this pet!</string>
     <string name="createdTaskTitle">Created your first task</string>
     <string name="completedTaskTitle">Completed a task</string>
     <string name="purchase_equipment_description">Equipment is a way to customize your avatar and improve your stats</string>
@@ -1029,10 +1029,10 @@
     <string name="block_user_title">Block %s\?</string>
     <string name="unblock_user">Unblock User</string>
     <string name="block_user">Block User</string>
-    <string name="fall_promo_info_instructions">Between September %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="fall_promo_info_instructions">Between September %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="limitations">Limitations</string>
     <string name="how_it_works">How it works</string>
-    <string name="x_to_y">%s to %s</string>
+    <string name="x_to_y">%1$s to %2$s</string>
     <string name="usually_x_gems">Usually %d Gems</string>
     <string name="pms_disabled_description">You can still send messages, but no one can send them to you. You can enable again from Settings.</string>
     <string name="pms_disabled">Private Messages are disabled</string>
@@ -1040,7 +1040,7 @@
     <string name="block">Block</string>
     <string name="block_user_description">A blocked user cannot send you Private Messages but you will still see their posts. This will have no effect if the person is a moderator now or in the future.</string>
     <string name="spooky_promo_info_prompt">The Gem Sale is back to haunt the very end of this year’s Fall Gala! This is one last chance to get more Gems than ever, so stock up while it lasts!</string>
-    <string name="spooky_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="spooky_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="view_gem_bundles">View Gem Bundles</string>
     <string name="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time for a Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 90973233c..b815ba61f 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -69,8 +69,8 @@
     <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_header">¡Te has quedado sin Puntos de salud!</string>
-    <string name="faint_button">Recupera Puntos de Salud y Vuelve a Intentarlo</string>
+    <string name="faint_header">¡Te has quedado sin puntos de salud!</string>
+    <string name="faint_button">Recuperar todos los puntos de 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>
@@ -532,12 +532,12 @@
     <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">Ataque de ira: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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">Misiones</string>
+    <string name="strike_active_description">Nuestro querido %1$s fue destrozado cuando el %2$s desmenuzó el %3$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>
@@ -683,7 +683,7 @@
     <string name="facebook">Facebook</string>
     <string name="authentication_methods">Métodos de autentificación</string>
     <string name="someone">Alguien</string>
-    <string name="invitation_title">%s te invitó a unirte a su grupo %s</string>
+    <string name="invitation_title">%1$s te invitó a unirte a su grupo %2$s</string>
     <string name="copy_username">Copiar nombre de usuario</string>
     <string name="id_copied">Copiar ID de usuario al portapapeles</string>
     <string name="copy_userid">Copiar ID de usuario</string>
@@ -802,8 +802,8 @@
     <string name="gift_confirmation_text_sub">Regalaste a @%1$s una suscripción de Habitica de %2$s meses.</string>
     <string name="gift_confirmation_text_sub_g1g1">Regalaste a %1$s una suscripción de %2$s meses y se ha aplicado la misma suscripción a tu cuenta por nuestra promoción de Regala Una Llévate Una Gratis.</string>
     <string name="join_party_description_guild">¡Da el nombre de usuario de abajo a un amigo o ve al %s para conocer a camaradas potenciales!</string>
-    <string name="number_responded">%1$d/%2$d Respondió</string>
-    <string name="fall_promo_info_instructions">Entre el %s y el %s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más Gemas para gastar, compartir o ahorrar para cualquier evento futuro!</string>
+    <string name="number_responded">%1$d/%2$d respondió</string>
+    <string name="fall_promo_info_instructions">Entre el %1$s y el %2$s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más Gemas para gastar, compartir o ahorrar para cualquier evento futuro!</string>
     <string name="spooky_promo_info_prompt">¡La Venta de Gemas está de vuelta para atormentar el final de la Gala de Otoño de este año! Esta es la última oportunidad de conseguir más Gemas que nunca ¡así que aprovecha mientras dure!</string>
     <string name="preference_email_onboarding">Orientación para establecer tu cuenta de Habitica</string>
     <string name="game_mechanics">Mecánicas del Juego</string>
@@ -817,7 +817,7 @@
     <string name="experience_points">Puntos de Experiencia</string>
     <string name="purchaseX">Comprar %d</string>
     <string name="excessItemsXLeft">Solo necesitas %1$d %2$s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %3$d\?</string>
-    <string name="spooky_promo_info_instructions">Entre el %s y el %s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más gemas para gastar, compartir o guardar para cualquier evento futuro!</string>
+    <string name="spooky_promo_info_instructions">Entre el %1$s y el %2$s, compra cualquier paquete de gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de gemas. ¡Más gemas para gastar, compartir o guardar para cualquier evento futuro!</string>
     <string name="view_gem_bundles">Ver paquetes de Gemas</string>
     <string name="fall_promo_info_prompt">La Gala de Otoño está en pleno apogeo, así que pensamos que era el momento perfecto para presentar nuestra primera Venta de Gemas! Ahora obtendrás más gemas con cada compra como nunca antes.</string>
     <string name="defeat">Derrota</string>
@@ -1120,7 +1120,7 @@
     <string name="discard_changes_to_task_message">¿Está seguro de descartar los cambios de esta tarea\?</string>
     <string name="subscription_confirmation">Ahora estás suscrito por 1 mes</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">¿Quieres cambiar tu clase a %s por %d Gemas\?</string>
+    <string name="class_confirmation_price">¿Quieres cambiar tu clase a %1$s por %2$d Gemas\?</string>
     <string name="use_item">Usa el objeto en un miebro del grupo</string>&gt;
     <string name="unsaved_changes">Cambios sin guardar</string>
     <string name="gift_confirmation_text_gems_new">Has enviado %2$s gemas a @%1$s.</string>
@@ -1363,257 +1363,4 @@
     <string name="time_management">Manejo de Tiempo + Responsabilidad</string>
     <string name="getting_organized">Organizándose</string>
     <string name="assigned_to_you_by">Se te fue asignado por @%1$s en %2$s</string>
-    <string name="report_message_explanation">Debes denunciar una publicación si infrinje las [Normas de la comunidad](https://habitica.com/static/community-guidelines) y/o [Condiciones del servicio](https://habitica.com/static/terms). Enviar una denuncia falsa es una violación de las Normas de la comunidad de Habitica.</string>
-    <string name="cds_subtitle">Ajusta cuándo cambia tu día después de la hora predeterminada de la medianoche.</string>
-    <string name="gems_support">La compra de gemas apoya a nuestro pequeño equipo en Habitica</string>
-    <string name="stripe_payment">Pago por Stripe</string>
-    <string name="on_the_x_of_month">en el %1$s %2$s del mes</string>
-    <string name="gryphatrice_description">¡La rara Gryphatrice jubilosa se une a la fiesta de cumpleaños! No pierdas la oportunidad de tener esta mascota animada exclusiva.</string>
-    <string name="resume_damage_3_description">Cualquier daño pendiente o artículo de colección se aplicará en el reinicio del día siguiente</string>
-    <string name="reset_account_description_new">Perderás todos tus niveles, oro y experiencia. Todas tus tareas y datos históricos serán borrados ( Las tareas de desafios se mantendrán) Perderas todo tu equipo, excepto los items de Suscriptor y los items gratuitos conmemorativos, pero estrán disponibles para poder comprarlos de nuevo. Necesitarás ser la clase correcta para volver a comprar equipo específico de esaclase. Conservarás tu clase actual, tus logros y tus mascotas y monturas. Para confirmar el restablecimiento, escriba su contraseña a continuación.</string>
-    <string name="reset_account_description_no_pw">Perderás todos tus niveles, oro y experiencia. Todas tus tareas y sus datos históricos se eliminarán (las tareas de desafío permanecerán). Perderás todo el equipo, excepto los artículos de suscriptor y los artículos conmemorativos gratuitos, pero podrás volver a comprarlos. Tendrás que ser de la clase correcta para volver a comprar equipo específico de clase. Conservarás tu clase actual, tus logros y tus mascotas y monturas. Para confirmar el restablecimiento, escriba RESET a continuación..</string>
-    <string name="report_user_explanation">Solo debes denunciar a un jugador si infringe las [Normas de la comunidad](https://habitica.com/static/community-guidelines) y/o [Condiciones del servicio](https://habitica.com/static/terms). Enviar una denuncia falsa es una violación de las Normas de la comunidad de Habitica..</string>
-    <string name="report_challenge_explanation">Solo debes denunciar un desafío si infringe las [Normas de la comunidad](https://habitica.com/static/community-guidelines) y/o [Condiciones del servicio](https://habitica.com/static/terms). Enviar una denuncia falsa es una violación de las Normas de la comunidad de Habitica.</string>
-    <string name="gems_promo_info_limitations_fixed">Esta promoción solo se aplica durante el evento por tiempo limitado. Este evento comienza en %1$s (%2$s) y finalizará %3$s (%4$s). La oferta promocional solo está disponible al comprar gemas para ti.</string>
-    <string name="advocacy_causes">Abogacia + Causas</string>
-    <string name="animated_gryphatrice_pet">Mascota Gryphatrice jubilosa</string>
-    <string name="purchase_gryphatrice_confirmation">Comprar la Grifatriz jubilosa for %d Gemas\?</string>
-    <string name="copy_tasks_description">Mostrar tareas asignadas y abiertas en sus listas de tareas personales</string>
-    <string name="copy_shared_tasks">Copiar tareas compartidas</string>
-    <string name="group_plan_settings">Configuración del plan de grupo</string>
-    <string name="subscribers_mythic_hourglasses"><i>Los suscriptores reciben Relojes de Arena Místicos dentro de los primeros tres días del mes.</i></string>
-    <string name="adventure_guide_description_new">¡Completa estos objetivos y ganarás 5 logros y el color de texto: = #EE9109&gt;100 oro una vez que hayas terminado!</string>
-    <string name="not_set" tools:override="true">No establecido</string>
-    <string name="armoire_drop_rates">Posibilidad de botín de armario</string>
-    <string name="enchanted_armoire_drop_rates">Porcentajes de Drop de armaduras encantadas</string>
-    <string name="delete_account_subscription_active">No puedes eliminar tu cuenta mientras tengas una suscripción activa. Por favor, cancele la suscripción primero.</string>
-    <string name="death_description">¡Pero puedes recuperarlos todos con trabajo duro! Buena suerte, lo harás muy bien.</string>
-    <string name="faint_broken_equipment">El equipo roto se puede volver a comprar
-\ndesde el Mercado</string>
-    <string name="faint_loss_description">Caerás al nivel <b>%d</b>, perderás <b>%d</b> oro y se <b>ha roto una pieza de equipo</b>... ¡Puedes recuperarlos todos con trabajo duro!</string>
-    <string name="manager">Manager</string>
-    <string name="message_flagged">Mensaje marcado %d veces.</string>
-    <string name="paypal">Paypal</string>
-    <string name="plenty_of_potions_description">Vamos a traer de vuelta 10 de las pociones mágicas de eclosión favoritas de la comunidad. ¡Dirígete al mercado para completar tu colección!</string>
-    <string name="for_for_free_description">Para que la fiesta continúe, regalaremos batas de fiesta, 20 gemas y un conjunto de capa y fondo de edición limitada!</string>
-    <string name="armoire_rate_equipment_description">Cada mes se añaden nuevas piezas de equipamiento. Si tienes todas las piezas de equipo, obtendrás comida o experiencia, probabilidades de 50/50.</string>
-    <string name="added_social_auth">Autenticación %s añadida</string>
-    <string name="subscription_credit_canceling">Tus <b>+%d</b> de suscripción mensual se activarán tras la cancelación</string>
-    <string name="self_improvement">Superación personal</string>
-    <string name="todo_summary_description">Esta es una tarea **%1$s** que no tiene fecha de vencimiento.</string>
-    <string name="daily_summary_description">Esta es una tarea **%1$s** que repite **%2$s%3$s**.</string>
-    <string name="unmute_user">Activar sonido al jugador</string>
-    <string name="shadow_mute_user">Silencio de sombra</string>
-    <string name="unban_user_confirm">¿Quieres desbanear a este jugador\?</string>
-    <string name="mute_user_confirm">¿Quieres revocar el acceso al chat de este jugador\?</string>
-    <string name="unmute_user_confirm">¿Quieres devolver el acceso al chat para este jugador\?</string>
-    <string name="shadowmute_user_confirm">¿Quieres silenciar a este jugador\?</string>
-    <string name="unshadowmute_user_confirm">¿Quieres eliminar el mute al usuario \?</string>
-    <string name="unban_user">Desbanear Jugador</string>
-    <string name="unshadowmute_user">Remover mute al jugador</string>
-    <string name="shadow_muted_hidden">Muteado escondido</string>
-    <string name="birthday_limitations">Este es un evento de tiempo limitado que comienza en %1$s y terminará %2$s. La edición limitada de Gryphatrice jubilante y las diez pociones mágicas para eclosionar estarán disponibles para su compra durante este tiempo. Los otros regalos enumerados en la sección Cuatro gratis se entregarán automáticamente a todas las cuentas que estuvieron activas en los 30 días anteriores al día en que se envió el regalo. Las cuentas creadas después de que se envíen los regalos no podrán reclamarlos.</string>
-    <string name="jubilant_gryphatrice_confirmation">Has comprado la Grifatriz jubilosa!</string>
-    <string name="jubilant_gryphatrice_confirmation_gift">Has regalado la Grifatriz jubilosa!</string>
-    <string name="pause_damage_3_title">Tu progreso en esta Misión permanecerá pendiente</string>
-    <string name="shop_armoire_description">El Nuevo Equipamiento se publica durante las diferentes Galas estaciónales. Hasta ese momento ¡hay %d piezas de Equipo en el Armario Encantado que aún puedes conseguir!</string>
-    <string name="no_x">Sin %s</string>
-    <string name="pause_damage_2_description">Las rachas de Tareas Diarias y los contadores de Hábitos solo aumentarán si esto está activado</string>
-    <string name="item_footer_title">¿No obtienes los %s que necesitas al completar tus tareas\?</string>
-    <string name="pause_damage_1_title">"Tus Tareas Diarias no completadas no te producirán daño "</string>
-    <string name="pause_damage_1_description">Los Monstruos aún así te producirán daño si otros miembros de tu Equipo no completan sus Tareas Diarias</string>
-    <string name="empty_eggs_description">¡Completa las Tareas, las Misiones de Mascotas o dirígete a el [Mercado] (/tiendas/mercado) para aumentar tu inventario!</string>
-    <string name="item_footer_description">¡Mira en el [Mercado](/tiendas/mercado) para comprar lo que necesites!</string>
-    <string name="quests_footer_description">¡Mira en la [Tienda de Misiones](/tiendas/misiones) para ver las que están disponibles!</string>
-    <string name="quests_footer_title">¿Deseas hacer más Misiones\?</string>
-    <string name="unlock_gear_and_skills">Desbloquea %s de Equipamiento y habilidades</string>
-    <string name="empty_quests_description">¡Obtén Misiones al alcanzar ciertos niveles, bonus de inicio de sesión o la [Tienda de Misiones] (/tienda/misiones)!</string>
-    <string name="empty_potions_description">¡Completa las Tareas, las Misiones de Poción o dirígete a el [Mercado] (/tiendas/mercado) para aumentar tu inventario!</string>
-    <string name="shop_armoire_empty_description">El Nuevo Equipamiento se publica durante las diferentes Galas estaciónales. ¡Hasta ese momento puedes encontrar nuevas piezas de equipo en el Armario Encantado cada mes!</string>
-    <string name="empty_special_description_subscribed">¡Obtén artículos para convertir durante las Galas Estaciónales y las cajas misteriosas de Equipamiento para suscriptores se publican al inicio de cada mes!</string>
-    <string name="empty_food_description">¡Completa las Tareas, compra en el Armario Encantado o dirígete a el [Mercado] (/tiendas/mercado) para aumentar tu inventario!</string>
-    <string name="pause_damage_3_description">El daño causado al monstruo o la búsqueda de artículos permanecerá en suspenso hasta que se reactive el daño</string>
-    <string name="seeking_party_description">¿Quiera unirte a un Equipo con otros jugadores pero no conoces a ninguno\? ¡Haz saber a los lideres de Equipo lo que buscas y tu disponibilidad!</string>
-    <string name="seeking_hint">No dejes de buscar que alguien te invite a su Equipo o si no crea tu propio Equipo en cualquier momento</string>
-    <string name="equipment_class_locked">Este Equipamiento está reservado solo para una clase específica</string>
-    <string name="rescinded">Rescindido</string>
-    <string name="invalid_input">Entrada no válida</string>
-    <string name="username_requirements">Solo puede contener letras de la a a la z, números, guiones o guiones bajos</string>
-    <string name="contributor_tiers">Niveles de Colaboradores</string>
-    <string name="contrib_tier_description">Si ves que una cuenta de usuario tiene el nombre coloreado y un icono al lado, ¡eso es un nivel de colaborador! Estos niveles se asignan a aquellos que ayudan al desarrollo de Habitica, ya sea por medio de traducir, crear código, o solo ayudando donde sea necesario. Cuanto más alto sea el nivel de colaborador más habrá contribuido ese jugador a Habitica.</string>
-    <string name="eggs_footer_description">¡Mir en el [Mercado](/tiendas/mercado) para comprar los huevos que necesites o desees!</string>
-    <string name="food_footer_description">¡Mira en el [Mercado](/tiendas/mercado) para comprar el tipo de comida o una Silla de Montar para domar a tu Mascota instantáneamente!</string>
-    <string name="hatchingPotions_footer_description">¡Mira en el [Mercado](/tiendas/mercado) para adquirir Pociones Eclosionadoras tanto estándar como estaciónales!</string>
-    <string name="subscribe_listitemArmoire">El doble de recompensas en el Armario Encantado</string>
-    <string name="subscribe_listitemArmoire_description">¡Obtén dos intentos para conseguir equipamiento nuevo cada vez que abras el Armario Encantado!</string>
-    <string name="subscribe_incentive_text_armoire">Si te has suscrito tienes un intento más en el Armario Encantado cada que vez que lo compres</string>
-    <string name="subscribe_incentive_button_armoire">¡Hazte suscriptor para abrirlo de nuevo gratis!</string>
-    <string name="subscribe_second_armoire_open_text">¡Los suscriptores obtienen un intento más en el Armario Encantado y estos otros beneficios!</string>
-    <string name="subscriber_button_faint">Segundo intento: ¡Continúa con solo 1 punto de vida (HP)!</string>
-    <string name="sub_perk">BENEFICIO EXTRA</string>
-    <string name="subriber_benefit_notification_faint">¡Tienes una segunda oportunidad pero con solo 1 Punto de Vida (HP)!</string>
-    <string name="subscribe_incentive_text_faint">Obtén cada día al estar suscrito una segunda oportunidad de perder todos tus puntos de vida (HP)</string>
-    <string name="subscribe_second_chance_incentive_text">¡Los suscriptores obtienen cada día una segunda oportunidad de mantenerse con vida y otros beneficios!</string>
-    <string name="quest_mechanics">Mecánicas de Misión</string>
-    <string name="quest_mechanics_boss_description">¡Completa cualquier tipo de tarea o usa habilidades para acumular daño pendiente! El daño se aplicará al reinicio el día siguiente. La Fuerza afecta cuanto daño haces.</string>
-    <string name="quest_mechanics_collecting_title">Coleccionar Artículos de Misión</string>
-    <string name="quest_mechanics_collecting_description">Cuando estés en una Misión de Colección, completa tus tareas por una oportunidad de conseguir un artículo de Misión. Los artículos pendientes se aplicarán al reinicio el día siguiente. La Percepción aumenta la proporción de artículos.</string>
-    <string name="quest_mechanics_damage_title">Los Jefes golpean por Tareas Diarias perdidas</string>
-    <string name="subscribe_listitem2_description_2">Gana Relojes de Arena Místicos para poder adquirir objetos en la tienda de Viajeros del Tiempo</string>
-    <string name="preference_push_invited_to_group_plan">Invitado a un Plan de Grupo</string>
-    <string name="faint_subscriber_description">Tu suscripción te permite una segunda oportunidad de mantenerte con vida al día si te quedas sin Puntos de Vida (HP)</string>
-    <string name="subscribe_hourglass_incentive_text">¡Los suscriptores obtienen Relojes de Arena Místicos cada mes además de estos otros beneficios exclusivos!</string>
-    <string name="subscribe_prompt_2">¡Suscríbete para comprar Gemas por Monedas de Oro y así recibir beneficios exclusivos!</string>
-    <string name="quest_mechanics_rage_description">Algunos Jefes especialmente fuertes tienen un Medidor de Rabia de color naranja debajo de sus Puntos de Vida (HP). Esta barra se va llenando a medida que los diferentes miembros del equipo no completan sus Tareas Diarias. Cuando esta barra o medidor está completamente llena, el Jefe, ¡realizará un ataque terrible que os producirá daño extra!</string>
-    <string name="preference_email_content_release">Publicación de contenido + Eventos</string>
-    <string name="quest_mechanics_damage_description">El daño de un Jefe se calcula cada vez que un miembro del Equipo ingresa en Habitica a lo largo del día. Este daño se aplica la siguiente vez que haces una acción que produce que el servidor se sincronice. El daño del Jefe se registra en la sala de chat del Equipo.</string>
-    <string name="quest_mechanics_pausing_description">"Si estas teniendo problemas a la hora de completar tus Tareas Diarias, puedes poner el daño en pausa y así darte un descanso. Esto evitará que el Jefe te dañe a ti o a otros pero también pondrá en pausa el daño que tu podrías causarle. Aún así, las Tareas Diarias no completadas de otros miembros del Equipo si que te dañaran así que, ¡ve con mucho cuidado! "</string>
-    <string name="subscribe_listitemArmoire_description_2">Cada vez que abras el Armario Encantado, ¡podrás abrirlo de nuevo gratis!</string>
-    <string name="rage">Rabia</string>
-    <string name="quest_mechanics_rage_title">Medidor de Rabia</string>
-    <string name="preference_push_joined_group_plan_mention">\@Menciones en Planes de Grupo</string>
-    <string name="subscription_benefit_armoire_sub">¡Tu suscripción te permite una segunda oportunidad en el Armario Encantado!</string>
-    <string name="subscriber_benefit_success_faint">¡Obtienes una segunda oportunidad pero sólo con 1PV!</string>
-    <string name="revive_broken_equipment">Tu %s se rompe</string>
-    <string name="subscribe_gems_for_gold_incentive_text">¡Suscríbete para comprar Gemas con Monedas de oro y recibir estos otros beneficios exclusivos!</string>
-    <string name="no_saddles">No tienes ninguna Silla de Montar</string>
-    <string name="purchase_saddles_in_market">Las Sillas de Montar desarrollan instantáneamente una Mascota a Montura. Puedes comprar una en el Mercado.</string>
-    <string name="error_loading_member">No se ha podido encontrar al jugador</string>
-    <string name="error_loading_member_body">Se produjo un error cuando se estaban cargando los datos de este jugador. Por favor asegúrate que escribiste el @nombre de usuario correctamente.</string>
-    <string name="report_challenge">Informe del Desafío</string>
-    <plurals name="items_pending">
-        <item quantity="one">%d Artículo pendiente</item>
-        <item quantity="many">%d Artículos pendientes</item>
-        <item quantity="other">%d de otros Artículos pendientes</item>
-    </plurals>
-    <string name="subscriber_benefit">BENEFICIO DE SUSCRIPTOR</string>
-    <plurals name="repeat_yearly">
-        <item quantity="one">cada año</item>
-        <item quantity="many">cada %d años</item>
-        <item quantity="other">ciclos de %d años</item>
-    </plurals>
-    <plurals name="repeat_weekly">
-        <item quantity="one">cada semana</item>
-        <item quantity="many">cada %d semanas</item>
-        <item quantity="other">ciclos de %d semanas</item>
-    </plurals>
-    <plurals name="repeat_monthly">
-        <item quantity="one">cada mes</item>
-        <item quantity="many">cada %d meses</item>
-        <item quantity="other">ciclos de %d meses</item>
-    </plurals>
-    <plurals name="you_x_others">
-        <item quantity="one">Tu, %d a otro</item>
-        <item quantity="many">Tu, %d a otros</item>
-        <item quantity="other">Tu, %d a algunos</item>
-    </plurals>
-    <plurals name="people">
-        <item quantity="one">%d Persona</item>
-        <item quantity="many">%d Personas</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="monthly_backgrounds">Fondos Mensuales</string>
-    <string name="winter">Invierno</string>
-    <string name="spring">Primavera</string>
-    <string name="summer">Verano</string>
-    <string name="fall">Otoño</string>
-    <plurals name="x_minutes">
-        <item quantity="one">%d Minuto</item>
-        <item quantity="many">%d Minutos</item>
-        <item quantity="other">%d Minutos</item>
-    </plurals>
-    <string name="animal_tails">Colas de Animales</string>
-    <string name="avatar_shirts">Camisetas</string>
-    <string name="avatar_skins">Pieles</string>
-    <string name="avatar_hair_styles">Estilos de Peinado</string>
-    <string name="avatar_mustaches">Bigotes</string>
-    <string name="avatar_beards">Barbas</string>
-    <string name="avatar_accents">Estilismos</string>
-    <string name="standard_backgrounds">Fondos Estándar</string>
-    <string name="avatar_hair_colors">Colores de Pelo</string>
-    <string name="looking_for_more">¿Buscas alguna cosa más\?</string>
-    <plurals name="x_hours">
-        <item quantity="one">%d Hora</item>
-        <item quantity="many">%d Horas</item>
-        <item quantity="other">%d Horas</item>
-    </plurals>
-    <plurals name="x_days">
-        <item quantity="one">%d Día</item>
-        <item quantity="many">%d Días</item>
-        <item quantity="other">%d Días</item>
-    </plurals>
-    <string name="customizations_owner">Aciertos</string>
-    <string name="customization_shop_more">¡Ve a la Tienda de Personalización para encontrar más formas de personalizar tu avatar!</string>
-    <string name="customizations">Personalizaciones</string>
-    <string name="customizations_no_owned">No tienes ninguno de estos artículos</string>
-    <string name="customization_shop_check_out">¡Dirigente de inmediato a la Tienda de Personalización para explorar las muchas y diferentes formas en que puedes personalizar tu avatar!</string>
-    <string name="switches_in_x">Conecta %s</string>
-    <string name="tap_to_reload">Refresca la sesión para nuevos artículos</string>
-    <string name="class_equipment_shop_dialog_new">Este objeto solo está disponible para %s. Ve a Ajustes para cambiar de clase.</string>
-    <string name="insufficient_level_equipment_dialog_new">Este objeto solo está disponible para %s. Puedes elegir una clase cuando hayas alcanzado nivel 10.</string>
-    <string name="you_own_all_items">Ya tienes todos estos objetos</string>
-    <string name="try_on_customize">Puedes probártelos para personalizar tu avatar.</string>
-    <string name="try_on_next_month">Puedes probártelos para personalizar tu avatar. ¡Eso si, vuelve a comprobar más adelante para conocer las opciones del próximo mes!</string>
-    <string name="try_on_next_season">Puedes probártelos para personalizar tu avatar. ¡Eso si, vuelve a comprobar más adelante para conocer las opciones de la próxima temporada!</string>
-    <string name="try_on_equipment">Puedes probártelos desde Equipamiento. ¡Nuevos artículos al principio de cada mes!</string>
-    <string name="healers">Sanadores</string>
-    <string name="rogues">Picaros</string>
-    <string name="mages">Magos</string>
-    <string name="warriors">Guerreros</string>
-    <string name="equipment">Equipamiento</string>
-    <string name="customizing_your_avatar">personalizando tu avatar</string>
-    <string name="customization_shop">Tienda de Personalización</string>
-    <string name="error">Error</string>
-    <string name="error_loading_gems">Ha ocurrido un error cargando las gemas</string>
-    <string name="clear_database">Borrar Base de Datos</string>
-    <string name="clear_cache_settings">Limpiar el Cache</string>
-    <string name="faint_loss_description_alt">Bajaras a nivel <b>%d</b>, perderás <b>%d</b> de Oro y y toda la Experiencia...¡Puedes recuperarlo todo trabajando duro!</string>
-    <string name="unlocks_x_gems_per_month">Ellos desbloquean %d Gemas por mes en el Mercado</string>
-    <string name="best_deal">Mejor Oferta</string>
-    <string name="two_gems_per_month">Gana +2 Gemas cada mes que estás suscrito</string>
-    <string name="popular">Popular</string>
-    <string name="choose_member">Elige Miembro</string>
-    <string name="cleared_cache">Borrar Cache</string>
-    <string name="subscribe_listitem3_description_alt">¡Sigue yendo a la moda con lo último en equipamiento exclusivo. Suscríbete ahora y consigue %1$s de %2$s!</string>
-    <string name="see_other_sub_options">Ver otras opciones de suscripción</string>
-    <string name="benefits_end">Los Beneficios terminan en %s</string>
-    <string name="resubscribe_description_gift">¿Te gustaría seguir recibiendo los beneficios de suscriptor\? Puedes contratar una suscripción recurrente para mantener los beneficios activos.</string>
-    <string name="unlock_x_gems_per_month">Desbloquea %d Gemas por mes en el Mercado</string>
-    <string name="x_gems">%d Gemas</string>
-    <string name="two_gems_per_month_gift">Ganas +2 Gemas cada mes que ellos están suscritos</string>
-    <string name="plus_two_gems">+2 Gemas</string>
-    <string name="enjoy_benefits">Disfruta de todos estos beneficios exclusivos con tu suscripción</string>
-    <string name="resubscribe_for_hourglasses">Suscríbete otra vez para seguir recibiendo Relojes de Arena místicos</string>
-    <string name="max_gem_cap">Límite máximo de Gemas</string>
-    <string name="twelve_mystic_hourglasses">12 Relojes de Arena místicos</string>
-    <string name="thanks_for_subscribing">Gracias por suscribirte</string>
-    <string name="set">Conjunto</string>
-    <string name="rescrubscribe_to_pick_up">¡Vuelve a suscribirte para recoger lo que te dejaste!</string>
-    <string name="gem_cap_extra">%d/%d Capacidad de Gemas</string>
-    <string name="gem_cap">Capacidad de Gemas</string>
-    <string name="get_12_mystic_hourglasses">¡Obtén 12 Relojes de Arena místicos inmediatamente cuánto te hayas suscrito por 12 meses!</string>
-    <string name="subscription_details_footer">Los Suscriptores reciben un Reloj de Arena Místico, un Misterioso Conjunto de Equipamiento, y un nuevo paquete de Gemas en los dos primeros días del mes</string>
-    <string name="cancel_subscription_apple_description">¿Ya no quieres seguir suscrito\? Debido al método de pago que usaste, tienes que cancelar la suscripción a través de los Ajustes de suscripciones de tu ID de Apple en tu dispositivo iOS.</string>
-    <string name="open_habitica_website">Abre la Página Web de Habitica</string>
-    <string name="g1g1_promo_info_limitations_noutc">Este es un evento de tiempo limitado que empieza el %1$s y termina el %2$s. Está promoción solo se aplica cuando la regalas a otro Habiticano. Cuando tu o la persona que recibió tu regalo ya tengáis una suscripción activa, la suscripción de regalo se añadirá como crédito que se activará al finalizar la actual suscripción.</string>
-    <string name="nye">Nochevieja</string>
-    <string name="valentines">San Valentín</string>
-    <string name="turkey_day">Día del Pavo</string>
-    <string name="search_equipment">Buscar Equipamiento</string>
-    <string name="exact_alarm_system_settings_description">Activa la opción `Alarmas y Recordatorios` en la aplicación Ajustes para que los recordatorios aparezcan exactamente a la hora programada</string>
-    <string name="sell_confirmation_title">¿Estás seguro de que quieres vender este %s\?</string>
-    <string name="exact_alarm_system_settings_reminders">Los recordatorios pueden retrasarse porque los permisos no están activados. Pulse para ver y actualizar los permisos.</string>
-    <string name="leave_party_confirmation_quest">¿Estás seguro de que quieres dejar este equipo\?</string>
-    <string name="rejoin_party_quest">No podrás volver a unirte a este equipo a menos que te inviten.
-\n
-\nSi abandonas el equipo, también abandonarás la misión en la que te encuentres.</string>
-    <string name="rejoin_party_quest_leader">No podrás volver a unirte a este equipo a menos que te inviten.
-\n
-\nAbandonar el equipo detendrá la misión actual.</string>
-    <string name="max_gem_cap_text">Comenzar al instante con el número límite máximo de Gemas</string>
-    <string name="max_gem_cap_text_gift">Ellos empiezan al instante con el número límite máximo de Gemas</string>
-    <string name="exact_alarm_system_settings_title">`Alarma y Recordatorios` desactivados`</string>
-    <string name="auth_get_credentials_error">Se ha producido un error al obtenerlo las credenciales para la autenticación.</string>
-    <string name="auth_invalid_credentials">Recibidas credenciales no válidas.</string>
-    <string name="auth_unknown_error">Se produjo un error desconocido durante la autenticación.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 38a6347fc..419933ef1 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -533,12 +533,12 @@
     <string name="world_boss">Boss mondial</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">Attaques de rage : %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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 Habitica ! !</string>
-    <string name="questShop">Quêtes</string>
+    <string name="strike_active_description">Notre %1$s a eu le cœur brisé lorsque %2$s a fracassé %3$s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire Habitica ! !</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>
     <string name="stable_owner_long">Matt le maître des bêtes</string>
@@ -793,8 +793,8 @@
     <string name="promo_subscription_buy_gems_description">Abonnez-vous pour acheter des gemmes avec de l\'or, obtenir des objets mystères tous les mois, augmenter le taux de butin et plus encore !</string>
     <string name="promo_subscription_buy_gems_prompt">Besoin de gemmes \?</string>
     <string name="transfer_ownership_confirm_message">Cela fera de %s le nouveau responsable de l\'équipe</string>
-    <string name="gift_confirmation_text_sub">Vous avez envoyé un abonnement Habitica de %2$s mois à @%1$s.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Vous avez offert un abonnement à Habitica de %2$s à %1$s et le même abonnement vous a été attribué grâce à la promotion Un Offert, un Reçu !</string>
+    <string name="gift_confirmation_text_sub">Vous avez envoyé à %1$s un abonnement de %2$s mois.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Vous avez envoyé à %1$s un abonnement de %2$s mois et le même abonnement vous a été accordé pour notre promotion Un en cadeau, un reçu !</string>
     <string name="gift_gems_subtitle">Choisissez le paquet de gemmes que vous voudriez offrir ci-dessous !</string>
     <string name="empty_title_rewards_filtered">Pas de récompense</string>
     <string name="empty_description_todos_filtered">Il n\'y a pas de tâche visible avec vos filtres actuels.</string>
@@ -866,7 +866,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Méthodes d\'authentification</string>
     <string name="someone">Quelqu\'un</string>
-    <string name="invitation_title">%s vous a invité à rejoindre son groupe %s</string>
+    <string name="invitation_title">%1$s vous a invité à rejoindre son groupe %2$s</string>
     <string name="password_too_short">Votre mot de passe doit contenir au moins %d caractères</string>
     <string name="copy_username">Copier l\'identifiant</string>
     <string name="subscriber_currency">Monnaie d\'abonnement</string>
@@ -979,7 +979,7 @@
     <string name="hatch_pet_again">Faire éclore le familier à nouveau</string>
     <string name="unhatched_pet">Familier non éclos</string>
     <string name="hatch_pet">Faire éclore le familier</string>
-    <string name="can_hatch_pet">Combinez votre Œuf de %1$s et votre Potion %2$s pour faire éclore ce familier !</string>
+    <string name="can_hatch_pet">Combinez votre œuf de %1$s et votre potion %2$s pour faire éclore ce familier !</string>
     <string name="suggest_pet_hatch_again_missing_both">Vous avez besoin d\'un %1$s et d\'une potion %2$s pour faire éclore ce familier à nouveau</string>
     <string name="suggest_pet_hatch_again_missing_potion">Vous avez besoin d\'une potion %s pour faire éclore ce familier à nouveau</string>
     <string name="suggest_pet_hatch_again_missing_egg">Vous avez besoin d\'un œuf de %s pour faire éclore ce familier à nouveau</string>
@@ -1035,10 +1035,10 @@
     <string name="block_user">Bloquer l\'utilisateur</string>
     <string name="limitations">Limitations</string>
     <string name="spooky_promo_info_prompt">La vente de gemmes est de retour pour hanter cette fin de gala d\'automne ! C\'est votre dernière chance d\'obtenir plus de gemmes que jamais, alors faites le plein tant que ça dure !</string>
-    <string name="spooky_promo_info_instructions">Entre le %s et le %s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
+    <string name="spooky_promo_info_instructions">Entre le %1$s et le %2$s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
     <string name="view_gem_bundles">Voir les paquets de gemmes</string>
     <string name="fall_promo_info_prompt">Le gala d\'automne bat son plein, alors nous avons pensé que ce serait le moment idéal pour proposer notre toute première vente de gemmes ! Dès à présent, vous recevrez plus de gemmes qu\'auparavant pour chaque achat.</string>
-    <string name="fall_promo_info_instructions">Entre le %s et le %s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
+    <string name="fall_promo_info_instructions">Entre le %1$s et le %2$s, achetez simplement n\'importe quel paquet de gemmes comme d\'habitude, et votre compte sera crédité du nombre de gemmes promotionnelles. Cela vous fera plus de gemmes à dépenser, partager, ou économiser pour de futurs objets !</string>
     <string name="how_it_works">Comment ça marche</string>
     <string name="x_to_y">%1$s à %2$s</string>
     <string name="usually_x_gems">Généralement %d gemmes</string>
@@ -1149,10 +1149,10 @@
     <string name="minimal">Minimal</string>
     <string name="task_list_mode">Mode liste de tâches</string>
     <string name="discard">Abandonner</string>
-    <string name="class_confirmation_price">Voulez-vous changer de classe et devenir %s pour %d Gemmes \?</string>
+    <string name="class_confirmation_price">Voulez-vous changer de classe et devenir %1$s pour %2$d Gemmes \?</string>
     <string name="use_item">Utilisez l\'objet sur un allié</string>&gt;
     <string name="discard_changes_to_task_message">Voulez-vous vraiment abandonner les changements pour cette tâche \?</string>
-    <string name="gift_confirmation_text_gems_new">Vous avez envoyé %2$s Gemmes à @%1$s.</string>
+    <string name="gift_confirmation_text_gems_new">Vous avez envoyé %2$s gemmes à %1$s.</string>
     <string name="subscription_confirmation_multiple">Vous disposez maintenant de %s mois d\'abonnement</string>
     <string name="my_account">Mon compte</string>
     <string name="quest_party_required_description">Quand vous faites partie d\'une équipe, vous pouvez faire des quêtes en solo ou inviter des amis pour quêter avec eux !</string>
@@ -1209,7 +1209,7 @@
     <string name="tutorial_reset_confirmation">Vos tutoriels ont été réinitialisés</string>
     <string name="you_ran_out_of_health">Vous avez épuisé votre santé !</string>
     <string name="death_description">Mais vous pouvez tous les récupérer avec un peu de travail ! Bonne chance — vous allez y arriver.</string>
-    <string name="faint_loss_description">Vous redescendrez au niveau <b>%d</b>, perdrez <b>%d</b> Or, et briserez <b>une pièce d\'équipement</b>… Vous pourrez les obtenir à nouveau en travaillant dur !</string>
+    <string name="faint_loss_description">Vous redescendrez au niveau <b>%1$d</b>, perdrez <b>%2$d</b> pièces d\'or, et abîmerez <b>une pièce d\'équipement</b>…</string>
     <string name="account_reset">Réinitialisation du compte</string>
     <string name="avatar_skin_customization">Personnalisation de l\'apparence de l\'avatar</string>
     <string name="avatar_shirt_customization">Personnalisation de l\'habit de l\'avatar</string>
@@ -1311,311 +1311,4 @@
     <string name="promote_to_manager">Promouvoir à Gestionnaire</string>
     <string name="task_summary">Sommaire des Tâches</string>
     <string name="mute_user">Rendre muet le Joueur</string>
-    <plurals name="items_pending">
-        <item quantity="one">%d Objet en attente</item>
-        <item quantity="many">%d Objets en attente</item>
-        <item quantity="other">%d Objets en attente</item>
-    </plurals>
-    <string name="report_message_explanation">Vous ne devez signaler qu\'un message qui enfreint le [Guide de la Communauté](https://habitica.com/static/community-guidelines) et/ou les [Conditions d\'utilisation](https://habitica.com/static/terms). Établir un faux rapport est une violation du Guide de la Communauté d\'Habitica.</string>
-    <string name="report_user_explanation">Vous ne devez signaler qu\'un·e joueu·r·se qui enfreint le [Guide de la communauté] (https://habitica.com/static/community-guidelines) et/ou les [Conditions d\'utilisation] (https://habitica.com/static/terms). La soumission d\'un faux rapport est une violation des directives communautaires d\'Habitica.</string>
-    <string name="gems_promo_info_limitations_fixed">Cette promotion s\'applique uniquement pendant l\'événement à durée limitée. Cet événement commence le %1$s (%2$s) et se terminera %3$s (%4$s). L\'offre promotionnelle n\'est disponible que lorsque vous achetez des Gemmes pour vous-même.</string>
-    <string name="unban_user">Débannir l\'Utilisat·eur·rice</string>
-    <string name="amazon">Amazon</string>
-    <string name="apple_pay">Apple Pay</string>
-    <string name="google_pay">Google Pay</string>
-    <string name="paypal">Paypal</string>
-    <string name="shadow_muted_hidden">Mis·e en sourdine, caché</string>
-    <string name="assigned_to_you_by">Vous a été attribué par @%1$s le %2$s</string>
-    <string name="on_weekends">les week-ends</string>
-    <string name="second">deuxième</string>
-    <string name="third">troisième</string>
-    <string name="fourth">quatrième</string>
-    <string name="report_challenge_explanation">Vous ne devez signaler un défi qui enfreint le [Guide de la communauté] (https://habitica.com/static/community-guidelines) et/ou les [Conditions d\'utilisation] (https://habitica.com/static/terms). La soumission d\'un faux rapport est une violation des directives communautaires d\'Habitica.</string>
-    <string name="stripe_payment">Stripe</string>
-    <string name="reset_account_description_no_pw">Vous perdrez tous vos niveaux, votre Or et votre Expérience. Toutes vos tâches et leur historique seront supprimés (les tâches provenant d\'un défi ne seront pas affectées). Vous allez perdre tous vos équipements, sauf les objets d\'abonnement et les objets commémoratifs gratuits, mais vous aurez la possibilité de les racheter. Vous devrez être dans la classe correspondante pour racheter un équipement spécifique celle-ci. Vous garderez votre classe actuelle, vos Succès ainsi que vos Familiers et Montures. Pour confirmer la réinitialisation, écrivez RESET ci-dessous.</string>
-    <string name="todo_summary_description">C\'est une Tâche **%1$s** qui n\'a pas de date butoir.</string>
-    <string name="daily_summary_description">C\'est une Tâche **%1$s** qui se répète **%2$s%3$s**.</string>
-    <plurals name="repeat_yearly">
-        <item quantity="one">Tous les ans</item>
-        <item quantity="many">Tous les %d ans</item>
-        <item quantity="other">Tous les %d ans</item>
-    </plurals>
-    <plurals name="repeat_monthly">
-        <item quantity="one">Tous les mois</item>
-        <item quantity="many">Tous les %d mois</item>
-        <item quantity="other">Tous les %d mois</item>
-    </plurals>
-    <string name="habit_summary_description">\"C\'est une Habitude **%1$s** qui est **%2$s**.</string>
-    <string name="shadow_mute_user">Mettre en Sourdine</string>
-    <string name="status">Statut</string>
-    <string name="regular_access">Accès Régulier</string>
-    <string name="message_flagged">Message signalé %d fois.</string>
-    <string name="unshadowmute_user">Retirer la Mise en Sourdine</string>
-    <string name="unmute_user">Retirer la Mise en Sourdine l\'Utilisat·eur·rice</string>
-    <string name="on_x">le %s</string>
-    <string name="fifth">cinquième</string>
-    <string name="never">jamais</string>
-    <string name="on_every_day_of_week">tous les jours de la semaine</string>
-    <string name="on_the_x">le %s</string>
-    <string name="first">premier</string>
-    <string name="on_the_x_of_month">le %1$s %2$s du mois</string>
-    <string name="edit_assignees">Modifier les attributions</string>
-    <string name="unban_user_confirm">Voulez-vous débannir ce·tte joueu·r·se \?</string>
-    <string name="mute_user_confirm">Voulez-vous supprimer l\'accès au chat pour ce·tte joueu·r·se \?</string>
-    <string name="unmute_user_confirm">Voulez-vous réautoriser l\'accès au chat pour cet·te utilisat·eur·rice \?</string>
-    <string name="shadowmute_user_confirm">Voulez-vous mettre en sourdine cet·te utilisat·eur·rice \?</string>
-    <string name="unshadowmute_user_confirm">Voulez-vous retirer la mise en sourdine \?</string>
-    <string name="on_weekdays">les jours de semaine</string>
-    <string name="birthday_limitations">Cet événement est limité dans le temps et commencera le %1$s pour se finir le %2$s. La Gryphatrice Joyeuse en édition limitée et dix Potions Magiques d\'Éclosion seront disponibles à l\'achat durant cette période. Les autres cadeaux listés dans la section \"Quatre gratuits\" seront automatiquement distribués à tous les comptes qui étaient actifs dans les 30 jours avant l\'envoi des cadeaux. Les comptes créés après l\'envoi des cadeaux ne pourront pas les réclamer.</string>
-    <string name="birthday_title_description">Célébrez le 10ème anniversaire d\'Habitica avec des cadeaux et des objets exclusifs ci-dessous !</string>
-    <string name="limited_edition">Édition Limitée</string>
-    <string name="thanks_for_support">Merci pour votre soutien !</string>
-    <string name="plenty_of_potions">Abondance de Potions</string>
-    <string name="for_for_free">Quatre Gratuitement</string>
-    <string name="buy_for_x">Achetez pour %s</string>
-    <string name="buy_for">Achetez pour</string>
-    <string name="for_for_free_description">Pour faire durer la fête, nous allons faire don de Robes Festives, de 20 Gemmes et d\'une édition limité d\'un ensemble Cape et d\'un Arrière-plan !</string>
-    <string name="exclusive_items_await">Des objets exclusifs et des cadeaux vous attendent</string>
-    <string name="resume_damage_2_description">Ne pas effectuer une Quotidienne réinitialisera votre combo et vos compteurs d\'Habitude se réinitialisera normalement</string>
-    <string name="resume_damage_3_title">Votre progression dans la Quête s\'appliquera à nouveau</string>
-    <string name="resume_damage_3_description">Tous dégâts en attente ou objets de collection s\'appliqueront sur votre réinitialisation le jour suivant</string>
-    <string name="pause_damage">Mettre les Dégâts en Pause</string>
-    <string name="pause_damage_summary">Les Dégâts sont actuellement activés. En savoir plus.</string>
-    <string name="resume_damage_summary">Les Dégâts sont actuellement en pause.</string>
-    <string name="resume_damage_2_title">Vos séries et compteurs seront remis à zéro</string>
-    <string name="visit_market">Visiter le Marché</string>
-    <string name="ends_in_x">Fini en %s</string>
-    <string name="see_more">Voir Plus</string>
-    <string name="jubilant_gryphatrice_confirmation">Vous avez acheté la Gryphatrice Joyeuse !</string>
-    <string name="jubilant_gryphatrice_confirmation_gift">Vous avez offert la Gryphatrice Joyeuse !</string>
-    <string name="open_settings">Ouvrir les Paramètres</string>
-    <string name="undo">Annuler</string>
-    <string name="day_x">Jour %d</string>
-    <string name="a_party_robe">Une Robe de Soirée</string>
-    <string name="twenty_gems">20 Gemmes</string>
-    <string name="background">Arrière-plan</string>
-    <string name="birthday_set">Ensemble d\'Anniversaire</string>
-    <string name="you_equipped_x">Vous avez équipé %s</string>
-    <string name="find_new_member">Trouver des Membres</string>
-    <string name="find_more_members">Trouver plus de membres</string>
-    <string name="go_to_settings">Accéder aux Paramètres</string>
-    <string name="resume_damage">Réactiver les Dégâts</string>
-    <string name="resume_damage_1_title">Les Quotidiennes non-effectuées ne vous feront pas de dégâts</string>
-    <string name="resume_damage_1_description">Vous subirez toujours des dégâts causés par les Boss si d\'autres
-\nMembres de l\'Équipe n\'ont pas effectué leurs Quotidiennes</string>
-    <string name="animated_gryphatrice_pet">Familier Gryphatrice Joyeux</string>
-    <string name="plenty_of_potions_description">Nous vous ramenons 10 des Potions Magiques d\'Éclosion préférées de la communauté. Allez au Marché pour compléter votre collection !</string>
-    <string name="visit_the_market">Visiter le Marché</string>
-    <string name="gryphatrice_description">Le rare Gryphatrice Joyeux se joint à la fête d\'anniversaire ! Ne manquez pas votre chance de posséder ce Familier animé exclusif.</string>
-    <string name="purchase_gryphatrice_confirmation">Acheter la Gryphatrice Joyeuse pour %d Gemmes \?</string>
-    <string name="you_re_looking_for_party">Vous êtes en recherche d\'une Équipe !</string>
-    <string name="empty_food_description">Accomplissez des tâches, achetez dans l\'Armoire, ou allez visiter le [Marché](/shops/market) pour vous faire un stock !</string>
-    <string name="item_footer_description">Allez voir dans le [Marché](/shops/market) pour acheter tout ce dont vous avez besoin !</string>
-    <string name="empty_eggs_description">Accomplissez des tâches, des Quêtes de d\'Œufs de Familier, ou allez visiter le [Marché](/shops/market) pour vous faire un stock !</string>
-    <string name="subscribe_listitemArmoire_description">Obtenez deux chances d\'obtenir de l\'équipement à chaque fois que vous ouvrez l\'Armoire Enchantée !</string>
-    <string name="subscribe_incentive_text_armoire">Obtenez à chaque fois une chance supplémentaire d\'ouvrir l\'Armoire avec un abonnement</string>
-    <string name="subscribe_second_armoire_open_text">Les abonné·e·s ont une chance supplémentaire pour ouvrir l\'Armoire et ces autres avantages !</string>
-    <string name="subscribe_second_chance_incentive_text">Les abonné·e·s ont chaque jour une deuxième chance de vie et ces autres avantages !</string>
-    <string name="quest_mechanics_collecting_description">Lorsque vous participez à une Quête de Collecte, accomplissez vos tâches pour avoir une chance aléatoire de trouver un objet de Quête. Les objets en attente seront comptabilisés lors de votre réinitialisation le jour suivant. La Perception augmente les chances de trouver des objets.</string>
-    <string name="quest_mechanics_pausing_description">"Si vous rencontrez des difficultés pour accomplir vos tâches Quotidiennes, vous pouvez suspendre les Dégâts depuis les Paramètres pour prendre une pause. Cela empêchera l·e·a Boss de faire des dégâts à vous ou à vos coéquipi·er·ère·s, mais vous empêche également de faire des dégâts. Les Quotidiennes non effectuées par les autres membres vous feront toujours des dégâts, alors restez vigilant·e ! "</string>
-    <string name="change_class_to_x">Changer de classe et devenir %s</string>
-    <string name="shop_armoire_title">Vous possédez tous les équipements %s</string>
-    <string name="quest_mechanics_collecting_title">Objets de Quête de Collecte</string>
-    <string name="preference_email_content_release">Sorties de Contenu + Évènements</string>
-    <string name="pause_damage_1_title">"Les Quotidiennes non-effectuées ne vous feront pas de dégâts "</string>
-    <string name="pause_damage_1_description">Les boss feront toujours des dégâts causés par les Quotidiennes non-effectuées des Membres de l\'Équipe</string>
-    <string name="pause_damage_2_title">Vos séries et compteurs ne seront pas remis à zéro</string>
-    <string name="username_or_email">Pseudo ou adresse mail</string>
-    <string name="seeking_party_description">Vous souhaitez rejoindre une Équipe mais vous ne connaissez aucun·e·s autres joueu·r·se·s \? Faites savoir aux responsables d\'Équipe que vous souhaitez une invitation !</string>
-    <string name="seeking_party_title">Vous cherchez une Équipe \?</string>
-    <string name="look_for_party">Chercher une Équipe</string>
-    <string name="seeking_hint">Gardez un œil pour de potentielles invitations, ou commencez votre propre Équipe quand vous le souhaitez</string>
-    <string name="equipment_class_locked">Cet équipement est réservé à une classe spécifique</string>
-    <string name="shop_armoire_description">De nouveaux équipements sortent pendant les Galas saisonniers. En attendant, vous avez %d éléments d\'équipement à trouver dans l\'Armoire Enchantée !</string>
-    <string name="shop_armoire_empty_description">De nouveaux équipements sortent pendant les Galas saisonniers. L\'Armoire Enchantée bénéficie également d\'un nouveau stock tous les mois !</string>
-    <string name="unlock_gear_and_skills">Débloquer %s équipement et compétences</string>
-    <string name="rescind_invite">Annuler l\'Invitation</string>
-    <string name="rescinded">Annulé</string>
-    <string name="no_x">Pas de %s</string>
-    <string name="empty_quests_description">Obtenez des Quêtes en gagnant des niveaux, en vous connectant, ou dans la [Boutique de Quêtes](/shops/quests) !</string>
-    <string name="eggs_footer_description">Allez visiter le [Marché](/shops/market) pour acheter les œufs de familier que vous cherchez !</string>
-    <string name="empty_special_description_subscribed">Obtenez des objets de transformation pendant les Galas Saisonniers et les boîtes mystères d\'équipements d\'abonnement sont distribuées au début de chaque mois !</string>
-    <string name="empty_potions_description">Accomplissez des tâches, des Quêtes de Potion, ou allez visiter le [Marché](/shops/market) pour vous faire un stock !</string>
-    <string name="item_footer_title">Vous n\'obtenez pas le bon %s avec vos tâches \?</string>
-    <string name="quests_footer_description">Allez voir dans la [Boutique de Quêtes](/shops/quests) pour voir ce que vous pourrez y trouver !</string>
-    <string name="quests_footer_title">Vous voulez plus de Quêtes \?</string>
-    <string name="potions">potions</string>
-    <string name="food_footer_description">Allez visiter le [Marché](/shops/market) pour acheter de la nourriture ou une Selle pour élever instantanément votre Familier !</string>
-    <string name="hatchingPotions_footer_description">Allez visiter le [Marché](/shops/market) pour acheter des Potions d\'Éclosion standards ou saisonnières !</string>
-    <string name="open_profile">Ouvrir le Profil</string>
-    <string name="share_avatar">Partager l\'Avatar</string>
-    <string name="subscribe_listitemArmoire">Récompenses doublées dans l\'Armoir</string>
-    <string name="subscribe_incentive_button_armoire">Abonnez-vous pour ouvrir à nouveau gratuitement !</string>
-    <string name="subscriber_button_armoire">Ouvrez à nouveau gratuitement !</string>
-    <string name="subscriber_button_faint">Deuxième chance : Accrochez-vous avec 1 PV !</string>
-    <string name="sub_perk">AVANTAGES D\'ABO</string>
-    <string name="subscribe_incentive_text_faint">Obtenez une seconde chance chaque jour d\'éviter de manquer de points de vie avec un abonnement</string>
-    <string name="subriber_benefit_notification_faint">Vous avez une deuxième chance avec 1 PV !</string>
-    <string name="watch_ad_to_hang_on">Regardez une publicité pour tenir le coup avec 1 PV !</string>
-    <string name="quest_mechanics_damage_title">Les Boss attaquent pour chaque Quotidienne non effectuée</string>
-    <string name="quest_mechanics_rage_title">Compteurs de Rage</string>
-    <string name="quest_mechanics_rage_description">Certain·e·s Boss difficiles ont un compteur de Rage sous leurs PV. Ce compteur se remplit quand les participant·e·s n\'effectuent pas leurs tâches Quotidiennes. Quand elle se remplit complètement, l·e·a Boss lancera une attaque redoutable qui fera des dégâts supplémentaires !</string>
-    <string name="buy_gems_with_gold">Achetez des Gemmes avec de l\'Or</string>
-    <string name="subscribe_prompt_2">Abonnez-vous pour acheter des Gemmes avec de l\'Or et recevez ces autres avantages exclusifs !</string>
-    <string name="subscribe_listitemArmoire_description_2">Chaque fois que vous ouvrez l\'Armoire, vous pourrez l\'ouvrir à nouveau gratuitement !</string>
-    <string name="subscribe_listitem2_description_2">Obtenez des Sabliers au fur et à mesure du temps pour acquérir des objets dans la Boutique des Voyageu·r·se·s Temporel·le·s</string>
-    <string name="see_more_subscription_options">Voir plus d\'options d\'abonnement</string>
-    <string name="faint_subscriber_description">Votre abonnement vous permet d\'avoir une deuxième chance chaque jour si vous n\'avez plus de PV</string>
-    <string name="rage">Rage</string>
-    <string name="preference_push_invited_to_group_plan">Invité dans l\'Offre de Groupe</string>
-    <string name="preference_push_joined_group_plan_mention">\@Mentions dans les Offres de Groupe</string>
-    <string name="subscribe_incentive_button_faint">Abonnez-vous pour survivre avec 1 PV !</string>
-    <string name="subscription_benefit_armoire_sub">Votre abonnement vous permet d\'avoir une nouvelle chance d\'ouvrir l\'Armoire !</string>
-    <string name="subscriber_benefit_success_faint">Vous obtenez une deuxième chance avec 1 PV !</string>
-    <string name="revive_broken_equipment">Votre %s s\'est cassé(e)</string>
-    <string name="subscribe_gems_for_gold_incentive_text">Abonnez-vous pour acheter des Gemmes avec de l\'Or et recevoir ces autres avantages exclusifs !</string>
-    <string name="subscribe_hourglass_incentive_text">Les abonné·e·s reçoivent un Sablier Mystique tous les mois ainsi que ces autres avantages exclusifs !</string>
-    <string name="no_saddles">Vous n\'avez pas de Selles</string>
-    <string name="purchase_saddles_in_market">Les Selles élèvent automatiquement un Familier en Monture. Vous pouvez en acheter au Marché.</string>
-    <string name="error_loading_member">Impossible de trouver l·e·a joueu·r·se</string>
-    <string name="error_loading_member_body">Une erreur est apparue en chargeant les données de ce·tte joueu·r·se. Assurez-vous d\'avoir correctement écrit son @username.</string>
-    <string name="report_challenge">Signaler le Défi</string>
-    <string name="quest_mechanics_pausing_title">Mettre les dégâts en pause</string>
-    <string name="subscriber_benefit">AVANTAGE D\'ABONNEMENT</string>
-    <string name="quest_mechanics_damage_description">Les dégâts du Boss sont calculés à chaque fois qu\'un·e membre de l\'Équipe se connecte durant la journée. Ces dégâts sont vous sont infligés lorsque vous vous effectuez une action qui vous synchronise avec le serveur. Les dégâts de Boss sont affichés dans la discussion de votre Équipe.</string>
-    <string name="quest_mechanics">Mécaniques de la Quête</string>
-    <string name="quest_mechanics_boss_title">Infliger des dégâts à un Boss</string>
-    <string name="subscriber_benefit_used_faint">Vous avez déjà utilisé votre deuxième chance aujourd\'hui. Elle sera de nouveau disponible dans %s</string>
-    <string name="quest_mechanics_boss_description">Accomplissez n\'importe quel type de tâche ou utilisez vos compétences pour accumuler les dégâts en attente ! Les dégâts seront appliqués lors de votre réinitialisation le jour suivant. La compétence Force affecte la quantité de dégâts que vous infligez.</string>
-    <string name="customize_avatar">Customiser l\'Avatar</string>
-    <string name="pause_damage_2_description">Vos séries de Quotidiennes et compteurs d\'Habitudes ne seront pris en compte qu\'en positif tant que ceci est actif</string>
-    <string name="pause_damage_3_title">Votre progression de Quête restera en suspens</string>
-    <string name="pause_damage_3_description">Les dégâts causés à un·e boss et les objets de collection trouvés seront mis de côté jusqu\'à ce que vous réactiviez les dégâts</string>
-    <string name="list">Liste</string>
-    <string name="by_invite">Par Invitation</string>
-    <string name="habiticans_looking_party">Voici une liste de joueu·r·se·s cherchant à rejoindre une Équipe</string>
-    <string name="habiticans_looking_party_empty">Personne ne cherche d\'Équipe pour le moment. Vous pourrez vérifier à nouveau plus tard !</string>
-    <string name="invited">Invité·e</string>
-    <string name="invite_with_username_email">Inviter avec @username ou email</string>
-    <string name="habiticans_send_invite">Envoyer une invitation directement aux joueu·r·se·s que vous connaissez</string>
-    <string name="pending_invite">Invitation en attente</string>
-    <string name="invalid_input">Entrée non valide</string>
-    <string name="username_requirements">Ne peut contenir que des lettres a-z, des chiffres, des tirets ou des tirets bas</string>
-    <string name="contributor_tiers">Grades de Contribut·eur·rice</string>
-    <string name="contrib_tier_description">Si vous voyez un compte avec un pseudonyme coloré et une icône, c\'est un grade de contribut·eur·rice ! Les grades sont donnés aux personnes qui aident Habitica, que ce soit en faisant de la traduction, du codage, ou juste en étant utile. Plus haut est le grade, plus l·e·a joueu·r·se a contribué.</string>
-    <string name="visit_faq">Visiter les FAQ</string>
-    <plurals name="repeat_daily">
-        <item quantity="one">chaque jour</item>
-        <item quantity="many">tous les %d jours</item>
-        <item quantity="other">tous les %d jours</item>
-    </plurals>
-    <plurals name="repeat_weekly">
-        <item quantity="one">chaque semaine</item>
-        <item quantity="many">toutes les %d semaines</item>
-        <item quantity="other">toutes les %d semaines</item>
-    </plurals>
-    <string name="customizations_owner">Félicitus</string>
-    <string name="customizations">Personnalisations</string>
-    <string name="avatar_shirts">Hauts</string>
-    <string name="avatar_skins">Peaux</string>
-    <string name="avatar_accents">Accessoires</string>
-    <plurals name="x_days">
-        <item quantity="one">%d Jour</item>
-        <item quantity="many">%d Jours</item>
-        <item quantity="other">%d Jours</item>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="one">%d Heure</item>
-        <item quantity="many">%d Heures</item>
-        <item quantity="other">%d Heures</item>
-    </plurals>
-    <plurals name="x_minutes">
-        <item quantity="one">%d Minute</item>
-        <item quantity="many">%d Minutes</item>
-        <item quantity="other">%d Minutes</item>
-    </plurals>
-    <string name="avatar_hair_styles">Coupe de Cheveux</string>
-    <string name="avatar_mustaches">Moustaches</string>
-    <string name="avatar_beards">Barbes</string>
-    <string name="standard_backgrounds">Arrière-Plans Standards</string>
-    <string name="avatar_hair_colors">Couleurs de Cheveux</string>
-    <string name="looking_for_more">Vous cherchez autre chose \?</string>
-    <string name="customization_shop_more">Allez faire un tour dans la Boutique de Personnalisation pour customiser encore plus votre avatar !</string>
-    <string name="customizations_no_owned">Vous ne possédez aucun de ces objets</string>
-    <string name="customization_shop_check_out">Allez voir dans la Boutique de Personnalisation pour découvrir les nombreuses façon de customiser votre avatar !</string>
-    <string name="switches_in_x">Se transforme en %s</string>
-    <string name="tap_to_reload">Rafraîchir pour de nouveaux objets</string>
-    <string name="winter">Hiver</string>
-    <string name="spring">Printemps</string>
-    <string name="summer">Été</string>
-    <string name="fall">Automne</string>
-    <string name="monthly_backgrounds">Arrière-plans Mensuels</string>
-    <string name="animal_tails">Queues d\'Animaux</string>
-    <string name="insufficient_level_equipment_dialog_new">Ce objet n\'est disponible que pour la classe %s. Vous pourrez choisir une classe après le niveau 10.</string>
-    <string name="you_own_all_items">Vous possédez tous ces objets</string>
-    <string name="try_on_customize">Vous pouvez les essayer en personnalisant votre avatar.</string>
-    <string name="try_on_equipment">Vous pouvez les essayer depuis le menu Équipement. De nouveaux arrivages ont lieu à chaque début de mois !</string>
-    <string name="healers">Guérisseu·r·se·s</string>
-    <string name="rogues">Voleu·r·se·s</string>
-    <string name="warriors">Guerri·er·ère·s</string>
-    <string name="mages">Mages</string>
-    <string name="class_equipment_shop_dialog_new">Ce objet n\'est disponible que pour la classe %s. Ouvrez les Paramètres pour changer de classe.</string>
-    <string name="try_on_next_season">Vous pouvez les essayer en personnalisant votre avatar. Revenez la saison prochaine pour découvrir la nouvelle sélection !</string>
-    <string name="try_on_next_month">Vous pouvez les essayer en personnalisant votre avatar. Revenez le mois prochain pour découvrir la nouvelle sélection !</string>
-    <string name="equipment">Équipement</string>
-    <string name="customizing_your_avatar">personnaliser votre avatar</string>
-    <string name="customization_shop">Boutique de Personnalisation</string>
-    <string name="error">Erreur</string>
-    <string name="error_loading_gems">Une erreur est apparue en chargeant les gemmes</string>
-    <string name="clear_database">Vider la Banque de Données</string>
-    <string name="clear_cache_settings">Vider le Cache</string>
-    <string name="faint_loss_description_alt">Vous redescendrez au niveau <b>%d</b>, perdrez <b>%d</b> Or, et votre Expérience... Vous pourrez récupérer tout cela en travaillant dur !</string>
-    <string name="best_deal">Meilleure Offre</string>
-    <string name="unlocks_x_gems_per_month">Il·elle débloquera %d Gemmes par mois instantanément</string>
-    <string name="two_gems_per_month">Obtenez +2 Gemmes pour chaque mois durant lesquels vous avez été abonné·e</string>
-    <string name="popular">Populaire</string>
-    <string name="choose_member">Choisir l·e·a Membre</string>
-    <string name="cleared_cache">Cache Vidé</string>
-    <string name="subscribe_listitem3_description_alt">Restez à la page dans les derniers équipements exclusifs. Abonnez vous dès maintenant pour obtenir %2$s de %1$s !</string>
-    <string name="see_other_sub_options">Voir les autres possibilités d\'abonnement</string>
-    <string name="benefits_end">Vos avantages se terminent en %s</string>
-    <string name="unlock_x_gems_per_month">Débloque %d Gemmes par mois au Marché</string>
-    <string name="x_gems">%d Gemmes</string>
-    <string name="two_gems_per_month_gift">Obtiendra +2 Gemmes pour chaque mois durant lesquels il·elle a été abonné·e</string>
-    <string name="plus_two_gems">+2 Gemmes</string>
-    <string name="gem_cap_extra">%d/%d Limite de Gemmes</string>
-    <string name="resubscribe_description_gift">Vous souhaitez continuer à recevoir les avantages de l\'abonnement \? Vous pouvez prendre un abonnement récurrent pour conserver tous vos avantages.</string>
-    <string name="subscription_details_footer">Les Abonné·e·s reçoivent un Sablier Mystique, un Ensemble d\'Équipement Mystère, et des Gemmes réapprovisionnées au Marché dans les deux premiers jours du mois</string>
-    <string name="enjoy_benefits">Profitez de tous ces bénéfices exclusifs grâce à votre abonnement</string>
-    <string name="resubscribe_for_hourglasses">Abonnez-vous de nouveau pour continuer à recevoir des Sabliers Mystiques</string>
-    <string name="gem_cap">Limite de Gemme</string>
-    <string name="max_gem_cap">Limite Maximale de Gemme</string>
-    <string name="get_12_mystic_hourglasses">Recevez immédiatement 12 Sabliers Mystiques après votre premier abonnement de 12 mois !</string>
-    <string name="twelve_mystic_hourglasses">12 Sabliers Mystiques</string>
-    <string name="thanks_for_subscribing">Merci pour votre abonnement</string>
-    <string name="set">Ensemble</string>
-    <string name="rescrubscribe_to_pick_up">Abonnez vous de nouveau pour reprendre là où vous vous étiez arrêté !</string>
-    <string name="cancel_subscription_apple_description">Vous ne souhaitez être abonné·e \? Du fait de votre méthode de paiement, vous devrez vous désinscrire depuis vos paramètres d\'abonnement de votre AppleID sur votre appareil IOS.</string>
-    <string name="open_habitica_website">Ouvrir le site web Habitica</string>
-    <string name="g1g1_promo_info_limitations_noutc">Il s\'agit d\'un événement limité dans le temps, qui démarre le %1$s et finit le %2$s. Cette promotion ne s\'applique que si vous offrez un abonnement à quelqu\'un d\'autre. Si vous ou l·e·a destinataire possède déjà un abonnement, l\'abonnement offert ajoutera des mois supplémentaires qui se déclencheront quand l\'abonnement en cours sera annulé ou expirera.</string>
-    <string name="nye">Soirée du Nouvel An</string>
-    <string name="turkey_day">Jour de la Dinde</string>
-    <string name="valentines">Valentin·e·s</string>
-    <string name="search_equipment">Rechercher dans les Équipements</string>
-    <string name="exact_alarm_system_settings_title">`Alarmes &amp; Rappels` désactivé`</string>
-    <string name="exact_alarm_system_settings_reminders">Les Rappels pourraient ne pas apparaître à l\'heure indiquée car l\'application n\'a pas les autorisations. Appuyez ci pour mettre à jour les autorisations.</string>
-    <string name="exact_alarm_system_settings_description">Donnez l\'autorisation `Alarmes &amp; Rappels` dans l\'application Paramètres afin que vos rappels apparaissent à l\'heure programmée</string>
-    <string name="leave_party_confirmation_quest">Êtes-vous sûr·e de vouloir quitter cette Équipe \?</string>
-    <string name="rejoin_party_quest">Vous ne pourrez plus rejoindre cette équipe à moins d\'y être invité·e.
-\n
-\nQuitter cette équipe vous fera également arrêter la quête qui pourrait être en cours.</string>
-    <string name="rejoin_party_quest_leader">Vous ne pourrez plus rejoindre cette équipe à moins d\'y être invité·e.
-\n
-\nQuitter cette équipe va également annuler la quête en cours.</string>
-    <string name="max_gem_cap_text">Débutez à la Limite maximale de Gemmes instantanément</string>
-    <string name="max_gem_cap_text_gift">Il·elle débutera à la Limite maximale de Gemmes instantanément</string>
-    <string name="sell_confirmation_title">Êtes-vous sûr·e de vouloir vendre ce·tte %s \?</string>
-    <string name="auth_invalid_credentials">Informations reçues invalides.</string>
-    <string name="auth_unknown_error">Erreur inconnue lors de l\'authentification.</string>
-    <string name="auth_get_credentials_error">Erreur de récupération des informations pour l\'authentification.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 682a45414..9b85b027f 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -523,11 +523,11 @@
     <string name="world_boss">Svjetski Bos</string>
     <string name="boss_art">Umjetnički prikazi Bosa</string>
     <string name="world_boss_description">Opis Svjetskog Bosa</string>
-    <string name="rage_strike_count">Udari Bijesa: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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="strike_active_description">Naš dragi %1$s je bio razoren kad je %2$s razbio %3$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>
@@ -641,7 +641,7 @@
     <string name="ago_1month">Prije 1 mjeseca</string>
     <string name="remaining_1Minute">Još 1 minuta</string>
     <string name="opting_out_progress">Odustajanje</string>
-    <string name="class_confirmation_price">Želiš li promijeniti svoju klasu u %s za %d Dragulja\?</string>
+    <string name="class_confirmation_price">Želiš li promijeniti svoju klasu u %1$s za %2$d Dragulja\?</string>
     <string name="leave_challenges">Napusti izazove</string>
     <string name="inviteFriendTitle">Pozvan je prijatelj</string>
     <string name="inviteFriendDescription">Pozvao/la si prijatelja (ili prijatelje) koji su ti se pridružili u avanturi!</string>
@@ -864,7 +864,7 @@
     <string name="gift_gems_balance_subtitle">Upiši koliko svojih Dragulja želiš poslati ispod ili promijeni karticu da kupiš Dragulje za poklon</string>
     <string name="password_too_short">Tvoja zaporka treba biti dugačka barem %d znakova</string>
     <string name="preference_push_joined_guild_mention">\@Spomeni u pridruženim Cehovima</string>
-    <string name="invitation_title">%s te pozvao da se pridružiš njihovoj grupi %s</string>
+    <string name="invitation_title">%1$s te pozvao da se pridružiš njihovoj grupi %2$s</string>
     <string name="someone">Netko</string>
     <string name="authentication_methods">Metode provjere autentičnosti</string>
     <string name="local">lokalno</string>
@@ -1056,7 +1056,7 @@
     <string name="pms_disabled_description">Još uvijek možeš slati poruke, ali nitko ih ne može slati tebi. Možeš ih ponovo omogućiti u Postavkama.</string>
     <string name="view_gem_bundles">Pogledaj Pakete Dragulja</string>
     <string name="usually_x_gems">Obično %d Dragulja</string>
-    <string name="spooky_promo_info_instructions">Između %s i %s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
+    <string name="spooky_promo_info_instructions">Između %1$s i %2$s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
     <string name="x_to_y">%1$s do %2$s</string>
     <string name="dark_mode">Tamni Način Rada</string>
     <string name="submit_feedback">Pošalji povratne informacije</string>
@@ -1104,7 +1104,7 @@
     <string name="apitoken_summary">Kopiraj Token. Pažljivo, ovo je zaporka!</string>
     <string name="mount_category">%s Jahače Životinje</string>
     <string name="disablePrivateMessages">Onemogući Privatne Poruke</string>
-    <string name="fall_promo_info_instructions">Između %s i %s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
+    <string name="fall_promo_info_instructions">Između %1$s i %2$s, jednostavno kupi bilo koji paket Dragulja kao i obično i tvoj račun će biti nagrađen s promotivnom količinom Dragulja. Više Dragulja za potrošnju, dijeljenje, ili uštedu za bilo koja ubuduća izdanja!</string>
     <string name="open_website">Otvori Web Stranicu</string>
     <string name="delete_challenge_task_description">Ovo je jedan od %1$d zadataka koji su dio “%2$s” Izazova. Moraš napustiti Izazov kako bi izbrisao/la ovaj zadatak.</string>
     <string name="no_longer_available">Više nije dostupno</string>
@@ -1273,7 +1273,7 @@
     <string name="fall_promo_info_prompt">Jesenska gala zabava je u punom jeku pa smo mislili da je savršeno vrijeme za Rasprodaju Dragulja! Sada ćeš svakom kupnjom dobiti više Dragulja nego ikada prije.</string>
     <string name="clear_cache_description">Za brisanje predmemorije, otvori aplikaciju Postavke na telefonu. Idi na Pohrana &gt; Aplikacije &gt; Habitica, zatim dodirnite Očisti Predmemoriju.</string>
     <string name="death_description">Ali možeš ih sve vratiti uz naporan rad! Sretno - bit ćeš super.</string>
-    <string name="faint_loss_description">Past ćeš na razinu <b>%d</b>, izgubiti <b>%d</b> Zlatnika i razbiti <b>komad opreme</b>…</string>
+    <string name="faint_loss_description">Past ćeš na razinu <b>%1$d</b>, izgubiti <b>%2$d</b> Zlatnika i razbiti <b>komad opreme</b>…</string>
     <string name="health_fitness">Zdravlje + Fitnes</string>
     <string name="time_management">Upravljanje vremenom + Odgovornost</string>
     <string name="habit_summary_description">Ovo je **%1$s** Navika koja je **%2$s**.</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index a4d3d2641..5dd4e4eb3 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -502,11 +502,11 @@
     <string name="world_boss">Bos Dunia</string>
     <string name="boss_art">Seni Bos</string>
     <string name="world_boss_description">Deskripsi Bos Dunia</string>
-    <string name="rage_strike_count">Tingkat Kemarahan 1%d/1%d</string>
+    <string name="rage_strike_count" formatted="false">Tingkat Kemarahan %1$d/%2$d</string>
     <string name="pending_strike_title">Serangan Tertunda</string>
     <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</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="strike_active_description">%1$s kita yang tercinta hancur sewaktu sang %2$s meremukkan %3$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>
@@ -699,8 +699,8 @@
     <string name="confirm_deletion">Konfirmasi penghapusan</string>
     <string name="leave_guild_challenges_confirmation">Apakah kamu ingin tetap berpartisipasi dalam Tantangan saat meninggalkan Perkumpulan\?</string>
     <string name="leave_guild_confirmation">Apakah kamu yakin ingin keluar dari perkumpulan ini\?</string>
-    <string name="gift_confirmation_text_sub">Kamu mengirimkan %s berlangganan %s-bulan Habitica.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Kamu mengirimkan %s sebuah berlangganan %s-bulan dan berlangganan yang sama telah diterapkan pada akunmu melalui promo kami Beri Satu Dapat Satu!</string>
+    <string name="gift_confirmation_text_sub">Kamu mengirimkan %1$s berlangganan %2$s-bulan Habitica.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Kamu mengirimkan %1$s sebuah berlangganan %2$s-bulan dan berlangganan yang sama telah diterapkan pada akunmu melalui promo kami Beri Satu Dapat Satu!</string>
     <string name="update_available">Update tersedia: %1$s (%2$d)</string>
     <string name="streak">Beruntutan</string>
     <string name="new_reminder">Pengingat baru</string>
@@ -876,7 +876,7 @@
     <string name="local">lokal</string>
     <string name="authentication_methods">Metode Otentikasi</string>
     <string name="someone">Seseorang</string>
-    <string name="invitation_title">%s mengundangmu untuk bergabung dengan grup %s</string>
+    <string name="invitation_title">%1$s mengundangmu untuk bergabung dengan grup %2$s</string>
     <string name="password_too_short">Kata sandimu harus setidaknya %d karakter</string>
     <string name="copy_username">Salin Nama Pengguna</string>
     <string name="id_copied">Salin ID Pengguna ke clipboard</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 1e3b3c2ba..2e6a628c4 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -870,7 +870,7 @@
     <string name="local">locale</string>
     <string name="authentication_methods">Metodi di autenticazione</string>
     <string name="someone">Qualcuno</string>
-    <string name="invitation_title">%s ti ha invitato ad unirti al suo gruppo %s</string>
+    <string name="invitation_title">%1$s ti ha invitato ad unirti al suo gruppo %2$s</string>
     <string name="password_too_short">La tua password deve essere lunga almeno %d caratteri</string>
     <string name="copy_username">Copia Nome Utente</string>
     <string name="id_copied">ID Utente copiato negli appunti</string>
@@ -945,8 +945,8 @@
     <string name="switch_to_list_view">Passa alla vista elenco</string>
     <string name="delete_reminder">Elimina Promemoria</string>
     <string name="leave_guild_confirmation">Sei sicuro di voler abbandonare questa gilda\?</string>
-    <string name="gift_confirmation_text_sub">Hai inviato a %s un abbonamento Habitica per %s mesi.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Hai inviato a %s un abbonamento Habitica per %s mesi e lo stesso abbonamento è stato aggiunto al tuo account per la nostra promozione Regalane uno Prendine Uno!</string>
+    <string name="gift_confirmation_text_sub">Hai inviato a %1$s un abbonamento Habitica per %2$s mesi.</string>
+    <string name="gift_confirmation_text_sub_g1g1">Hai inviato a %1$s un abbonamento Habitica per %2$s mesi e lo stesso abbonamento è stato aggiunto al tuo account per la nostra promozione Regalane uno Prendine Uno!</string>
     <string name="gift_gems_subtitle">Scegli qui di seguito il pacchetto di gemme che vuoi regalare!</string>
     <string name="number_responded">%1$d/%2$d risposte</string>
     <string name="empty_title_rewards_filtered">Nessuna Ricompensa</string>
@@ -1005,11 +1005,11 @@
     <string name="hatch_pet_again">Schiudi di nuovo un animale</string>
     <string name="unhatched_pet">Animali non schiusi</string>
     <string name="hatch_pet">Schiudi un Animale</string>
-    <string name="can_hatch_pet">Combina il tuo Uovo %s e la tua Pozione %s per schiudere questo animale!</string>
-    <string name="suggest_pet_hatch_again_missing_both">Hai ancora bisogno di %s ed un uovo %s per poter schiudere di nuovo questo animale</string>
+    <string name="can_hatch_pet">Combina il tuo Uovo %1$s e la tua Pozione %2$s per schiudere questo animale!</string>
+    <string name="suggest_pet_hatch_again_missing_both">Hai ancora bisogno di %1$s ed un uovo %2$s per poter schiudere di nuovo questo animale</string>
     <string name="suggest_pet_hatch_again_missing_potion">Hai ancora bisogno di una Pozione %s per poter schiudere di nuovo questo animale</string>
     <string name="suggest_pet_hatch_again_missing_egg">Hai ancora bisogno di un uovo %s per poter schiudere di nuovo questo animale</string>
-    <string name="suggest_pet_hatch_missing_both">Hai bisogno di %s e una Pozione %s per poter schiudere questo animale</string>
+    <string name="suggest_pet_hatch_missing_both">Hai bisogno di %1$s e una Pozione %2$s per poter schiudere questo animale</string>
     <string name="suggest_pet_hatch_missing_potion">Hai bisogno di una Pozione %s per poter schiudere questo animale</string>
     <string name="suggest_pet_hatch_missing_egg">Hai bisogno di un uovo %s per poter schiudere questo animale</string>
     <string name="view_onboarding_tasks">Visualizza le attività introduttive</string>
@@ -1030,13 +1030,13 @@
     <string name="unblock_user">Sblocca utente</string>
     <string name="block_user">Blocca utente</string>
     <string name="spooky_promo_info_prompt">La vendita di Gemme è tornata per infestare la fine del Gala Autunnale di quest\'anno! Questa è l\'ultima possibilità per ottenere più gemme che mai, quindi fanne scorta finché dura!</string>
-    <string name="spooky_promo_info_instructions">Tra il %s e il %s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
+    <string name="spooky_promo_info_instructions">Tra il %1$s e il %2$s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
     <string name="view_gem_bundles">Visualizza pacchetti di gemme</string>
     <string name="fall_promo_info_prompt">Il Gala Autunnale è in pieno svolgimento, quindi abbiamo pensato che fosse il momento perfetto per presentare la nostra prima vendita di Gemme in assoluto! Ora otterrai più gemme ogni acquisto più che mai.</string>
-    <string name="fall_promo_info_instructions">Tra il %s e il %s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
+    <string name="fall_promo_info_instructions">Tra il %1$s e il %2$s, acquista semplicemente un pacchetto di gemme come faresti di solito, e sull\' account ti verranno accreditate con in aggiunta l\'importo promozionale. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
     <string name="limitations">Limitazioni</string>
     <string name="how_it_works">Come funziona</string>
-    <string name="x_to_y">%s a %s</string>
+    <string name="x_to_y">%1$s a %2$s</string>
     <string name="usually_x_gems">Solitamente %d Gemme</string>
     <string name="user_is_blocked_explanation">Un utente bloccato non può mandarti Messaggi Privati ma vedrai i suoi messaggi nella Taverna o nelle Gilde.</string>
     <string name="user_is_blocked">Hai bloccato questo utente</string>
@@ -1127,7 +1127,7 @@
     <string name="sale_ends_in">La vendita termina fra %s</string>
     <string name="damage_pending">%s danno in sospeso</string>
     <string name="discard">Scarta</string>
-    <string name="class_confirmation_price">Vuoi cambiare la tua classe in %s per %d gemme\?</string>
+    <string name="class_confirmation_price">Vuoi cambiare la tua classe in %1$s per %2$d gemme\?</string>
     <string name="adventure_guide_description_new">Completa questi obbiettivi e guadagnerai &lt;b&gt;5 Medaglie&lt;/b&gt; e &lt;font color=#EE9109&gt;&lt;b&gt;100 Ori&lt;/b&gt;&lt;/font&gt; quando avrai finito!</string>
     <string name="removed_social_auth">%s disconnesso</string>
     <string name="discard_changes_to_task_message">Sei sicuro/a di voler scartare le modifiche fatte a questa attività\?</string>
@@ -1138,7 +1138,7 @@
     <string name="add">Aggiungi</string>
     <string name="use_item">Usa Oggetto sul membro della squadra</string>&gt;
     <string name="unsaved_changes">Modifiche Non Salvate</string>
-    <string name="gift_confirmation_text_gems_new">Hai inviato %s %s gemme.</string>
+    <string name="gift_confirmation_text_gems_new">Hai inviato %1$s %2$s gemme.</string>
     <string name="subscription_confirmation">Sei ora abbonato/a per 1 mese</string>
     <string name="subscription_confirmation_multiple">Sei ora abbonato/a per %s mesi</string>
     <string name="gem_purchase_confirmation">Hai ottenuto %s gemme.</string>
@@ -1211,7 +1211,7 @@
     <string name="tutorial_reset_confirmation">I tuoi Tutorial sono stati resettati</string>
     <string name="death_description">Ma puoi recuperarli tutti lavorando sodo! Buona fortuna, te la caverai benissimo.</string>
     <string name="faint_broken_equipment">L\'equipaggiamento danneggiato può essere ricomprato nella colonna Ricompense</string>
-    <string name="faint_loss_description">Tornerai a livello <b>%d</b>, perderai <b>%d</b> Oro e danneggerai <b>un pezzo di armatura</b>… Puoi ottenerli di nuovo lavorando sodo!</string>
+    <string name="faint_loss_description">Tornerai a livello <b>%1$d</b>, perderai <b>%2$d</b> Oro e danneggerai <b>un pezzo di armatura</b>…</string>
     <string name="account_reset">Ripristino Account</string>
     <string name="display">Mostra</string>
     <string name="go_to_subscription">Vai ad abbonamento</string>
@@ -1251,4 +1251,4 @@
         <item quantity="other">Voi, %d altri</item>
     </plurals>
     <string name="x_and_y">%1$s e %2$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 8562208b1..f81158258 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -67,9 +67,9 @@
     <string name="sunday">日</string>
     <string name="levelup_header">レベル%1$dになった！</string>
     <string name="levelup_detail">現実での目標を達成してレベルが上がり、体力が全回復した！</string>
-    <string name="onwards">イエーイ！</string>
-    <string name="faint_subtitle">がっかりしないで！</string>
-    <string name="faint_header">体力がなくなった！</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="used_skill_without_mana">%1$s を唱えた。</string>
@@ -531,12 +531,12 @@
     <string name="world_boss">ワールドボス</string>
     <string name="boss_art">ボス画像</string>
     <string name="world_boss_description">ワールドボスの説明</string>
-    <string name="rage_strike_count">怒り攻撃 %d/%d</string>
+    <string name="rage_strike_count" formatted="false">怒り攻撃 %d/%d</string>
     <string name="pending_strike_title">保留中の攻撃</string>
     <string name="strike_description_title">怒り攻撃とは？</string>
     <string name="strike_active_title">%s が襲撃を受けました！</string>
-    <string name="strike_active_description">愛すべき%sは%sの攻撃で%sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
-    <string name="questShop">クエスト</string>
+    <string name="strike_active_description">愛すべき%1$sは%2$sの攻撃で%3$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>
@@ -850,7 +850,7 @@
     <string name="local">ローカル</string>
     <string name="authentication_methods">認証方式</string>
     <string name="someone">誰か</string>
-    <string name="invitation_title">%sはあなたをグループ%sに招待しました</string>
+    <string name="invitation_title">%1$sはあなたをグループ%2$sに招待しました</string>
     <string name="password_too_short">パスワードが短すぎます。あと%d文字必要です</string>
     <string name="copy_username">ユーザー名をコピーする</string>
     <string name="id_copied">ユーザーIDをクリップボードにコピーする</string>
@@ -1021,10 +1021,10 @@
     <string name="first_drop_title">新しいアイテムを見つけました！</string>
     <string name="go_to_items">「アイテム」へ</string>
     <string name="spooky_promo_info_prompt">ジェムのセールが今年の秋の大祭に出没するために戻ってきました！いつもよりもジェムを多く手に入れるラストチャンスです。キャンペーンの間にジェムをストックしておきましょう！</string>
-    <string name="spooky_promo_info_instructions">%sから%sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
+    <string name="spooky_promo_info_instructions">%1$sから%2$sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
     <string name="view_gem_bundles">ジェムセットを見る</string>
     <string name="fall_promo_info_prompt">秋の大祭も最高潮で、はじめてのジェムのセールを皆さんにお知らせするのに最高のタイミングだと我々は考えました！このセールでは、いつもと同じ値段で、いつもよりも多くのジェムが購入できます。</string>
-    <string name="fall_promo_info_instructions">%sから%sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
+    <string name="fall_promo_info_instructions">%1$sから%2$sの間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
     <string name="limitations">制限事項</string>
     <string name="how_it_works">機能説明</string>
     <string name="x_to_y">%1$sから%2$sへ</string>
@@ -1120,7 +1120,7 @@
     <string name="reset_counter">カウンターをリセット</string>
     <string name="x_remaining">残り%s</string>
     <string name="discard">捨てる</string>
-    <string name="class_confirmation_price">クラスを%sに%dジェムで変更しますか？</string>
+    <string name="class_confirmation_price">クラスを%1$sに%2$dジェムで変更しますか？</string>
     <string name="use_item">パーティーメンバーにアイテムを使う</string>&gt;
     <string name="unsaved_changes">保存されていない変更</string>
     <string name="discard_changes_to_task_message">このタスクへの変更を保存せずに終了しますか？</string>
@@ -1159,7 +1159,7 @@
     <string name="quest_party_required_title">クエストを開始する前にパーティーに参加する必要があります</string>
     <string name="quest_party_required_description">パーティーに入れば、ひとりでクエストに挑戦したり、仲間を招待して一緒にクエストに挑戦したりできます！</string>
     <string name="new_pieces_added_every_month">毎月新しい作品が追加されます</string>
-    <string name="armoire_rate_equipment_description">毎月、新しい装備品が追加されます。すべての装備品を所持している場合、50%/50%の確率で「食べ物」または「経験値」を獲得できます。</string>
+    <string name="armoire_rate_equipment_description">毎月、新しい装備品が追加されます。すべての装備品を所持している場合、50/50の確率で「食べ物」または「経験値」を獲得できます。</string>
     <string name="armoire_rate_food_description">10種類の食べ物のうち1つを受け取れます。特別なイベント時には、通常の食べ物がケーキやお菓子に変わります。</string>
     <string name="cds_subtitle">デフォルトの0時時間をすぎた時間に1日が切り替わるように調整できます。</string>
     <string name="avatar_hair_color_customization">ヘアカラーのカスタマイズ</string>
@@ -1231,7 +1231,7 @@
 \n買い戻すことができます</string>
     <string name="armoire_rate_experience_title">20% 経験値</string>
     <string name="armoire_rate_food_title">20% の食べ物</string>
-    <string name="faint_loss_description">レベル <b>%d</b> に下がり、<b>%d</b> ゴールドを失い、<b>装備が一つ</b> が壊れます…頑張ればすべて取り戻せます！</string>
+    <string name="faint_loss_description">レベル <b>%1$d</b> に下がり、<b>%2$d</b> ゴールドを失い、<b>装備が一つ</b> が壊れます…頑張ればすべて取り戻せます！</string>
     <string name="armoire_rate_equipment_title">60% 装備品</string>
     <string name="academics">学術分野</string>
     <string name="advocacy_causes">主義主張</string>
@@ -1385,176 +1385,4 @@
     <string name="resume_damage_2_description">未完了の日課は、連続実行回数と習慣カウンターを通常通りリセットします</string>
     <string name="you_equipped_x">%sを装備しました</string>
     <string name="open_settings">設定を開く</string>
-    <string name="pause_damage_1_description">ボスは、他のパーティメンバーが日課を完了しない場合にダメージを与えます</string>
-    <string name="pause_damage_2_title">タスクの連続実行回数と習慣カウンターはリセットされません</string>
-    <string name="pause_damage_3_title">クエストの進行は保留されます</string>
-    <string name="pause_damage_3_description">ボスへのダメージや拾ったコレクションアイテムは、ダメージを再開するまで保存されます</string>
-    <string name="by_invite">招待</string>
-    <string name="habiticans_looking_party_empty">今、パーティーを探している人はいません。後でチェックしてください！</string>
-    <string name="invite_with_username_email">ユーザー名またはEメールで招待します</string>
-    <string name="habiticans_send_invite">知っているプレーヤーに直接招待状を送ります</string>
-    <string name="username_or_email">ユーザー名またはメールアドレス</string>
-    <string name="seeking_party_description">知り合いはいないけれどパーティーに参加したいですか？あなたが招待を待っていることをパーティーリーダーに知らせましょう！</string>
-    <string name="seeking_party_title">パーティーをお探しですか？</string>
-    <string name="look_for_party">パーティーを探す</string>
-    <string name="list">リスト</string>
-    <string name="resume_damage_summary">ダメージは現在停止中です。</string>
-    <string name="pause_damage">ダメージを止める</string>
-    <string name="pause_damage_1_title">"日課を完了しなくてもダメージはありません "</string>
-    <string name="pause_damage_2_description">日課の連続実行回数と習慣のカウンターは、この機能がオンになっている間だけ増加します</string>
-    <string name="pause_damage_summary">ダメージは現在有効です。詳細はこちら。</string>
-    <string name="habiticans_looking_party">パーティー加入希望者のリストです</string>
-    <string name="invited">招待されました</string>
-    <string name="you_re_looking_for_party">パーティーを探している最中です！</string>
-    <string name="rescind_invite">招待を取り消す</string>
-    <string name="visit_faq">FAQへ行きましょう</string>
-    <string name="seeking_hint">招待状を待つか、自分でパーティーを始めることができます</string>
-    <string name="contrib_tier_description">もしあなたが、色付きの表示名とアイコンのあるアカウントを見かけたら、それは貢献者段位です！段位はHabiticaで翻訳やコーディングを手伝ってくれた人に与えられます。段位が高いほど、より多くの貢献をしていることになります。</string>
-    <string name="equipment_class_locked">この装備はクラス限定です</string>
-    <string name="change_class_to_x">%sにクラスを変更します</string>
-    <string name="pending_invite">招待待ち</string>
-    <string name="invalid_input">無効な入力</string>
-    <string name="username_requirements">a～zのアルファベット、数字、ハイフン、アンダースコアのみ使用可能です</string>
-    <string name="contributor_tiers">貢献者の段位</string>
-    <string name="shop_armoire_title">%sの装備をすべて所有しています</string>
-    <string name="visit_market">市場へ行く</string>
-    <string name="shop_armoire_description">新しい装備は季節の大祭で追加されます。それまでは、%d個の装備がラッキー宝箱で入手できます！</string>
-    <string name="shop_armoire_empty_description">新しい装備は季節の大祭で発表されます。ラッキー宝箱も毎月新しい在庫を入荷しています！</string>
-    <string name="invited_to_guild_notification">&lt;font color=#925CF3&gt;%2$s&lt;/font&gt; があなたをグループ &lt;b&gt;%1$s&lt;/b&gt;に招待しています</string>
-    <string name="report_challenge_explanation">[コミュニティガイドライン](https://habitica.com/static/community-guidelines)および/または[利用規約](https://habitica.com/static/terms)に違反するチャンレジのみ報告してください。虚偽の報告はHabiticaのコミュニティガイドラインに違反します。</string>
-    <string name="report_reason_title_challenge">このチャンレジを報告している理由は何ですか？</string>
-    <string name="unlock_gear_and_skills">%sの装備とスキルをアンロック</string>
-    <string name="rescinded">取り消されました</string>
-    <string name="no_x">%sがありません</string>
-    <string name="empty_food_description">タスクをこなしたり、宝箱を買ったり、[市場](/shops/market)に行って買い物をしましょう！</string>
-    <string name="empty_potions_description">タスクをこなしたり、たまごがえしの薬のクエストをこなしたり、[市場](/shops/market)に行って買い物をしましょう！</string>
-    <string name="item_footer_title">タスクから正しい%sがもらえてないですか？</string>
-    <string name="item_footer_description">[市場](/shops/market)へ行って、欲しいものを買いに行きましょう！</string>
-    <string name="quests_footer_description">[クエストショップ](/shops/quests)で何があるかチェックしましょう！</string>
-    <string name="empty_quests_description">クエストはレベルアップやログインボーナス、[クエストショップ](/shops/quests)から入手できます！</string>
-    <string name="empty_eggs_description">タスクをこなしたり、たまごクエストをこなしたり、[市場](/shops/market)に行って買い物をしましょう！</string>
-    <string name="empty_special_description_subscribed">季節の大祭や、有料会員限定の月初にもらえるミステリー・ボックスから変身アイテムをゲットしましょう！</string>
-    <string name="potions">たまごがえしの薬</string>
-    <string name="quests_footer_title">もっとクエストが欲しいですか？</string>
-    <string name="food_footer_description">[市場](/shops/market)をチェックして、えさやペットを即座に育てるくらを買いましょう！</string>
-    <string name="hatchingPotions_footer_description">[市場](/shops/market)では、定番のたまごがえしの薬や季節限定のたまごがえしの薬を購入できます！</string>
-    <string name="open_profile">プロフィールを開く</string>
-    <string name="customize_avatar">アバターのカスタマイズ</string>
-    <string name="share_avatar">アバターを共有</string>
-    <string name="subscribe_listitemArmoire">宝箱を増やすチャンス</string>
-    <string name="subscribe_listitemArmoire_description">宝箱1個分の料金で、新装備を2個手に入れるチャンスがあります</string>
-    <string name="eggs_footer_description">[市場](/shops/market)をチェックして、必要な卵だけを買いましょう！</string>
-    <string name="subscribe_incentive_text_faint">HP切れを防ぐために、有料プランで毎日セカンドチャンスを手に入れましょう</string>
-    <string name="subscriber_benefit_used_faint">あなたは今日、すでにセカンドチャンスを使用済みです。%sで再度ご利用いただけます</string>
-    <string name="sub_perk">有料プラン特典</string>
-    <string name="subscribe_incentive_button_armoire">有料会員になればもう一度無料でオープンできます！</string>
-    <string name="subscribe_incentive_text_armoire">有料会員は、宝箱を購入するたびに追加のチャンスがあります</string>
-    <string name="subscribe_second_armoire_open_text">有料会員は、宝箱での特別なチャンスやその他の特典を得ることができます！</string>
-    <string name="subscriber_button_armoire">無料でもう一度開ける！</string>
-    <string name="subscriber_button_faint">セカンドチャンス：1HPで持ちこたえる！</string>
-    <string name="subscribe_second_chance_incentive_text">有料会員は毎日、人生のセカンドチャンスを得ることができ、その他にも特典があります！</string>
-    <string name="subriber_benefit_notification_faint">1HPでセカンドチャンスを得ました！</string>
-    <string name="quest_mechanics_damage_description">ボスのダメージは、パーティメンバーが毎日チェックインするたびに計算されます。このダメージは、次にサーバーと同期するアクションを行ったときに適用されます。ボスのダメージはパーティーのチャットに記録されます。</string>
-    <string name="quest_mechanics_collecting_description">コレクションクエスト中にタスクを完了すると、ランダムな確率でクエストアイテムを見つけることができます。保留中のアイテムは翌日のリセット時に適用されます。知覚はアイテム出現率を上げます。</string>
-    <string name="quest_mechanics_rage_description">難易度の高いボスには、HPの下にオレンジ色の怒りメーターが表示されているものがいます。このメーターは、参加者が日課を完了しないと増加します。メーターが満タンになると、ボスは特大ダメージを与える恐ろしい攻撃を放ちます！</string>
-    <string name="watch_ad_to_hang_on">1HPで持ちこたえる広告を見ます！</string>
-    <string name="quest_mechanics_boss_description">あらゆる種類のタスクを完了するか、スキルを使用すると保留中のダメージが蓄積されます！ダメージは次の日のリセット時に適用されます。体力はダメージ量に影響します。</string>
-    <string name="quest_mechanics_damage_title">日課を未完にするとボスが攻撃してきます</string>
-    <string name="quest_mechanics_pausing_title">ダメージの一時停止</string>
-    <string name="quest_mechanics_pausing_description">"日課をクリアするのに苦労しているなら、設定でダメージを一時停止して休憩しましょう。これにより、ボスが自分や他のメンバーを傷つけるのを防ぐことができます。他のメンバーが日課を完了しないときのダメージは受けるので、気をつけましょう！ "</string>
-    <string name="quest_mechanics_rage_title">怒りメーター</string>
-    <string name="buy_gems_with_gold">ゴールドでジェムを購入</string>
-    <string name="subscribe_prompt_2">ゴールドでジェムを購入したり、他の限定特典を受け取るために有料プランに加入しましょう！</string>
-    <string name="subscribe_listitemArmoire_description_2">ラッキー宝箱を開けるたびに、無料でもう一度開けることができます！</string>
-    <string name="quest_mechanics">クエストの仕組み</string>
-    <string name="quest_mechanics_boss_title">ボスへのダメージ</string>
-    <string name="quest_mechanics_collecting_title">クエストアイテムを集める</string>
-    <plurals name="x_minutes">
-        <item quantity="other">%d 分</item>
-    </plurals>
-    <string name="monthly_backgrounds">月替わりの背景</string>
-    <string name="winter">冬</string>
-    <string name="spring">春</string>
-    <string name="summer">夏</string>
-    <string name="fall">秋</string>
-    <string name="animal_tails">動物のしっぽ</string>
-    <string name="avatar_shirts">シャツ</string>
-    <string name="avatar_skins">肌</string>
-    <string name="avatar_accents">飾り</string>
-    <string name="avatar_hair_styles">髪型</string>
-    <string name="customizations_owner">Felicitus</string>
-    <string name="avatar_beards">あごひげ</string>
-    <string name="avatar_hair_colors">髪の色</string>
-    <string name="looking_for_more">もっとお探しですか？</string>
-    <string name="customizations_no_owned">これらのアイテムを持っていません</string>
-    <string name="customization_shop_check_out">アバターをカスタマイズするには、カスタマイズショップへ行きましょう！</string>
-    <plurals name="repeat_weekly">
-        <item quantity="other">毎週</item>
-    </plurals>
-    <plurals name="repeat_monthly">
-        <item quantity="other">毎月</item>
-    </plurals>
-    <string name="faint_subscriber_description">有料プランを利用することで、HPを使い切った場合のセカンドチャンスを毎日得ることができます</string>
-    <string name="subscription_benefit_armoire_sub">有料会員は、ラッキー宝箱を手に入れるチャンスが増えます！</string>
-    <string name="error_loading_member_body">このプレーヤーのデータを読み込む際にエラーが発生しました。ユーザー名を正しく入力してください。</string>
-    <string name="customizations">カスタマイズ</string>
-    <string name="standard_backgrounds">スタンダードな背景</string>
-    <string name="customization_shop_more">アバターをカスタマイズする方法は、カスタマイズショップをご覧ください！</string>
-    <plurals name="repeat_yearly">
-        <item quantity="other">毎年</item>
-    </plurals>
-    <plurals name="items_pending">
-        <item quantity="other">%d個のアイテムが保留中です</item>
-    </plurals>
-    <string name="revive_broken_equipment">%sはこわれました</string>
-    <string name="avatar_mustaches">くちひげ</string>
-    <string name="preference_email_content_release">コンテンツリリースとイベント</string>
-    <string name="subscriber_benefit">有料会員特典</string>
-    <plurals name="x_days">
-        <item quantity="other">%d 日</item>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="other">%d 時間</item>
-    </plurals>
-    <string name="subscribe_gems_for_gold_incentive_text">ゴールドでジェムを購入したり、他の限定特典を受け取るために有料プランに加入しましょう！</string>
-    <string name="subscribe_listitem2_description_2">時間経過とともに、タイムトラベラーの店でアイテムを購入できる砂時計を獲得します</string>
-    <string name="see_more_subscription_options">有料プランのオプションをもっと見る</string>
-    <string name="rage">怒り</string>
-    <string name="preference_push_invited_to_group_plan">グループ・プランに招待されました</string>
-    <string name="preference_push_joined_group_plan_mention">グループプランでメンションする</string>
-    <string name="subscribe_incentive_button_faint">1HPで持ちこたえるために有料会員になりましょう！</string>
-    <string name="subscriber_benefit_success_faint">1HPでセカンドチャンスを得ました！</string>
-    <string name="subscribe_hourglass_incentive_text">有料会員は、タイムトラベラーの店でアイテムを購入できる神秘の砂時計や、その他の限定特典を得ることができます！</string>
-    <string name="no_saddles">くらを所有していません</string>
-    <string name="error_loading_member">プレーヤーが見つかりません</string>
-    <string name="report_challenge">チャレンジを報告する</string>
-    <string name="switches_in_x">%sに切り換えます</string>
-    <string name="tap_to_reload">新しいアイテムに更新します</string>
-    <string name="purchase_saddles_in_market">くらはペットを即座に乗騎に昇格させます。くらは市場で購入できます。</string>
-    <string name="you_own_all_items">あなたはこれらすべてを所有しています</string>
-    <string name="try_on_next_month">アバターをカスタマイズして試着できます。来月のオプションもお見逃しなく！</string>
-    <string name="try_on_next_season">アバターをカスタマイズして試着することができます。次のシーズンのオプションもお見逃しなく！</string>
-    <string name="try_on_customize">アバターをカスタマイズして試着することができます。</string>
-    <string name="healers">治療師</string>
-    <string name="rogues">盗賊</string>
-    <string name="warriors">戦士</string>
-    <string name="mages">魔道士</string>
-    <string name="class_equipment_shop_dialog_new">この項目は %s のみが使用可能です。設定を開いてクラスを変更してください。</string>
-    <string name="try_on_equipment">装備で試着できます。毎月初めに新しい装備が入荷します！</string>
-    <string name="insufficient_level_equipment_dialog_new">このアイテムは%sのみが使用可能です。クラスはレベル10以降に選択できます。</string>
-    <string name="customization_shop">カスタマイズショップ</string>
-    <string name="customizing_your_avatar">アバターのカスタマイズ</string>
-    <string name="equipment">装備</string>
-    <string name="error">エラー</string>
-    <string name="error_loading_gems">ジェムのロード中にエラーが発生しました</string>
-    <string name="clear_database">データベースの消去</string>
-    <string name="clear_cache_settings">キャッシュの消去</string>
-    <string name="faint_loss_description_alt">レベル <b>%d</b> に下がり、<b>%d</b> ゴールドと経験値を失います…努力次第ですべて取り戻せます！</string>
-    <string name="best_deal">最高の取引</string>
-    <string name="unlocks_x_gems_per_month">ゴールドで購入可能なジェムを月間%d個アンロックします</string>
-    <string name="two_gems_per_month">毎月+2ジェム</string>
-    <string name="popular">人気</string>
-    <string name="cleared_cache">消去されたキャッシュ</string>
-    <string name="choose_member">メンバーを選ぶ</string>
-    <string name="nye">おおみそか</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index f3a449066..f390abf50 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -544,7 +544,7 @@
     <string name="pending_strike_title">임박한 타격</string>
     <string name="strike_description_title">분노의 타격이 무엇인가요\?</string>
     <string name="strike_active_title">%s 이(가) 공격받았습니다!</string>
-    <string name="strike_active_description" formatted="false">우리의 %s는 %s가 %s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
+    <string name="strike_active_description" formatted="false">우리의 %1$s는 %2$s가 %3$s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
     <string name="questShop">퀘스트 상점</string>
     <string name="market_owner_long">상인 알렉스</string>
     <string name="tavern_owner_long">여관 주인 다니엘</string>
@@ -748,8 +748,8 @@
     <string name="subscribe_listitem5">아이템 드롭이 두 배</string>
     <string name="subscribe_listitem3_description_new">지금 %s를 받고 매달 새로운 아이템을 받으려면 구독하세요!</string>
     <string name="leave_guild_confirmation">정말로 길드를 탈퇴하시겠습니까\?</string>
-    <string name="gift_confirmation_text_sub">%s 에게 %s-개월 해비티카 구독권을 선물했습니다.</string>
-    <string name="gift_confirmation_text_sub_g1g1">원 플러스 원 프로모션을 통해 %s 에게 %s-개월 해비티카 구독권을 선물하고 동일한 구독 기간이 본인의 계정에도 적용되었습니다!</string>
+    <string name="gift_confirmation_text_sub">%1$s 에게 %2$s-개월 해비티카 구독권을 선물했습니다.</string>
+    <string name="gift_confirmation_text_sub_g1g1">원 플러스 원 프로모션을 통해 %1$s 에게 %2$s-개월 해비티카 구독권을 선물하고 동일한 구독 기간이 본인의 계정에도 적용되었습니다!</string>
     <string name="gift_gems_subtitle">선물하고 싶은 보석 꾸러미를 선택하세요!</string>
     <string name="number_responded">%1$d/%2$d 수락함</string>
     <string name="empty_title_todos_filtered">할 일 없음</string>
@@ -839,7 +839,7 @@
     <string name="copy_userid">API 아이디 복사하기</string>
     <string name="authentication_methods">인증 방식</string>
     <string name="someone">누군가</string>
-    <string name="invitation_title">%s 님이 %s 그룹에 초대하셨습니다</string>
+    <string name="invitation_title">%1$s 님이 %2$s 그룹에 초대하셨습니다</string>
     <string name="sale">할인</string>
     <string name="promo_g1g1_prompt">원 플러스 원 이벤트</string>
     <string name="promo_g1g1_description">지금 구독을 선물하면 본인도 같은 구독을 무료로 받게 됩니다!</string>
@@ -961,12 +961,12 @@
     <string name="common_questions">자주 묻는 질문</string>
     <string name="usernames_party">%s의 파티</string>
     <string name="discard">버리기</string>
-    <string name="class_confirmation_price">%s직업으로 보석 %d개를 사용하여 전직하시겠습니까\?</string>
+    <string name="class_confirmation_price">%2$d개의 보석을 사용하여 %1$s직업으로 전직하시겠습니까\?</string>
     <string name="subscription_confirmation">이제 1개월간 구독하였습니다</string>
     <string name="month_reminder_title">일과에 변화가 필요한가요\?</string>
     <string name="use_item">파티원에게 아이템 사용하기</string>&gt;
     <string name="unsaved_changes">저장되지 않은 변경사항들</string>
-    <string name="gift_confirmation_text_gems_new">%s님에게 %s개의 보석을 보냈습니다.</string>
+    <string name="gift_confirmation_text_gems_new">%1$s님에게 %2$s개의 보석을 보냈습니다.</string>
     <string name="gem_purchase_confirmation">%s개의 보석을 얻었습니다</string>
     <string name="leave_guild_challenges_confirmation">길드를 탈퇴할 때, 참여 중이던 도전 과제를 계속 수행하시겠습니까\?</string>
     <string name="subscription_confirmation_multiple">이제 %s개월간 구독하였습니다</string>
@@ -1059,11 +1059,11 @@
     <string name="hatch">부화시키기</string>
     <string name="delete_challenge_task_title">도전과제를 삭제하시겠습니까\?</string>
     <string name="suggest_pet_hatch_missing_potion">이 펫을 부화시키려면 %s의 물약이 필요합니다</string>
-    <string name="suggest_pet_hatch_missing_both">이 펫을 부화시키려면 %s와(과) %s의 물약이 필요합니다</string>
+    <string name="suggest_pet_hatch_missing_both">이 펫을 부화시키려면 %1$s와(과) %2$s의 물약이 필요합니다</string>
     <string name="suggest_pet_hatch_again_missing_egg">이 펫을 부화시키려면 %s의 알이 다시 필요합니다</string>
     <string name="suggest_pet_hatch_again_missing_potion">이 펫을 부화시키려면 %s의 물약이 다시 필요합니다</string>
-    <string name="suggest_pet_hatch_again_missing_both">이 펫을 부화시키려면 %s와(과) %s의 물약이 다시 필요합니다</string>
-    <string name="can_hatch_pet">이 펫을 부화시키기 위해 %s의 알과 %s의 물약을 조합하세요!</string>
+    <string name="suggest_pet_hatch_again_missing_both">이 펫을 부화시키려면 %1$s와(과) %2$s의 물약이 다시 필요합니다</string>
+    <string name="can_hatch_pet">이 펫을 부화시키기 위해 %1$s의 알과 %2$s의 물약을 조합하세요!</string>
     <string name="suggest_pet_hatch_missing_egg">이 펫을 부화시키려면 %s의 알이 필요합니다</string>
     <string name="disablePrivateMessages">쪽지 비활성화</string>
     <string name="unblock_user">사용자 차단 해제하기</string>
@@ -1083,14 +1083,14 @@
     <string name="block">차단</string>
     <string name="pms_disabled">쪽지가 비활성화 되어있습니다.</string>
     <string name="pms_disabled_description">당신은 여전히 쪽지를 보낼 수 있지만 아무도 당신에게 쪽지를 보낼 수 없습니다. 이 기능은 설정에서 다시 활성화할 수 있습니다.</string>
-    <string name="spooky_promo_info_instructions">%s와(과) %s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
+    <string name="spooky_promo_info_instructions">%1$s와(과) %2$s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
     <string name="how_it_works">어떻게 작동하나요</string>
     <string name="limitations">제한 사항</string>
     <string name="fall_promo_info_prompt">가을 갈라가 열려있습니다! 보석 세일의 최적의 기간이죠! 보석을 구매할 때 평소보다 많은 보석을 얻게됩니다.</string>
     <string name="view_gem_bundles">보석 꾸러미 보기</string>
     <string name="usually_x_gems">보통 %d보석</string>
-    <string name="x_to_y">%s부터 %s</string>
-    <string name="fall_promo_info_instructions">%s와(과) %s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
+    <string name="x_to_y">%1$s부터 %2$s</string>
+    <string name="fall_promo_info_instructions">%1$s와(과) %2$s 사이에, 보석 꾸러미를 평소처럼 구입하면 더 많은 양의 보석이 적립됩니다. 더 많은 보석을 쓰고, 공유하고, 미래를 위해 모아두세요!</string>
     <string name="spooky_promo_info_prompt">보석 세일이 올해 가을 축제 마지막을 장식하고 있습니다! 지금이 어느 때보다 보석을 많이 얻을 수 있는 마지막 기회이니, 끝나기 전에 보석을 쟁여두세요!</string>
     <string name="dark_mode">다크 모드</string>
     <string name="theme_mode">테마 모드</string>
@@ -1212,7 +1212,7 @@
     <string name="you_ran_out_of_health">생명력이 모두 닳았습니다!</string>
     <string name="death_description">하지만 모두 돌려받을 수 있을 겁니다! 당신은 할 수 있어요!</string>
     <string name="faint_broken_equipment">부서진 장비는 보상에서 다시 구매할 수 있습니다</string>
-    <string name="faint_loss_description">레벨이 <b>%d</b>로 떨어지고, <b>%d</b>의 골드를 잃고, <b>장비</b>가 부서집니다…</string>
+    <string name="faint_loss_description">레벨이 <b>%1$d</b>로 떨어지고, <b>%2$d</b>의 골드를 잃고, <b>장비</b>가 부서집니다…</string>
     <string name="account_reset">계정 초기화</string>
     <string name="avatar_skin_customization">아바타 피부 커스텀</string>
     <string name="avatar_shirt_customization">아바타 상의 커스텀</string>
@@ -1262,4 +1262,4 @@
     <string name="class_changed_description">%s 스킬을 사용할 수 있고 상점에서 장비를 구매할 수 있습니다! 레벨을 올려 스탯 포인트를 획득하면 스킬을 강화하는 데 사용할 수 있습니다.</string>
     <string name="change_class_selected_confirmation">보석 3개를 사용하여 %1$s 직업으로 변경하시겠습니까\?</string>
     <string name="x_and_y">%1$s 와(과) %2$s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 235086257..d47b1c429 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -531,11 +531,11 @@
     <string name="world_boss">Wereldbaas</string>
     <string name="boss_art">Baas Kunst</string>
     <string name="world_boss_description">Wereldbaas beschrijving</string>
-    <string name="rage_strike_count">Woede Aanvallen: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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="strike_active_description">Onze dierbare %1$s was verwoest toen de %2$s de %3$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>
@@ -700,7 +700,7 @@
     <string name="local">Lokaal</string>
     <string name="authentication_methods">Verificatiemethoden</string>
     <string name="someone">Iemand</string>
-    <string name="invitation_title">%s heeft je uitgenodigd voor diens groep %s</string>
+    <string name="invitation_title">%1$s heeft je uitgenodigd voor diens groep %2$s</string>
     <string name="password_too_short">Je wachtwoord moet minimaal %d karakters lang zijn</string>
     <string name="copy_username">Kopieer Gebruikersnaam</string>
     <string name="id_copied">Gebruikers ID naar het klembord gekopieerd</string>
@@ -816,7 +816,7 @@
     <string name="preference_push_important_announcements">Belangrijke mededelingen</string>
     <string name="damage_paused">Schade is onderbroken</string>
     <string name="discover">Ontdekken</string>
-    <string name="gift_confirmation_text_sub">Je hebt %s een %s-maand Habitica abonnement gestuurd.</string>
+    <string name="gift_confirmation_text_sub">Je hebt %1$s een %2$s-maand Habitica abonnement gestuurd.</string>
     <string name="task_title">Taaktitel</string>
     <string name="create_party">Een nieuwe groep aanmaken</string>
     <string name="only_leader_create_challenge">Alleen de leider kan uitdagingen creëren</string>
@@ -854,7 +854,7 @@
     <string name="report_message_hint">Reden voor melding (optioneel)</string>
     <string name="report_message_title">%s melden wegens overtreding:</string>
     <string name="report_explanation">Meld **alleen** een bericht dat de [Communityrichtlijnen](https://habitica.com/static/community-guidelines) en/of [Servicevoorwaarden](https://habitica.com/static/terms) schendt. Het ongepast melden van een bericht kan een overtreding opleveren.</string>
-    <string name="gift_confirmation_text_sub_g1g1">Je hebt %s een %s-maand Habitica-abonnement gestuurd en hetzelfde abonnement is toegepast op je account voor onze Gift One Get One-promotie!</string>
+    <string name="gift_confirmation_text_sub_g1g1">Je hebt %1$s een %2$s-maand Habitica-abonnement gestuurd en hetzelfde abonnement is toegepast op je account voor onze Gift One Get One-promotie!</string>
     <string name="gift_gems_subtitle">Kies hieronder het edelsteenpakket dat je cadeau wilt doen!</string>
     <string name="gift_subscription_subtitle">Kies hieronder het abonnement dat u wilt schenken! Deze aankoop wordt niet automatisch verlengd.</string>
     <string name="gift_one_get_one_detailed_description">Terwijl deze promotie actief is, ontvang je zelf, automatisch hetzelfde abonnement nadat je je cadeau hebt verzonden.</string>
@@ -972,7 +972,7 @@
     <string name="is_open">Openen</string>
     <string name="discard">Gooi weg</string>
     <string name="rejoin_party">Je kan deze groep niet weer inkomen zonder uitnodiging.</string>
-    <string name="class_confirmation_price">Wil je jouw klasse veranderen naar %s voor %d edelstenen\?</string>
+    <string name="class_confirmation_price">Wil je jouw klasse veranderen naar %1$s voor %2$d edelstenen\?</string>
     <string name="quest_items_found">Je hebt %d queeste-voorwerpen gevonden</string>
     <string name="leave_delete_tasks">Verlaat en verwijder Taken</string>
     <string name="guild_challenges">Je neemt deel aan een Gilde Uitdaging</string>
@@ -995,6 +995,4 @@
     <string name="usernames_party">%s\'s Groep</string>
     <string name="your_tags">Jouw tags</string>
     <string name="challenge_tags">Uitdagingen tags</string>
-    <string name="quest_party_required_title">Je moet in een Groep zitten voor je een Queeste kan starten</string>
-    <string name="quest_party_required_description">Als je eenmaal in een Groep zit, kan je zelf Queestes doen of vrienden uitnodigen om ook met hen Queestes te doen!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 35d12417e..8d7106d9a 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -486,7 +486,7 @@
     <string name="world_boss">Boss ogólnoświatowy</string>
     <string name="boss_art">Obrazek bossa</string>
     <string name="world_boss_description">Opis Ogólnoświatowego Bossa</string>
-    <string name="rage_strike_count">Ataki Szału: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_active_title">%s został zaatakowany!</string>
@@ -557,7 +557,7 @@
     <string name="identify_your_challenge_with_a_tag">Określ wyzwanie krótką nazwą</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">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 %1$s został zdewastowany, gdy %2$s roztrzaskał %3$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>
@@ -756,7 +756,7 @@
     <string name="armoireFood_new">Szperasz w Skrzyni i znajdujesz jedzenie. Co to tutaj robi\?</string>
     <string name="sell_no_price">Sprzedaj</string>
     <string name="create_new_party">Stwórz nową drużynę</string>
-    <string name="class_confirmation_price">Czy chcesz zmienić swoją klasę na %s za %d klejnotów\?</string>
+    <string name="class_confirmation_price">Czy chcesz zmienić swoją klasę na %1$s za %2$d klejnotów\?</string>
     <string name="next_hourglass">Następna klepsydra</string>
     <string name="guild_challenges">Bierzesz udział w wyzwaniu gildii</string>
     <string name="party_challenges">Bierzesz udział w wyzwaniu drużyny</string>
@@ -876,7 +876,7 @@
     <string name="subscribers_mythic_hourglasses"><i>Subskrybenci otrzymują Mistyczną Klepsydrę w pierwszych trzech dniach miesiąca.</i></string>
     <string name="member_group_plan">Członek Planu Grupowego</string>
     <string name="g1g1_info_3_text">Aby skorzystać z promocji, należy podarować Subskrybcję innemu użytkownikowi Habitica. Jeśli Ty lub osoba otrzymująca Twój prezent już posiada Subskrybcję, miesiące z tego zakupu zostaną wykorzystane dopiero po zakończeniu lub zrezygnowaniu z bieżącej Subskrybcji.</string>
-    <string name="invitation_title">Użytkownik %s zaprosił cię do grupy %s</string>
+    <string name="invitation_title">Użytkownik %1$s zaprosił cię do grupy %2$s</string>
     <string name="copy_username">Skopiuj nazwę użytkownika</string>
     <string name="password_too_short">Twoje hasło musi zawierać przynajmniej %d znaków</string>
     <string name="authentication_methods">Metody Uwierzytelnienia</string>
@@ -1081,14 +1081,14 @@
     <string name="block_user">Zablokuj użytkownika</string>
     <string name="unblock_user">Odblokuj użytkownika</string>
     <string name="block_user_title">Zablokować %s\?</string>
-    <string name="spooky_promo_info_instructions">Czas promocji: %s-%s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
+    <string name="spooky_promo_info_instructions">Czas promocji: %1$s-%2$s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
     <string name="g1g1_promo_info_instructions">Dotknij \"Podaruj Subskrybcję\" i wpisz nazwę użytkownika, któremu chcesz ją podarować. Następnie wybierz okres Subskrybcji i dokończ zakup. Twojemu kontu automatycznie zostanie przypisana Subskrybcja z takim samym okresem i korzyściami.</string>
     <string name="pms_disabled">Prywatne wiadomości są wyłączone</string>
     <string name="pms_disabled_description">Nadal jesteś w stanie wysyłać wiadomości, ale nie będziesz otrzymywać wiadomości od innych. Możesz to zmienić w dowolniej chwili w ustawieniach.</string>
     <string name="x_to_y">%1$s-%2$s</string>
     <string name="how_it_works">Jak to działa</string>
     <string name="limitations">Ograniczenia</string>
-    <string name="fall_promo_info_instructions">Czas promocji: %s-%s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
+    <string name="fall_promo_info_instructions">Czas promocji: %1$s-%2$s. Kup dowolny pakiet Klejnotów, a otrzymasz promocyjną ilość w gratisie! Kup teraz i otrzymaj więcej Klejnotów na przedmioty i podarki w tej samej cenie!</string>
     <string name="view_gem_bundles">Przejdź do pakietów Klejnotów</string>
     <string name="dark_mode">Tryb ciemny</string>
     <string name="theme_mode">Tryb motywu</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index fd22faede..bf32d1b59 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -533,12 +533,12 @@
     <string name="world_boss">Chefão Global</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">Strikes de Raiva: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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">Missões</string>
+    <string name="strike_active_description">Nossa amada %1$s foi devastada quando o %2$s quebrou o %3$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>
     <string name="stable_owner_long">Matt o mestre das bestas</string>
@@ -676,7 +676,7 @@
     <string name="local">local</string>
     <string name="authentication_methods">Métodos de autenticação</string>
     <string name="someone">Alguém</string>
-    <string name="invitation_title">%s te convidou para se juntar ao grupo %s</string>
+    <string name="invitation_title">%1$s te convidou para se juntar ao grupo %2$s</string>
     <string name="password_too_short">Sua senha deve ter pelo menos %d caracteres</string>
     <string name="copy_username">Copiar nome de usuário</string>
     <string name="id_copied">ID de usuário copiado para a área de transferência</string>
@@ -1033,10 +1033,10 @@
     <string name="unblock_user">Desbloquear Usuário</string>
     <string name="block_user">Bloquear Usuário</string>
     <string name="spooky_promo_info_prompt">A Promoção de Gemas está de volta para assombrar o final do Festival de Outono deste ano! Esta é a última chance de conseguir mais Gemas do que nunca, então estoque enquanto dura!</string>
-    <string name="spooky_promo_info_instructions">Entre %s e %s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com a quantidade promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
+    <string name="spooky_promo_info_instructions">Entre %1$s e %2$s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com a quantidade promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
     <string name="view_gem_bundles">Ver Pacotes de Gemas</string>
     <string name="fall_promo_info_prompt">O Festival de Outono está em pleno andamento, então pensamos que era o momento perfeito para apresentar nossa primeira Promoção de Gemas! Agora você obterá mais Gemas com cada compra do que nunca.</string>
-    <string name="fall_promo_info_instructions">Entre %s e %s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com o valor promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
+    <string name="fall_promo_info_instructions">Entre %1$s e %2$s, basta comprar qualquer pacote de Gemas como de costume e sua conta será creditada com o valor promocional de Gemas. Mais Gemas para gastar, compartilhar ou economizar para lançamentos futuros!</string>
     <string name="limitations">Limitações</string>
     <string name="how_it_works">Como funciona</string>
     <string name="x_to_y">%1$s a %2$s</string>
@@ -1138,7 +1138,7 @@
     <string name="disconnect">Desconectar</string>
     <string name="add">Adicionar</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">Você quer mudar sua Classe para %s por %d Gemas\?</string>
+    <string name="class_confirmation_price">Você quer mudar sua Classe para %1$s por %2$d Gemas\?</string>
     <string name="use_item">Use o item em um membro do grupo</string>&gt;
     <string name="unsaved_changes">Mudanças não salvas</string>
     <string name="discard_changes_to_task_message">Tem certeza que deseja desfazer as mudanças desta tarefa\?</string>
@@ -1223,7 +1223,7 @@
     <string name="mor_gems_title">Você precisará de mais Gemas para comprar isso!</string>
     <string name="gems_support">Comprar Gemas ajuda nossa pequena equipe do Habitica</string>
     <string name="month_released">Lançamento do mês</string>
-    <string name="faint_loss_description">Você irá cair para o nível <b>%d</b>, perderá <b>%d</b> Ouro e <b>uma peça de seu equipamento</b> será destruída… Você pode recuperá-los com trabalho duro!</string>
+    <string name="faint_loss_description">Você irá cair para o nível <b>%1$d</b>, perderá <b>%2$d</b> Ouro e <b>uma peça de seu equipamento</b> será destruída… Você pode recuperá-los com trabalho duro!</string>
     <string name="avatar_skin_customization">Personalização da pele do avatar</string>
     <string name="incorrect_password">A senha está incorreta</string>
     <string name="habitica_official">Habitica Oficial</string>
@@ -1493,80 +1493,4 @@
     <string name="sub_perk">BENEFÍCIO SUB</string>
     <string name="subscribe_second_chance_incentive_text">Os assinantes têm uma segunda chance na vida todos os dias e esses outros benefícios!</string>
     <string name="watch_ad_to_hang_on">Assista ao anúncio para aguentar o 1HP!</string>
-    <string name="report_challenge_explanation">Você somente deve reportar um desafio que viole as [Diretrizes da Comunidade](https://habitica.com/static/community-guidelines) e/ou os [Termos de Serviço](http://habitica.com/static/terms). Enviar uma denúncia falsa é uma violação das Diretrizes da Comunidade do Habitica.</string>
-    <string name="quests_footer_description">Confira o [Mercado de Missões](/shops/quests) para ver o que tem disponível!</string>
-    <string name="subscriber_benefit_success_faint">Você conseguiu uma segunda chance com 1PV!</string>
-    <string name="purchase_saddles_in_market">Selas fazem seu Pet se tornar uma Montaria instantaneamente. Você pode comprar uma no Mercado.</string>
-    <string name="error_loading_member_body">Houve um erro no carregamento dos dados deste jogador. Por favor, tenha certeza que digitou o @nome do usuário corretamente.</string>
-    <plurals name="items_pending">
-        <item quantity="one">%d Item pendente</item>
-        <item quantity="many">%d Itens pendentes</item>
-        <item quantity="other">%d Itens pendentes</item>
-    </plurals>
-    <string name="report_reason_title_challenge">Por que você está reportando esse desafio\?</string>
-    <string name="eggs_footer_description">Confira o [Mercado](/lojas/mercado) para comprar somente os ovos que você precisa!</string>
-    <string name="error_loading_member">Impossível encontrar o jogador</string>
-    <string name="report_challenge">Reportar Desafio</string>
-    <string name="no_x">Sem %s</string>
-    <string name="food_footer_description">Confira o [Mercado](/shops/market) para comprar comida ou uma Sela para crescer seu Pet instantaneamente!</string>
-    <string name="hatchingPotions_footer_description">Confira o [Mercado](/shops/market) para comprar Poções de Eclosão básicas e sazonais!</string>
-    <string name="subscribe_listitem2_description_2">Ganhe Ampulhetas com o tempo para comprar itens na Loja do Viajante do Tempo</string>
-    <string name="preference_push_joined_group_plan_mention">\@Menções nos Planos do Grupo</string>
-    <string name="subscribe_incentive_button_faint">Assine para manter-se firme com 1PV!</string>
-    <string name="subscription_benefit_armoire_sub">Sua assinatura te dá uma chance extra no Baú!</string>
-    <plurals name="x_days">
-        <item quantity="one">%d Dia</item>
-        <item quantity="many">%d Dias</item>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="one">%d Hora</item>
-        <item quantity="many">%d Horas</item>
-        <item quantity="other"/>
-    </plurals>
-    <plurals name="x_minutes">
-        <item quantity="one">%d Minuto</item>
-        <item quantity="many">%d Minutos</item>
-        <item quantity="other">%d Minuto</item>
-    </plurals>
-    <string name="class_equipment_shop_dialog_new">Este item só está disponível para %s. Abra as Configurações para mudar de classe.</string>
-    <string name="insufficient_level_equipment_dialog_new">Este item só está disponível para %s. Você pode escolher uma classe após o nível 10.</string>
-    <string name="winter">Inverno</string>
-    <string name="spring">Primavera</string>
-    <string name="clear_database">Limpar banco de dados</string>
-    <string name="animal_tails">Caudas de Animais</string>
-    <string name="avatar_accents">Decorações</string>
-    <string name="avatar_shirts">Camisas</string>
-    <string name="avatar_skins">Skins</string>
-    <string name="avatar_mustaches">Bigodes</string>
-    <string name="customizations">Customizações</string>
-    <string name="customizations_owner">Felicitus</string>
-    <string name="looking_for_more">Procurando mais\?</string>
-    <string name="customizations_no_owned">Você não possui nenhum desses itens</string>
-    <string name="avatar_hair_styles">Estilos de cabelo</string>
-    <string name="customization_shop_more">Confira a Loja de Personalização para ainda mais maneiras de personalizar seu avatar!</string>
-    <string name="monthly_backgrounds">Cenários Mensais</string>
-    <string name="try_on_equipment">Você pode experimentá-los em Equipamentos. Novo estoque chega no início de cada mês!</string>
-    <string name="clear_cache_settings">Limpar cache</string>
-    <string name="customizing_your_avatar">Customizando seu avatar</string>
-    <string name="equipment">Equipamento</string>
-    <string name="error">Erro</string>
-    <string name="error_loading_gems">Ocorreu um erro ao carregar as gemas</string>
-    <string name="standard_backgrounds">Cenários padrão</string>
-    <string name="avatar_hair_colors">Cores de cabelo</string>
-    <string name="customization_shop_check_out">Vá até a Loja de Personalização para conferir as diversas maneiras de personalizar seu avatar!</string>
-    <string name="tap_to_reload">Atualizar para novos itens</string>
-    <string name="summer">Verão</string>
-    <string name="fall">Outono</string>
-    <string name="you_own_all_items">Você possui todos esses itens</string>
-    <string name="try_on_next_month">Você pode experimentá-los customizando seu avatar. Não deixe de conferir mais tarde as opções do próximo mês!</string>
-    <string name="try_on_next_season">Você pode experimentá-los customizando seu avatar. Não deixe de conferir mais tarde as opções da próxima temporada!</string>
-    <string name="try_on_customize">Você pode experimentá-los customizando seu avatar.</string>
-    <string name="healers">Curandeiros</string>
-    <string name="rogues">Ladinos</string>
-    <string name="warriors">Guerreiros</string>
-    <string name="mages">Magos</string>
-    <string name="avatar_beards">Barbas</string>
-    <string name="switches_in_x">Mudanças em %s</string>
-    <string name="customization_shop">Loja de Personalização</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 725e1434e..0c1fb4622 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -503,10 +503,10 @@
     <string name="tavern_owner_long">Daniel o dono da Taverna</string>
     <string name="market_owner_long">Alex o Mercador</string>
     <string name="questShop">Loja de Missões</string>
-    <string name="strike_active_description">Nosso querido %s ficou devastado quando %s aniquilou %s. Rapido, enfrente tuas tarefas para derrotar o monstro e ajudar a reconstruir !!</string>
+    <string name="strike_active_description">Nosso querido %1$s ficou devastado quando %2$s aniquilou %3$s. Rapido, enfrente tuas tarefas para derrotar o monstro e ajudar a reconstruir !!</string>
     <string name="strike_active_title">%s foi Atacado!</string>
     <string name="pending_strike_title">Ataque Pendente</string>
-    <string name="rage_strike_count">Ataques de Fúria: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ataques de Fúria: %d/%d</string>
     <string name="world_boss">Chefão Mundial</string>
     <string name="boss_art">Arte do Chefão</string>
     <string name="world_boss_description">Descrição do Chefão Mundial</string>
@@ -702,7 +702,7 @@
     <string name="equipment_empty">Já tens todo o equipamento! Mais vai ser lançado durante as Grandes Galas, perto dos solstícios e equinócios.</string>
     <string name="quest_items_found">Encontraste %d itens da jornada</string>
     <string name="discard">Descartar</string>
-    <string name="class_confirmation_price">Queres mudar a tua classe para %s por %d gemas\?</string>
+    <string name="class_confirmation_price">Queres mudar a tua classe para %1$s por %2$d gemas\?</string>
     <string name="use_item">Usar item em membro de equipa</string>&gt;
     <string name="unsaved_changes">Alterações não gravadas</string>
     <string name="discard_changes_to_task_message">Tens a certeza de que queres descartar as alterações nesta tarefa\?</string>
diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml
index 56dc25bb6..764ba2406 100755
--- a/Habitica/res/values-ro/strings.xml
+++ b/Habitica/res/values-ro/strings.xml
@@ -481,7 +481,7 @@
     <string name="pending_strike_title">Lovitură iminentă</string>
     <string name="strike_description_title">Ce este o Lovitură Furioasă?</string>
     <string name="strike_active_title" formatted="false">%s a fost Atacat!</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="strike_active_description">Dragul nostru %1$s a fost devastat atunci când %2$s a distrus %3$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>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 762bcb12b..f1fc2c121 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -525,11 +525,11 @@
     <string name="world_boss">Мировой босс</string>
     <string name="boss_art">Изображение босса</string>
     <string name="world_boss_description">Описание мирового босса</string>
-    <string name="rage_strike_count">Ярость: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ярость: %d/%d</string>
     <string name="pending_strike_title">Ожидаемый урон</string>
     <string name="strike_description_title">Что такое Удар Ярости?</string>
     <string name="strike_active_title">Атаковали %s!</string>
-    <string name="strike_active_description">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
+    <string name="strike_active_description">Наш любимый %1$s был печально потрясен, когда %2$s порушил %3$s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
     <string name="questShop">Лавка квестов</string>
     <string name="market_owner_long">Торговец Александр</string>
     <string name="tavern_owner_long">Даниэль, хозяин гостиницы</string>
@@ -799,7 +799,7 @@
     <string name="beastMasterTitle">Повелитель зверей</string>
     <string name="partyOnDescription">Ваша команда увеличилась до 4 участников!</string>
     <string name="partyUpDescription">Вы объединились с членом команды!</string>
-    <string name="invitation_title">%s пригласил(-а) вас в группу %s</string>
+    <string name="invitation_title">%1$s пригласил(-а) вас в группу %2$s</string>
     <string name="id_copied">ID пользователя cкопирован в буфер обмена</string>
     <string name="preference_push_unjoined_guild_mention">\@Упоминания в остальных Гильдиях</string>
     <string name="preference_push_joined_guild_mention">\@Упоминания в моих Гильдиях</string>
@@ -965,10 +965,10 @@
     <string name="theme_mode">Режим (Темный/Светлый)</string>
     <string name="dark_mode">Темная тема</string>
     <string name="spooky_promo_info_prompt">Распродажа самоцветов возвращается до конца Осеннего фестиваля этого года! Это последний шанс, чтобы получить больше самоцветов, чем когда-либо, так что запасайтесь пока не поздно!</string>
-    <string name="spooky_promo_info_instructions">Между %s и %s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
+    <string name="spooky_promo_info_instructions">Между %1$s и %2$s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
     <string name="view_gem_bundles">Посмотреть наборы самоцветов</string>
     <string name="fall_promo_info_prompt">Осенний фестиваль идет полным ходом, так что мы подумали, что это идеальное время, чтобы представить нашу первую в истории распродажу самоцветов! Теперь вы можете получить больше самоцветов с каждой покупки, чем когда-либо прежде.</string>
-    <string name="fall_promo_info_instructions">Между %s и %s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
+    <string name="fall_promo_info_instructions">Между %1$s и %2$s, выберете как обычно любой набор самоцветов, и на вашу учетную запись будет зачислена их акционная сумма. Больше самоцветов, чтобы потратить их, поделиться с кем-то или сохранить для любых будущих обновлений!</string>
     <string name="pms_disabled_description">Вы всё ещё можете отправлять сообщения, но никто не может отправлять их вам. Вы можете изменить это в настройках.</string>
     <string name="block_user_description">Заблокированный игрок не может отправлять вам личные сообщения, но вы все равно будете видеть его сообщения</string>
     <string name="challenge_task_name">%s задание испытания</string>
@@ -1124,7 +1124,7 @@
     <string name="about_me">Обо мне</string>
     <string name="my_account">Мой аккаунт</string>
     <string name="public_profile">Публичный профиль</string>
-    <string name="class_confirmation_price">Хотите сменить ваш класс на %s за %d самоцветов\?</string>
+    <string name="class_confirmation_price">Хотите сменить ваш класс на %1$s за %2$d самоцветов\?</string>
     <string name="use_item">Использовать предмет на члена команды</string>&gt;
     <string name="unsaved_changes">Изменения не сохранены</string>
     <string name="gift_confirmation_text_gems_new">Вы отправили @%1$s %2$s самоцветов.</string>
@@ -1219,7 +1219,7 @@
     <string name="death_description">Но вы сможете вернуть все это упорным трудом! Удачи - у вас все получится.</string>
     <string name="faint_broken_equipment">Сломанное снаряжение можно
 \nвыкупить обратно из Вознаграждений</string>
-    <string name="faint_loss_description">Ваш уровень понижен до <b>%d</b>, вы потеряли <b>%d</b> золота(-о) и сломали <b>часть вашей экипировки</b>… Вы сможете вернуть все это упорным трудом!</string>
+    <string name="faint_loss_description">Ваш уровень понижен до <b>%1$d</b>, вы потеряли <b>%2$d</b> золота(-о) и сломали <b>часть вашей экипировки</b>… Вы сможете вернуть все это упорным трудом!</string>
     <string name="account_reset">Сброс учетной записи</string>
     <string name="avatar_skin_customization">Персонализация кожи аватара</string>
     <string name="avatar_shirt_customization">Персонализация рубашки аватара</string>
@@ -1401,116 +1401,4 @@
     <string name="background">Фон</string>
     <string name="undo">Отменить</string>
     <string name="day_x">День %d</string>
-    <string name="shadow_muted_hidden">Скрыто</string>
-    <string name="assigned_to_you_by">Назначен вам @%1$s на %2$s</string>
-    <string name="unmute_user">Включить пользователя</string>
-    <string name="message_flagged">Сообщение помечено %d раз.</string>
-    <string name="todo_summary_description_duedate">**%1$s**Задача которую нужно выполнить**%2$s**.</string>
-    <string name="shadow_mute_user">Скрыть сообщения</string>
-    <string name="shadowmute_user_confirm">Вы хотите скрыть сообщения пользователя\?</string>
-    <string name="unshadowmute_user_confirm">Вы хотите снова видеть сообщения\?</string>
-    <string name="unshadowmute_user">Видеть сообщения</string>
-    <string name="open_profile">Открыть профиль</string>
-    <string name="no_x">Нет %s</string>
-    <string name="subriber_benefit_notification_faint">Вы получили второй шанс с 1HP!</string>
-    <string name="resume_damage_1_title">Пропущенные Ежедневные дела не ранят вас</string>
-    <string name="shop_armoire_description">Новое снаряжение выпущено в период сезонного Торжества. До тех пор, можно найти %d предметов снаряжения в Зачарованных сундуках!</string>
-    <string name="resume_damage_2_description">Пропуск Ежедневных заданий обнулят серию, а счетчик привычки восстановится как обычно</string>
-    <string name="seeking_hint">Следите за приглашениями или создайте свою команду в любое время</string>
-    <string name="resume_damage_3_title">Прогресс Квеста снова применится</string>
-    <string name="resume_damage_3_description">Любые коллекционные предметы или ожидаемый урон применятся к следующему дню</string>
-    <string name="contrib_tier_description">Если вы видите аккаунт с цветным отображаемым именем и иконкой, значит это рейтинговый участник! Рейтинги выдаются людям, помогающим Хабитике, не важно, переводом, программированием или просто поддержкой. Больше вклад — выше рейтинг.</string>
-    <string name="eggs_footer_description">Посетите [Рынок](/shops/market), чтобы купить нужные вам яйца!</string>
-    <string name="subscriber_button_faint">Второй шанс: Продержитесь с 1HP!</string>
-    <string name="empty_potions_description">Выполняйте задания, квесты по эликсирам или отправляйтесь на [Рынок](/shops/market), чтобы запастись!</string>
-    <string name="subscribe_second_chance_incentive_text">Подписчики получают второй шанс на жизнь каждый день и другие преимущества!</string>
-    <string name="watch_ad_to_hang_on">Посмотрите рекламу чтобы продержаться с 1HP!</string>
-    <string name="hatchingPotions_footer_description">Посетите [Рынок](/shops/market), чтобы купить стандартные и сезонные инкубационные эликсиры!</string>
-    <string name="subscribe_incentive_button_armoire">Подпишитесь, чтобы открыть бесплатно ещё раз!</string>
-    <string name="empty_quests_description">Получайте Квесты при повышении уровня, бонусах за вход или в [Магазине квестов](/shops/quests)!</string>
-    <string name="quests_footer_title">Хотите больше квестов\?</string>
-    <string name="class_equipment_shop_dialog_new">Этот предмет доступен только %s. Откройте «Настройки», чтобы изменить класс.</string>
-    <string name="insufficient_level_equipment_dialog_new">Этот предмет доступен только %s. Вы можете выбрать класс при достижении 10 уровня.</string>
-    <string name="on_the_x">на %s</string>
-    <string name="find_new_member">Найти участников</string>
-    <string name="find_more_members">Найти больше участников</string>
-    <string name="go_to_settings">Перейти в настройки</string>
-    <string name="resume_damage">Восстановить урон</string>
-    <string name="resume_damage_1_description">Урон наносится из-за пропущенных 
-\nучастниками команды Ежедневных дел</string>
-    <string name="resume_damage_2_title">Ваши серии и счетчики восстановятся</string>
-    <string name="pause_damage_3_title">Прогресс в квесте остается на том же уровне</string>
-    <string name="invite_with_username_email">Пригласите участника с помощью @имени или электронной почты</string>
-    <string name="look_for_party">Поиск Команды</string>
-    <string name="you_re_looking_for_party">Вы в поиске команды!</string>
-    <string name="shop_armoire_title">У вас есть всё %s снаряжение</string>
-    <string name="shop_armoire_empty_description">Новое снаряжение выпущено в период сезонного Торжества. В Зачарованных сундуках каждый месяц пополняются новые товары!</string>
-    <string name="unlock_gear_and_skills">Разблокируйте %s снаряжение и навыки.</string>
-    <string name="rescind_invite">Отменить приглашение</string>
-    <string name="rescinded">Отменено</string>
-    <string name="pending_invite">Ожидание приглашения</string>
-    <string name="invalid_input">Ошибка ввода</string>
-    <string name="username_requirements">Может содержать только буквы а-я, цифры, дефисы или подчеркивания</string>
-    <string name="contributor_tiers">Рейтинги участников</string>
-    <string name="visit_faq">Перейти в ЧаВо</string>
-    <string name="empty_special_description_subscribed">Получайте предметы трансформации во время Сезонных Событий. Загадочные коробки с снаряжением по подписке доставляются в начале каждого месяца!</string>
-    <string name="empty_food_description">Выполняйте задания, покупайте Сундуки или отправляйтесь на [Рынок](/shops/market), чтобы пополнить запасы!</string>
-    <string name="empty_eggs_description">Выполняйте задания, квесты с яйцами или отправляйтесь на [Рынок](/shops/market), чтобы пополнить запасы!</string>
-    <string name="item_footer_title">Не получаете нужных %s от задач\?</string>
-    <string name="item_footer_description">Посетите [Рынок](/shops/market), чтобы купить нужные вам вещи!</string>
-    <string name="quests_footer_description">Посетите [Магазин квестов](/shops/quests), чтобы посмотреть доступные!</string>
-    <string name="potions">эликсиры</string>
-    <string name="food_footer_description">Посетите [Рынок](/shops/market), чтобы купить еду или седло, чтобы мгновенно вырастить своего питомца!</string>
-    <string name="customize_avatar">Настроить аватар</string>
-    <string name="share_avatar">Поделиться аватаром</string>
-    <string name="subscribe_listitemArmoire">Шансы на дополнительный сундук</string>
-    <string name="subscribe_listitemArmoire_description">Получите два шанса получить новое снаряжение из сундука по цене одного</string>
-    <string name="subscribe_second_armoire_open_text">Подписчики получают дополнительные шансы в сундуках и другие преимущества!</string>
-    <string name="subscriber_button_armoire">Откройте снова бесплатно!</string>
-    <string name="subscribe_incentive_text_faint">Получайте второй шанс каждый день с подпиской, чтобы не исчерпать HP</string>
-    <string name="subscriber_benefit_used_faint">Вы уже использовали второй шанс сегодня. Будет доступен снова в %s</string>
-    <string name="quest_mechanics">Механика квеста</string>
-    <string name="quest_mechanics_boss_title">Нанесение урона боссу</string>
-    <string name="quest_mechanics_boss_description">Выполняйте задания любого типа или используйте навыки, чтобы накопить ожидаемый урон! Урон будет применен при сбросе на следующий день. Сила влияет на то, сколько урона вы наносите.</string>
-    <plurals name="x_days">
-        <item quantity="one">%d День</item>
-        <item quantity="few">%d Дня</item>
-        <item quantity="many">%d Дней</item>
-        <item quantity="other">%d Дней</item>
-    </plurals>
-    <plurals name="x_hours">
-        <item quantity="one">%d Час</item>
-        <item quantity="few">%d Часа</item>
-        <item quantity="many">%d Часов</item>
-        <item quantity="other">%d Часов</item>
-    </plurals>
-    <plurals name="x_minutes">
-        <item quantity="one">%d Минута</item>
-        <item quantity="few">%d Минуты</item>
-        <item quantity="many">%d Минут</item>
-        <item quantity="other">%d Минут</item>
-    </plurals>
-    <string name="subscribe_incentive_text_armoire">Получите дополнительный шанс в сундуке каждый раз, когда покупаете его по подписке</string>
-    <string name="purchase_gryphatrice_confirmation">Приобрести Ликующего Грифатриса за %d самоцветов\?</string>
-    <string name="pause_damage_3_description">Урон, нанесенный боссу или найденным предметам коллекции, будет сохранен до тех пор, пока вы не возобновите нанесение урона</string>
-    <string name="habiticans_send_invite">Пригласите игроков которых вы знаете</string>
-    <string name="equipment_class_locked">Эта экипировка для определённого класса</string>
-    <string name="pause_damage_2_description">Ежедневные страйки и счетчик привычек будут только подсчитывать пока это включено</string>
-    <string name="on_x">на %s</string>
-    <string name="jubilant_gryphatrice_confirmation">Вы приобрели Ликующего Грифатриса!</string>
-    <string name="visit_market">Посетите рынок</string>
-    <string name="jubilant_gryphatrice_confirmation_gift">Вы подарили Ликующего Грифатриса!</string>
-    <string name="on_the_x_of_month">каждый %1$s %2$s месяца</string>
-    <string name="gryphatrice_description">Редкий Ликующий Грифатрис присоединяется к празднованию дня рождения! Не упустите свой шанс стать владельцем этого эксклюзивного анимированного питомца.</string>
-    <string name="for_for_free">Четыре бесплатно</string>
-    <string name="for_for_free_description">Чтобы вечеринка продолжалась, мы разыграем Праздничные мантии, 20 драгоценных камней, а также набор накидок и фона ограниченной серии!</string>
-    <string name="birthday_limitations">Это мероприятие ограничено по времени, оно начинается с %1$s и закончится %2$s. В течение этого времени будет доступна ограниченная серия Ликующего Грифатриса и десяти Волшебных Инкубационных Элексирах. Остальные подарки, перечисленные в разделе \"Четыре подарка бесплатно\", будут автоматически доставлены на все аккаунты, которые были активны в течение 30 дней, предшествовавших дню отправки подарка. Аккаунты, созданные после отправки подарков, не смогут претендовать на них.</string>
-    <string name="preference_email_content_release">Новый контент + События</string>
-    <string name="error_loading_member">Не удалось найти игрока</string>
-    <string name="error_loading_member_body">Ошибка при загрузке данных этого игрока. Пожалуйста, убедитесь, что вы правильно ввели его @username.</string>
-    <string name="error">Ошибка</string>
-    <string name="exact_alarm_system_settings_reminders">Напоминания могут быть задержаны, так как разрешения не включены. Коснитесь, чтобы просмотреть и обновить разрешения.</string>
-    <string name="exact_alarm_system_settings_title">`Будильники и напоминания` отключены`</string>
-    <string name="exact_alarm_system_settings_description">Разрешить \'Будильники и напоминания\' в приложении \'Настройки\', чтобы напоминания появлялись в запланированное время</string>
-    <string name="preference_push_invited_to_group_plan">Приглашены на групповой план</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index 21f5ae2a1..43d3a239f 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -603,7 +603,7 @@
     <string name="setup_task_join_habitica">Gå med i Habitica (Bocka av mig!)</string>
     <string name="limitations">Begränsningar</string>
     <string name="how_it_works">Hur det funkar</string>
-    <string name="x_to_y">%s till %s</string>
+    <string name="x_to_y">%1$s till %2$s</string>
     <string name="block_user">Blockera Användar</string>
     <string name="tavern_inn_checkOut">Återaktivera dina dagliga uppgifter</string>
     <string name="learn_more">Lär Mer</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 348c3f6c5..f11c42c61 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -531,11 +531,11 @@
     <string name="world_boss">Dünya Canavarı</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">Öfke Saldırıları: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Ö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_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="strike_active_description">Çok sevdiğimiz %1$s hüsrana uğradı çünkü %2$s, %3$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>
@@ -794,7 +794,7 @@
     <string name="feedPet_title">Bir evcil hayvan besle</string>
     <string name="group_plan">Grup Aboneliği</string>
     <string name="gift_gems_balance_subtitle">Aşağıya kaç Elmas göndermek istediğini gir veya hediye etmek üzere Elmas satın almak için sekmeleri değiştir</string>
-    <string name="invitation_title">%s seni %s grubuna katılman için davet etti</string>
+    <string name="invitation_title">%1$s seni %2$s grubuna katılman için davet etti</string>
     <string name="gems_to_gift">Hediye edilecek taşlar</string>
     <string name="from_balance">Bakiyeden Gönder</string>
     <string name="partyOnDescription">Takımın 4 üyeye ulaştı!</string>
@@ -937,9 +937,9 @@
     <string name="assigned_stat">Atanan İstatistik</string>
     <string name="join_party_description_guild">Aşağıdaki kullanıcı adını bir arkadaşınıza verin veya potansiyel yoldaşlarla tanışmak için %s gidin!</string>
     <string name="spooky_promo_info_prompt">Değerli Taş Satışı, bu yılki Sonbahar Galasının en sonunda tekrar gündeme geldi! Bu, her zamankinden daha fazla Mücevher almak için son bir şans, bu yüzden bu süre boyunca stok yapın!</string>
-    <string name="spooky_promo_info_instructions">%s ile %s arasında, her zamanki gibi herhangi bir Mücevher paketi satın alın ve hesabınıza promosyon miktarda Mücevher yatırılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
+    <string name="spooky_promo_info_instructions">%1$s ile %2$s arasında, her zamanki gibi herhangi bir Mücevher paketi satın alın ve hesabınıza promosyon miktarda Mücevher yatırılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
     <string name="fall_promo_info_prompt">Sonbahar Galası tüm hızıyla devam ediyor, bu yüzden ilk Mücevher Satışımızı sunmak için mükemmel bir zaman olduğunu düşündük! Artık her satın alma işleminde her zamankinden daha fazla Mücevher kazanacaksınız.</string>
-    <string name="fall_promo_info_instructions">%s ve %s arasında, her zamanki gibi herhangi bir Gem paketi satın alın ve hesabınıza promosyon miktarda Mücevher kredisi aktarılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
+    <string name="fall_promo_info_instructions">%1$s ve %2$s arasında, her zamanki gibi herhangi bir Gem paketi satın alın ve hesabınıza promosyon miktarda Mücevher kredisi aktarılacaktır. Gelecek sürümler için harcayabileceğiniz, paylaşabileceğiniz veya saklayabileceğiniz daha fazla Mücevher!</string>
     <string name="how_it_works">Nasıl çalışır</string>
     <string name="x_to_y">%1$s - %2$s</string>
     <string name="usually_x_gems">Genellikle %d Mücevher</string>
@@ -1202,7 +1202,7 @@
     <string name="armoire_rate_equipment_title">60% parça ekipman</string>
     <string name="armoire_rate_food_title">20% Yem</string>
     <string name="purchased">Satın Alındı</string>
-    <string name="class_confirmation_price">Sınıfını %s\'ye %d Elmas için değiştirmek istiyor musun\?</string>
+    <string name="class_confirmation_price">Sınıfını %1$s\'ye %2$d Elmas için değiştirmek istiyor musun\?</string>
     <string name="subscription_credit_canceling">Sizin <b>+%d</b> aylık abonelik krediniz aboneliğinizi iptal ettikten sonra etkinleşecek</string>
     <string name="unsaved_changes">Kaydedilmemiş Değişiklikler</string>
     <string name="armoire_rate_equipment_description">Yeni Ekipman parçaları her ay eklenir. Eğer bütün Ekipmanlara sahipsen, o zaman Yem ya da Deneyim alırsın, 50/50 şans.</string>
@@ -1251,7 +1251,7 @@
     <string name="mor_gems_title">Bunu almak için daha fazla elmas lazım!</string>
     <string name="gems_support">Elmas satın almak bizim küçük Habitica takımımızı destekler</string>
     <string name="month_released">Yayımlandığı Ay</string>
-    <string name="faint_loss_description">Seviye <b>%d</b>\'e düşecek, <b>%d</b> Altın kaybedecek, ve <b>bir parça ekipman</b> kıracaksın…</string>
+    <string name="faint_loss_description">Seviye <b>%1$d</b>\'e düşecek, <b>%2$d</b> Altın kaybedecek, ve <b>bir parça ekipman</b> kıracaksın…</string>
     <string name="account_reset">Hesap Sıfırlama</string>
     <string name="avatar_skin_customization">Avatar Kıyafeti Özelleştirme</string>
     <string name="delete_account_subscription_active">Aktif bir aboneliğin içindeyken hesabını silemezsin. Lütfen önce aboneliğini iptal et.</string>
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
index 69b4dc046..21a5b3827 100755
--- a/Habitica/res/values-uk/strings.xml
+++ b/Habitica/res/values-uk/strings.xml
@@ -753,11 +753,11 @@
     <string name="active_world_boss">Активний світовий бос</string>
     <string name="hide_boss_art">Приховати зображення боса</string>
     <string name="questShop">Магазин квестів</string>
-    <string name="strike_active_description">Наш улюблений %s був спустошений, коли %s розбив %s. Швидко завершуйте свої завдання, щоб перемогти монстра і допомогти з відновленням!</string>
+    <string name="strike_active_description">Наш улюблений %1$s був спустошений, коли %2$s розбив %3$s. Швидко завершуйте свої завдання, щоб перемогти монстра і допомогти з відновленням!</string>
     <string name="strike_active_title">%s був атакований!</string>
     <string name="strike_description_title">Що таке Удар Люті\?</string>
     <string name="pending_strike_title">Очікувана шкода</string>
-    <string name="rage_strike_count">Удари люті: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">Удари люті: %d/%d</string>
     <string name="world_boss_description">Опис світового боса</string>
     <string name="boss_art">Зображення боса</string>
     <string name="world_boss">Світовий бос</string>
@@ -976,7 +976,7 @@
     <string name="cancel_subscription_group_plan">У вас є безкоштовна підписка тому, що Група або Гільдія має груповий план підписка. Це закінчиться, якщо Ви покинете Групу, або підписка закінчиться. Будь-які місяці додаткового кредиту на підписку будуть застосовуватися в кінці Групового плану.</string>
     <string name="subscription_credit">Кредит на підписку</string>
     <string name="not_recurring">Не Повторююється</string>
-    <string name="invitation_title">%s запросив(-ла) Вас до групи %s</string>
+    <string name="invitation_title">%1$s запросив(-ла) Вас до групи %2$s</string>
     <string name="partyOnTitle">Час вечірки</string>
     <string name="partyUpTitle">Об\'єднуйтесь</string>
     <string name="update_available">Нове оновлення: %1$s (%2$d)</string>
@@ -1002,9 +1002,9 @@
     <string name="gift_one_get_one_detailed_description">Допоки ця акція активна, ви отримуєте відповідну підписку автоматично після відправки подарунка.</string>
     <string name="confirm_username_description">Підтвердження свого Ім\'я користувача дає змогу приймати запрошення, @згадки і повідомлення. Ви можете змінити своє Ім\'я користувача в будь-який час в налаштуваннях.</string>
     <string name="spooky_promo_info_prompt">Розпродаж самоцвітів повернувся до самого кінця цьогорічної гала-осені! Це останній шанс отримати більше самоцвітів, ніж будь-коли, тож запасіться, поки це триває!</string>
-    <string name="spooky_promo_info_instructions">У період з %s по %s просто придбайте будь-який комплект самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано їх додаткове число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
+    <string name="spooky_promo_info_instructions">У період з %1$s по %2$s просто придбайте будь-який комплект самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано їх додаткове число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
     <string name="fall_promo_info_prompt">Fall Gala у розпалі, тому ми подумали, що це ідеальний час, щоб представити нашу першу в історії розпродаж самоцвітів! Тепер ви отримаєте більше самоцвітів з кожною покупкою, ніж будь-коли раніше.</string>
-    <string name="fall_promo_info_instructions">У період з %s по %s просто придбайте будь-який комплект Самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано додаткове їх число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
+    <string name="fall_promo_info_instructions">У період з %1$s по %2$s просто придбайте будь-який комплект Самоцвітів, як зазвичай, і на Ваш рахунок буде зараховано додаткове їх число. Більше дорогоцінних каменів, які можна витратити, поділитися або зберегти для майбутніх оновлень!</string>
     <string name="x_to_y">%1$s до %2$s</string>
     <string name="usually_x_gems">Зазвичай %d самоцвітів</string>
     <string name="block_user_description">Заблокований користувач не може писати вам особисто, але ви можете бачити його повідомлення деінде.</string>
@@ -1143,7 +1143,7 @@
     <string name="successful_purchase_generic">Успішна купівля</string>
     <string name="task_list_mode">Режим списку завдань</string>
     <string name="discard">Не зберігати</string>
-    <string name="class_confirmation_price">Ви хочете змінити свій клас на %s за %d самоцвітів\?</string>
+    <string name="class_confirmation_price">Ви хочете змінити свій клас на %1$s за %2$d самоцвітів\?</string>
     <string name="use_item">Застосуйте до члена команди</string>&gt;
     <string name="unsaved_changes">Незбережені зміни</string>
     <string name="gift_confirmation_text_gems_new">Ви надіслали @%1$s %2$s самоцвіт(-и/ів).</string>
@@ -1266,7 +1266,7 @@
     <string name="august">Серпень</string>
     <string name="september">Вересень</string>
     <string name="october">Жовтень</string>
-    <string name="faint_loss_description">Ваш рівень знижено до <b>%d</b>, ви втратили <b>%d</b> золота, та зламали <b>частину вашого обладнання</b>…</string>
+    <string name="faint_loss_description">Ваш рівень знижено до <b>%1$d</b>, ви втратили <b>%2$d</b> золота, та зламали <b>частину вашого обладнання</b>…</string>
     <string name="account_reset">Скидання облікового запису</string>
     <string name="avatar_skin_customization">Налаштування шкіри аватара</string>
     <string name="avatar_shirt_customization">Налаштування сорочки аватара</string>
@@ -1317,83 +1317,4 @@
     <string name="visit_the_market">Відвідати ринок</string>
     <string name="thanks_for_support">Вдячні за вашу підтримку!</string>
     <string name="birthday_title_description">Святкуйте 10-річчя Habitica з подарунками та ексклюзивними речами нижче!</string>
-    <string name="change_class_confirmation_message">Це змінить спорядження, яке буде розблоковане в магазинах, та змінить ваші доступні навички</string>
-    <string name="subscribe_listitemArmoire_description_2">Кожного разу, відкриваючи Скриню, ви можете відкрити ще одну безкоштовно!</string>
-    <string name="your_tags">Ваші Теги</string>
-    <string name="opt_out_description">Це призведе до того, що ви залишитеся без призначеного класу. Ви можете обрати клас знову, увімкнувши систему класів у Налаштуваннях у будь-який час.</string>
-    <string name="change_class_message">Це видалить ваш поточний клас і поверне всі очки досвіду, що були зароблені, а потім дозволить вам обрати новий клас</string>
-    <string name="challenge_tags">Теги Випробування</string>
-    <string name="group_tags">Теги групи</string>
-    <string name="share_avatar">Поділитися аватаром</string>
-    <string name="item_footer_title">Не можете отримати бажані %s з завдань\?</string>
-    <string name="invite_with_username_email">Запросіть за @нікнейм або електронною поштою</string>
-    <string name="seeking_party_description">Хочете доєднатися до команди разом із іншими, але нікого не знаєте\? Сповістіть лідерів команд, що ви чекаєте на запрошення!</string>
-    <string name="change_class_to_x">Змінити клас на %s</string>
-    <string name="habiticans_send_invite">Надішліть запрошення гравцям, яких ви знаєте</string>
-    <string name="seeking_party_title">Шукаєте команду\?</string>
-    <string name="look_for_party">Шукати команду</string>
-    <string name="you_re_looking_for_party">Ви шукаєте команду!</string>
-    <string name="seeking_hint">Слідкуйте за запрошеннями або створіть власну команду в будь-який час</string>
-    <string name="subscribe_incentive_button_armoire">Підпишіться, щоб відкрити знову безкоштовно!</string>
-    <string name="rescind_invite">Відмінити запрошення</string>
-    <string name="username_requirements">Може містити лише літери a-z, цифри, дефіси або нижні підкреслювання</string>
-    <string name="report_challenge_explanation">Ви повинні повідомляти лише про ті Випробування, що порушують [Правила спільноти](https://habitica.com/static/community-guidelines) та/або [Умови використання](https://habitica.com/static/terms). Подання неправдивого звіту є порушенням Правил спільноти Habitica.</string>
-    <string name="report_failure">Будь ласка спробуйте пізніше, під час відправки повідомлення сталася помилка</string>
-    <string name="reset_account_description_new">Ви втратите всі свої рівні, золото та досвід. Усі ваші завдання та їхні дані буде видалено (завдання Випробувань залишаться). Ви втратите все спорядження, окрім предметів для підписників та безкоштовних пам’ятних предметів, але ви зможете викупити його назад. Ви повинні мати відповідний клас, щоб повторно купити обладунки для певного класу. Ви збережете свій поточний клас, досягнення, а також ваших домашніх улюбленців та скакунів. Щоб підтвердити скидання, введіть свій пароль нижче.</string>
-    <string name="gems_promo_info_limitations_fixed">Ця акція діє лише протягом опідчас події. Подія починається о %1$s (%2$s) і закінчується о %3$s (%4$s). Акційна пропозиція діє тільки за покупки Самоцвітів для себе.</string>
-    <string name="invited_to_guild_notification">&lt;font color=#925CF3&gt;%2$s&lt;/font&gt; запросив вас приєднатися до групи &lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="report_user_description">Це також заблокує @%s</string>
-    <string name="report_reason_title_message">Чиму ви повідомляєте про ще повідомлення\?</string>
-    <string name="report_formatted_name">%1$s
-\n@%2$s</string>
-    <string name="report_reason_title_challenge">Чому ви повідомляєте про це Випробування\?</string>
-    <string name="report_message">Повідомлення про порушення</string>
-    <string name="report_successful">%s скарга відправлена</string>
-    <string name="report_player_toolbar_title">Поскаржитися на %s</string>
-    <string name="subscribe_listitemFaint">Тримайтеся з 1 ОЗ!</string>
-    <string name="subscription_hourglasses_3month_timeframe">Містичний Годинник що три місяці</string>
-    <string name="unban_user">Зняти бан з гравця</string>
-    <string name="reset_account_description_no_pw">Ви втратите всі свої рівні, золото та досвід. Усі ваші завдання та їхні дані буде видалено (завдання Випробувань залишаться). Ви втратите все спорядження, окрім предметів для підписників та безкоштовних пам’ятних предметів, але ви зможете викупити його назад. Ви повинні мати відповідний клас, щоб повторно купити обладунки для певного класу. Ви збережете свій поточний клас, досягнення, а також ваших домашніх улюбленців та скакунів. Щоб підтвердити скидання, введіть RESET нижче.</string>
-    <string name="gryphatrice_description">Рідкісний Радісний Грифолиск приєднується до святкування дня народження! Не пропустіть свій шанс володіти цим ексклюзивним анімованим улюбленцем.</string>
-    <string name="for_for_free_description">Щоб продовжити вечірку, ми роздамо вбрання для вечірки, 20 Самоцвітів та обмежене видання набору Накидок та Фон!</string>
-    <string name="first">перший</string>
-    <string name="status">Стан</string>
-    <string name="assigned_to_you_by">Призначено вам @%1$s на %2$s</string>
-    <string name="never">ніколи</string>
-    <string name="on_x">на %s</string>
-    <string name="on_weekdays">в будні</string>
-    <string name="on_weekends">у вихідні</string>
-    <string name="on_the_x_of_month">на %1$s %2$s місяця</string>
-    <string name="amazon">Amazon</string>
-    <string name="apple_pay">Apple Pay</string>
-    <string name="google_pay">Google Pay</string>
-    <string name="paypal">PayPal</string>
-    <string name="stripe_payment">Stripe</string>
-    <string name="on_the_x">на %s</string>
-    <string name="for_for_free">Чотири безкоштовно</string>
-    <string name="buy_for">Купити за</string>
-    <string name="on_every_day_of_week">кожного дня тижня</string>
-    <string name="plenty_of_potions_description">Ми повертаємо 10 улюблених Магічних Зіллів нашої спільноти. Завітайте на Ринок, щоб поповнити свою колекцію!</string>
-    <string name="message_flagged">Повідомлення позначено %d раз(и/ів).</string>
-    <string name="resume_damage">Відновити отримання шкоди</string>
-    <string name="jubilant_gryphatrice_confirmation">Ви придбали Радісного Грифолиска!</string>
-    <string name="jubilant_gryphatrice_confirmation_gift">Ви подарували Радісного Грифолиска!</string>
-    <string name="open_settings">Відкрити налаштування</string>
-    <string name="undo">Скасувати</string>
-    <string name="day_x">День %d</string>
-    <string name="a_party_robe">Вбрання для вечірки</string>
-    <string name="background">Фон</string>
-    <string name="birthday_set">Набір до Дня Народження</string>
-    <string name="you_equipped_x">Ви спорядили %s</string>
-    <string name="purchase_gryphatrice_confirmation">Придбати Радісного Грифолиска за %d самоцвітів\?</string>
-    <string name="find_new_member">Знайти учасників</string>
-    <string name="find_more_members">Знайти більше учасників</string>
-    <string name="go_to_settings">Перейти до Налаштувань</string>
-    <string name="resume_damage_1_title">Ваші пропущені Щоденки не завдадуть вам шкоди</string>
-    <string name="resume_damage_1_description">Боси все одно завдаватимуть шкоду іншим
-\nчленам команди, що пропустили Щоденки</string>
-    <string name="visit_market">Відвідати ринок</string>
-    <string name="ends_in_x">Закінчується через %s</string>
-    <string name="see_more">Дивитись більше</string>
-    <string name="twenty_gems">20 самоцвітів</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index ddc1cea08..13fdce5a9 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -518,11 +518,11 @@
     <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="rage_strike_count" formatted="false">暴走攻擊：%d/%d</string>
     <string name="pending_strike_title">即將造成的攻擊</string>
     <string name="strike_description_title">暴走攻擊是什麽？</string>
     <string name="strike_active_title">%s被攻擊了！</string>
-    <string name="strike_active_description">我們心愛的%s在%s攻擊%s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
+    <string name="strike_active_description">我們心愛的%1$s在%2$s攻擊%3$s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
     <string name="questShop">副本商店</string>
     <string name="market_owner_long">商人 Alex</string>
     <string name="tavern_owner_long">酒館老闆 Daniel</string>
@@ -800,7 +800,7 @@
     <string name="id_copied">已將用戶ID複製到剪貼板</string>
     <string name="copy_username">複製用戶名</string>
     <string name="password_too_short">您的密碼長度至少為%d個字符</string>
-    <string name="invitation_title">%s邀請你加入他們的小組%s</string>
+    <string name="invitation_title">%1$s邀請你加入他們的小組%2$s</string>
     <string name="someone">有人</string>
     <string name="authentication_methods">認證方式</string>
     <string name="local">本地</string>
@@ -862,8 +862,8 @@
     <string name="task_title">任務標題</string>
     <string name="add_local_authentication">新增地區性驗證</string>
     <string name="defeat">擊退</string>
-    <string name="gift_confirmation_text_sub">你送給%s一個%s個月的Habitica訂閱。</string>
-    <string name="gift_confirmation_text_sub_g1g1">你送給%s一個%s個月的Habitica訂閱，由於買一贈一促銷活動，你也獲得了同樣時長的訂閱！</string>
+    <string name="gift_confirmation_text_sub">你送給%1$s一個%2$s個月的Habitica訂閱。</string>
+    <string name="gift_confirmation_text_sub_g1g1">你送給%1$s一個%2$s個月的Habitica訂閱，由於買一贈一促銷活動，你也獲得了同樣時長的訂閱！</string>
     <string name="gift_gems_subtitle">在下面選擇你要贈送的寶石包！</string>
     <string name="join_party_description_guild">將下方的使用者名稱發給好友，或是前往%s找尋隊友！</string>
     <string name="insufficientGoldTitle">金幣不足</string>
@@ -959,8 +959,8 @@
     <string name="off">關</string>
     <string name="on">開</string>
     <string name="suggest_pet_hatch_again_missing_potion">你還需要一瓶%s藥水才能再次孵化這個寵物</string>
-    <string name="suggest_pet_hatch_again_missing_both">你需要一個%s和%s藥劑才能再次孵化這個寵物</string>
-    <string name="can_hatch_pet">對你的%s蛋使用%s藥水來孵化這個寵物吧！</string>
+    <string name="suggest_pet_hatch_again_missing_both">你需要一個%1$s和%2$s藥劑才能再次孵化這個寵物</string>
+    <string name="can_hatch_pet">對你的%1$s蛋使用%2$s藥水來孵化這個寵物吧！</string>
     <string name="hatch_pet">孵化寵物</string>
     <string name="unhatched_pet">未孵化的寵物</string>
     <string name="hatch_pet_again">再次孵化寵物</string>
@@ -981,13 +981,13 @@
     <string name="pet_category">%s寵物</string>
     <string name="mount_category">%s坐騎</string>
     <string name="suggest_pet_hatch_again_missing_egg">你還需要一個%s蛋才能再次孵化這個寵物</string>
-    <string name="suggest_pet_hatch_missing_both">你需要一個%s和一瓶%s藥水才能孵化這個寵物</string>
+    <string name="suggest_pet_hatch_missing_both">你需要一個%1$s和一瓶%2$s藥水才能孵化這個寵物</string>
     <string name="suggest_pet_hatch_missing_potion">你還需要一個%s孵化藥水來孵化這個寵物</string>
     <string name="suggest_pet_hatch_missing_egg">你還需要一個%s寵物蛋來孵化這個寵物任務</string>
     <string name="view_onboarding_tasks">查看新手任務</string>
     <string name="equip">裝備</string>
     <string name="unequip">取消裝備</string>
-    <string name="excessItemsNoneLeft">你已經有得到所有%s寵物所需的一切物品。你確定你要買%2$d個%3$s？</string>
+    <string name="excessItemsNoneLeft">你已經有得到所有%1$s寵物所需的一切物品。你確定你要買%2$d個%3$s？</string>
     <string name="purchaseX">買%d個</string>
     <string name="excessItemsXLeft">你只需要%3$d個%2$s即可孵化所有可得到的這種寵物。你確定你想要買%1$d個？</string>
     <string name="feedPet_description">完成任務有概率掉落寵物食品！這樣你就可以把寵物餵大長成坐騎啦！</string>
@@ -1074,7 +1074,7 @@
     <string name="empty_challenge_list">您尚未成為任何挑戰中的一位成員。</string>
     <string name="todo_item_checkbox">待辦事項核取方塊</string>
     <string name="empty_equipment_description">您目前還尚未有任何這類型的裝備。您可以透過市集並使用您所賺取來的金幣去採購裝備。</string>
-    <string name="fall_promo_info_instructions">取決於 %s 和 %s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
+    <string name="fall_promo_info_instructions">取決於 %1$s 和 %2$s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
     <string name="terms_of_service">服務條款</string>
     <string name="privacy_policy">隱私權政策</string>
     <string name="all_tasks_completed">您已完成您全部的任務。做得好！</string>
@@ -1096,7 +1096,7 @@
     <string name="quest_leave_message">您確定您要離開此副本？所有您的副本進展將會遺失。</string>
     <string name="quest_leave_message_nostart">您確定您要離開此副本？您將無法參與其中。</string>
     <string name="avatar_style">風格</string>
-    <string name="x_to_y">從%s到%s</string>
+    <string name="x_to_y">從%1$s到%2$s</string>
     <string name="open_website">開放網站</string>
     <string name="create_guild_description">去設立一個公會，登入至 Habitica網站並點選“我的公會”頁面中的 “設立”按鈕。</string>
     <string name="create_guild">設立公會</string>
@@ -1111,7 +1111,7 @@
     <string name="spooky_promo_info_prompt">此寶石折扣回歸去追尋今年最終的秋季節慶！這是一個最後的機會去擁有更多更多的寶石，所以當它還持續時請大量囤購吧！</string>
     <string name="view_gem_bundles">查看寶石組合包</string>
     <string name="fall_promo_info_prompt">此秋季節慶正在最高潮期所以我們認為這是個最好的時機去推出我們第一次的寶石折扣！現在你將會於每一次的購物上得到比之前更多的寶石。</string>
-    <string name="spooky_promo_info_instructions">取決於 %s 和 %s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
+    <string name="spooky_promo_info_instructions">取決於 %1$s 和 %2$s，簡易的購物如同以往任何寶石組合包以及您的帳號將會被存入此促銷的寶石總數。有更多的寶石去消費，分享，或保存至未來給任何使用！</string>
     <string name="adjust_counter">修正計數器</string>
     <string name="reset_counter">重設計數器</string>
     <string name="go_to_survey">去填寫問卷</string>
@@ -1154,7 +1154,7 @@
     <string name="reset_account_title">你確定需要重置\?</string>
     <string name="confirm_reset">確定重置</string>
     <string name="forgot_password_hint_example">例子：habitrabbit or gryphon@example.com</string>
-    <string name="gift_confirmation_text_gems_new">你送了%s%s寶石。</string>
+    <string name="gift_confirmation_text_gems_new">你送了%1$s%2$s寶石。</string>
     <string name="subscription_confirmation_multiple">你已訂閱了%s個月</string>
     <string name="subscription_confirmation">你已訂閱1個月</string>
     <string name="gem_purchase_confirmation">你獲得了%s寶石。</string>
@@ -1171,7 +1171,7 @@
     <string name="october">十月</string>
     <string name="november">十一月</string>
     <string name="december">十二月</string>
-    <string name="class_confirmation_price">更改你的職業成為%s需要%d的寶石，確認更改\?</string>
+    <string name="class_confirmation_price">更改你的職業成為%1$s需要%2$d的寶石，確認更改\?</string>
     <string name="armoireEquipment_new">你在衣櫥裏找到了一個稀有裝備！</string>
     <string name="starting_objectives">新手任務</string>
     <string name="damage_pending">%s即將造成的傷害</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 066837a1f..7cb696669 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -69,7 +69,7 @@
     <string name="levelup_detail">通过完成现实生活中的目标，你提升了等级并且恢复了全部生命值！</string>
     <string name="onwards">继续前进！</string>
     <string name="faint_subtitle">别灰心！</string>
-    <string name="faint_header">你的生命值已耗尽！</string>
+    <string name="faint_header">你的生命值耗尽了！</string>
     <string name="faint_button">回满生命值并再试一次</string>
     <string name="filter">筛选</string>
     <string name="used_skill_without_mana">你使用了 %1$s。</string>
@@ -517,12 +517,12 @@
     <string name="navigation_drawer_open">打开导航栏</string>
     <string name="navigation_drawer_close">关闭导航栏</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="strike_description_title">什么是怒气打击？</string>
-    <string name="strike_active_title">%s遭到攻击！</string>
-    <string name="questShop">副本</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="strike_description_title">什么是暴击？</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>
     <string name="stable_owner_long">驯兽师Matt</string>
@@ -558,16 +558,16 @@
     <string name="ok">好的</string>
     <string name="distribute_task_help">根据你完成任务的类型，分配力量、智力、体质和感知点数。</string>
     <string name="staff_moderators">工作人员和管理员</string>
-    <string name="pending_strike_title">待结算的攻击</string>
-    <string name="strike_active_description">我们心爱的%s在%s攻击%s时被摧毁了。快，完成你的任务以打败怪物，帮助重建！</string>
-    <string name="no_party_description">与朋友一起或独自进行副本。与怪物战斗，创建挑战，并通过队伍帮助自己保持责任感。</string>
-    <string name="join_party_description">将下方用户名告诉一位队伍成员，他就可以向你发送邀请</string>
-    <string name="insufficientSubscriberGems">你已购买了本月的所有宝石。更多宝石将在每月的前三天上架。感谢你的订阅！</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">击败Boss，从%s的恐怖中拯救Habitica，并获得特殊奖励！</string>
+    <string name="pending_strike_title">即将造成的攻击</string>
+    <string name="strike_active_description">我们心爱的 %1$s 在 %2$s 攻击 %3$s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
+    <string name="no_party_description">和朋友一同完成副本或者独自出击。和怪物战斗，创建挑战，能力越大，责任越大。</string>
+    <string name="join_party_description">把下方的用户名给一个队伍成员，这样他们就能邀请你加入了</string>
+    <string name="insufficientSubscriberGems">你已经买空了这个月所有的宝石限额！每月可购买的宝石将于当月前三天内上架，感谢你的订阅！</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">打败Boss就能获得特殊奖励！快来从%s的手里拯救Habitica吧！</string>
     <string name="seasonalShop_owner_long">季节女巫</string>
     <string name="challenge_categories">挑战类型</string>
     <string name="joined">加入时间</string>
@@ -777,7 +777,7 @@
     <string name="id_copied">用户ID已复制到剪贴板</string>
     <string name="password_too_short">您的密码长度至少为%d个字符</string>
     <string name="copy_username">复制用户名</string>
-    <string name="invitation_title">%s邀请你加入他的团队%s</string>
+    <string name="invitation_title">%1$s邀请你加入他们的小组%2$s</string>
     <string name="someone">有人</string>
     <string name="authentication_methods">验证方式</string>
     <string name="local">本地</string>
@@ -1025,20 +1025,20 @@
     <string name="suggest_pet_hatch_missing_both">你需要一枚%1$s和一瓶%2$s药水来孵化此宠物</string>
     <string name="pms_disabled">已停用私信</string>
     <string name="disablePrivateMessages">禁用私信</string>
-    <string name="block">拉黑</string>
-    <string name="block_user_description">被拉黑玩家无法向你发送私信，但你仍可以看到他的帖子</string>
-    <string name="block_user_title">拉黑%s？</string>
-    <string name="block_user">拉黑玩家</string>
-    <string name="unblock_user">解除拉黑</string>
-    <string name="pms_disabled_description">你依旧可以向他人发送私信，但其他人无法向你发送私信。你可以在设置中再次启用私信。</string>
-    <string name="spooky_promo_info_prompt">今年秋季庆典的宝石特卖已步入尾声！这是获取更多宝石的最后机会，请趁早囤货！</string>
-    <string name="spooky_promo_info_instructions">在%s至%s期间，只需像往常一样购买任意宝石捆绑包，你的账户就会被存入促销赠送的宝石。这些多出来的宝石可用于消费、赠送或保存以供未来使用！</string>
+    <string name="block">屏蔽</string>
+    <string name="block_user_description">被屏蔽用户无法发送私信给你, 但你仍将可以看到他们发表的内容</string>
+    <string name="block_user_title">确定屏蔽%s？</string>
+    <string name="block_user">屏蔽此用户</string>
+    <string name="unblock_user">解除屏蔽此用户</string>
+    <string name="pms_disabled_description">你依旧能正常发送私信给他人，但没人能发送私信给你。在设置中可重启接收私信功能。</string>
+    <string name="spooky_promo_info_prompt">今年在秋季庆典的宝石特卖会步入尾声！这是最后一次获得更多宝石的机会，请趁早囤货！</string>
+    <string name="spooky_promo_info_instructions">在%1$s至3%2$s期间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
     <string name="view_gem_bundles">查看宝石捆绑包</string>
-    <string name="fall_promo_info_prompt">秋季盛典正在热烈进行中，所以我们认为现在是宝石特卖的最佳时机！现在你每次购买都将获得比以往更多的宝石。</string>
-    <string name="fall_promo_info_instructions">在%s至%s期间，只需像往常一样购买任意宝石捆绑包，你的账户就会被存入促销赠送的宝石。这些多出来的宝石可用于消费、赠送或保存以供未来使用！</string>
-    <string name="limitations">限制事项</string>
-    <string name="how_it_works">如何使用</string>
-    <string name="x_to_y">%1$s到%2$s</string>
+    <string name="fall_promo_info_prompt">秋季盛典正在如火如荼的进行中，所以我们认为这是我们首次推出宝石特卖会的最佳时机！现在你每次购买都会获得比以往更多的宝石。现在你每次购买都将获得比以往更多的宝石。</string>
+    <string name="fall_promo_info_instructions">在%1$s至%2$s间，只需像往常一样购买任何宝石捆绑包，你的账户就会记入促销金额赠送的宝石数。获得的更多宝石可以用来消费、赠送或未来使用！</string>
+    <string name="limitations">限制</string>
+    <string name="how_it_works">如何工作</string>
+    <string name="x_to_y">%1$s致%2$s</string>
     <string name="usually_x_gems">通常%d颗宝石</string>
     <string name="congratulations">恭喜！</string>
     <string name="you_won_challenge">你赢得了一项挑战</string>
@@ -1116,13 +1116,13 @@
     <string name="privacy_policy">隐私政策</string>
     <string name="all_tasks_completed">你已完成全部任务。干得好！</string>
     <string name="discard">放弃</string>
-    <string name="class_confirmation_price">将职业改为%s需要花费%d颗宝石，你确定要更改吗？</string>
-    <string name="use_item">对队伍成员使用道具</string>&gt;
-    <string name="unsaved_changes">未保存的更改</string>
-    <string name="damage_pending">%s点待结算伤害</string>
-    <string name="copied_to_clipboard">%s已复制到剪贴板</string>
-    <string name="adjust_counter">修正计数</string>
-    <string name="reset_counter">重置计数</string>
+    <string name="class_confirmation_price">转职为%1$s需要%2$d宝石，是否确定更改？</string>
+    <string name="use_item">对队伍成员使用物品</string>&gt;
+    <string name="unsaved_changes">修改未保存</string>
+    <string name="damage_pending">即将造成%s点伤害</string>
+    <string name="copied_to_clipboard">已将%s复制到剪贴板</string>
+    <string name="adjust_counter">调整连击次数</string>
+    <string name="reset_counter">重置连击次数</string>
     <string name="x_remaining">剩余%s</string>
     <string name="sale_ends_in">特卖将于%s结束</string>
     <string name="my_account">我的账号</string>
@@ -1203,10 +1203,10 @@
     <string name="buy_set">购买套装</string>
     <string name="tutorial_reset_confirmation">你的教程已重置</string>
     <string name="you_ran_out_of_health">你的生命值已耗尽！</string>
-    <string name="death_description">但你可以通过努力把它们都找回来！祝你好运——你能做到的。</string>
-    <string name="faint_broken_equipment">丢失的装备可以从奖励栏
-\n重新购买</string>
-    <string name="faint_loss_description">你将降至<b>%d</b>级，失去<b>%d</b>金币，并丢失<b>一件装备</b>……但你可以通过努力把它们都赚回来！</string>
+    <string name="death_description">但是你能通过努力把它们都赢回来！祝你好运——你会做好的。</string>
+    <string name="faint_broken_equipment">丢失的装备可以重新购买
+\n来自奖励</string>
+    <string name="faint_loss_description">你会降至<b>%1$d</b>级，失去 <b>%2$d</b>金币，并失去<b>一个装备</b>！……只要努力，你就能把它们赚回来！</string>
     <string name="account_reset">账号重置</string>
     <string name="avatar_skin_customization">自定义头像皮肤</string>
     <string name="avatar_shirt_customization">自定义头像衬衣</string>
@@ -1353,13 +1353,13 @@
     </plurals>
     <string name="change_class_message">这将移除你当前的职业并退还所有属性点数，然后你可以选择一个新职业</string>
     <string name="reset_account_description_no_pw">你将会失去所有的等级、金币和经验。你设置的所有任务及其任务历史数据将会被删除（挑战任务除外）。你将失去除了订阅者物品和免费纪念物品外的所有装备，但你之后可以重新购买被删除的物品。重新购买职业专属装备需要对应的职业。你当前的职业、成就、宠物和坐骑将会保留。如果你已确定要重置数据，请在下方输入“RESET”。</string>
-    <string name="report_message_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的信息。提交虚假举报是违反Habitica社区准则的行为。</string>
-    <string name="todo_summary_description">这是一项没有截止日期的**%1$s**任务。</string>
-    <string name="shadow_mute_user">隐形屏蔽</string>
-    <string name="plenty_of_potions_description">我们返场了10种最受欢迎的魔法孵化药水。前往市场丰富你的收藏吧！</string>
-    <string name="report_user_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的玩家。提交虚假举报是违反Habitica社区准则的行为。</string>
-    <string name="message_flagged">信息已被举报%d次。</string>
-    <string name="birthday_limitations">本活动为限时活动，从%1$s开始，到%2$s结束。在此期间可购买限定版欢沁狮鹫蛇和十种魔法孵化药水。“免费四件套”部分中列出的其他礼物将自动发送至礼物发送日前30天内的所有活跃账号。礼物发送后创建的账号将无法领取礼品。</string>
+    <string name="report_message_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的帖子。提交虚假报告违反了 Habitica 社区准则。</string>
+    <string name="todo_summary_description">这是一项没有截止日期的 **%1$s** 任务。</string>
+    <string name="shadow_mute_user">禁言</string>
+    <string name="plenty_of_potions_description">我们返场了 10 种最受社区欢迎的魔法孵化药水。前往 \"市场 \"来完善你的收藏吧！</string>
+    <string name="report_user_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的玩家。提交虚假报告是违反 Habitica 社区准则的行为。</string>
+    <string name="message_flagged">信息已被举报 %d 次。</string>
+    <string name="birthday_limitations">这是一个限时活动，从 %1$s 开始，到 %2$s 结束。在此期间可以购买限定版欢腾的狮鹫蛇和十种魔法孵化药水。“四件免费礼品”部分中列出的其他礼品将自动发送到礼品发送日前 30 天内活跃的所有帐户。礼品发送后创建的账户将无法领取礼品。</string>
     <string name="ban_user_confirm">你想要封禁此玩家吗？</string>
     <string name="mute_user_confirm">你想要取消此玩家的聊天权限吗？</string>
     <string name="shadowmute_user_confirm">你想要隐形屏蔽此玩家吗？</string>
@@ -1409,151 +1409,7 @@
     <plurals name="repeat_daily">
         <item quantity="other">每%d天</item>
     </plurals>
-    <string name="customize_avatar">自定义头像</string>
-    <string name="open_profile">打开简介</string>
-    <string name="list">名单</string>
-    <string name="shop_armoire_description">新装备将会在季节盛典期间发布。在此之前，魔法宝箱中还有%d件装备可供寻找！</string>
-    <string name="username_requirements">只能包含字母a-z、数字、连字符或下划线</string>
-    <string name="contrib_tier_description">如果你看到一个用户有彩色昵称和图标，那就是贡献者等级！无论是通过翻译、编码，或者只是有所帮助，为Habitica做出贡献的人都会被授予等级。等级越高，表示此玩家的贡献越大。</string>
-    <string name="visit_faq">查看常见问题解答</string>
-    <string name="invited">已邀请</string>
-    <string name="invite_with_username_email">通过@用户名或邮箱进行邀请</string>
-    <string name="habiticans_send_invite">向你认识的玩家直接发送邀请</string>
-    <string name="username_or_email">用户名或邮箱地址</string>
-    <string name="seeking_party_description">想和其他人一起加入队伍，但不认识其他玩家？让队伍的队长知道你正在寻找队伍！</string>
-    <string name="seeking_party_title">你想要寻找队伍吗？</string>
-    <string name="look_for_party">寻找队伍</string>
-    <string name="seeking_hint">关注邀请或创建自己的队伍</string>
-    <string name="equipment_class_locked">这件装备有职业限制</string>
-    <string name="change_class_to_x">将职业更改为%s</string>
-    <string name="shop_armoire_title">你获得了全部%s装备</string>
-    <string name="shop_armoire_empty_description">新装备将会在季节盛典期间发布。魔法宝箱每个月也会有新物品！</string>
-    <string name="unlock_gear_and_skills">解锁%s装备和技能</string>
-    <string name="rescind_invite">取消邀请</string>
-    <string name="rescinded">已撤销</string>
-    <string name="pending_invite">待接受的邀请</string>
-    <string name="invalid_input">输入无效</string>
-    <string name="contributor_tiers">贡献者等级</string>
-    <string name="report_challenge">举报挑战</string>
-    <string name="subscriber_benefit">订阅者福利</string>
-    <string name="empty_quests_description">通过升级、登录奖励或[副本商店](/shops/quests)获得副本！</string>
-    <string name="watch_ad_to_hang_on">观看广告以用1点生命值撑住！</string>
-    <string name="preference_email_content_release">内容发布与活动</string>
-    <string name="report_reason_title_challenge">你为什么要举报此挑战？</string>
-    <string name="subscriber_button_faint">第二次机会：用1点生命值撑住！</string>
-    <string name="no_saddles">你没有鞍</string>
-    <string name="by_invite">通过邀请</string>
-    <string name="quest_mechanics_rage_title">怒气值</string>
-    <string name="invited_to_guild_notification">&lt;font color=#925CF3&gt;%2$s&lt;/font&gt;邀请你加入团队&lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="report_challenge_explanation">您只能举报违反[社区准则](https://habitica.com/static/community-guidelines)和/或[服务条款](https://habitica.com/static/terms)的挑战。提交虚假举报是违反Habitica社区准则的行为。</string>
-    <string name="preference_push_joined_group_plan_mention">在团队计划中被@提及</string>
-    <string name="no_x">没有%s</string>
-    <string name="habiticans_looking_party">这是想要加入队伍的玩家名单</string>
-    <string name="habiticans_looking_party_empty">目前没有玩家在寻找队伍。你可以稍后再来查看！</string>
-    <string name="subscribe_second_chance_incentive_text">订阅者可获得每天一次第二条命的机会及这些其他福利！</string>
-    <string name="quest_mechanics_collecting_description">在进行收集副本时，完成任务有机会找到任务物品。待结算的物品将在第二天重置时生效。感知属性会提高物品掉率。</string>
-    <string name="quest_mechanics_boss_description">完成任意类型的任务或使用技能来累积待结算伤害！伤害将在你第二天重置时生效。力量属性会影响你所造成的伤害量。</string>
-    <string name="quest_mechanics_pausing_description">"如果你完成日常任务很困难，可以在设置中暂停伤害来休息一下。这样既会防止Boss伤害你或其他人，也会暂停你自己的伤害。其他队友未完成的日常任务仍然会造成伤害，所以请一定要小心！ "</string>
-    <string name="quests_footer_title">想要更多副本？</string>
-    <string name="quest_mechanics_damage_title">Boss依据未完成的日常任务造成伤害</string>
-    <string name="subscribe_incentive_button_faint">订阅以用1点生命值撑住！</string>
-    <string name="item_footer_description">访问[市场](/shops/market)以购买你所需要的物品！</string>
-    <string name="quests_footer_description">访问[副本商店](/shops/quests)查看有哪些副本卷轴出售！</string>
-    <string name="potions">药水</string>
-    <string name="eggs_footer_description">访问[市场](/shops/market)以购买你所需要的宠物蛋！</string>
-    <string name="food_footer_description">访问[市场](/shops/market)以购买食物或可使你的宠物立即长大的鞍！</string>
-    <string name="hatchingPotions_footer_description">访问[市场](/shops/market)以购买基础和季节孵化药水！</string>
-    <string name="subscribe_incentive_button_armoire">订阅以获得免费开启一次的机会！</string>
-    <string name="subscribe_incentive_text_armoire">订阅后你每次购买宝箱都可额外获得一次开启宝箱的机会</string>
-    <string name="subscribe_second_armoire_open_text">订阅者可获得额外的宝箱机会和其他福利！</string>
-    <string name="subscriber_button_armoire">免费开启一次！</string>
-    <string name="sub_perk">订阅福利</string>
-    <string name="subscribe_incentive_text_faint">订阅后每天可获得一次第二次机会以避免生命值耗尽</string>
-    <string name="subscriber_benefit_used_faint">今天你已经使用了第二次机会。%s后可再次使用</string>
-    <string name="subriber_benefit_notification_faint">你以1点生命值开始了第二次机会！</string>
-    <string name="quest_mechanics_damage_description">每次有队伍成员签到时都会计算Boss造成的伤害。此伤害会在你执行下一个与服务器同步的操作时生效。Boss造成的伤害会记录在队伍聊天中。</string>
-    <string name="quest_mechanics_pausing_title">暂停伤害</string>
-    <string name="item_footer_title">没有从任务中得到想要的%s？</string>
-    <string name="empty_special_description_subscribed">在季节盛典期间获取变身道具和每月月初交付的订阅者装备神秘礼盒！</string>
-    <string name="empty_food_description">完成任务、购买宝箱，或前往[市场](/shops/market)囤货！</string>
-    <string name="quest_mechanics">副本机制</string>
-    <string name="quest_mechanics_boss_title">伤害Boss</string>
-    <string name="quest_mechanics_collecting_title">收集副本物品</string>
-    <string name="empty_eggs_description">完成任务、宠物蛋副本，或前往[市场](/shops/market)囤货！</string>
-    <string name="empty_potions_description">完成任务、孵化药水副本，或前往[市场](/shops/market)囤货！</string>
-    <string name="subscribe_listitemArmoire">双倍宝箱奖励</string>
-    <string name="subscribe_listitemArmoire_description">购买一次宝箱可得到两次获取新装备的机会</string>
-    <string name="subscriber_benefit_success_faint">你以1点生命值开始了第二次机会！</string>
-    <string name="subscribe_gems_for_gold_incentive_text">订阅以用金币购买宝石并获得这些其他专属福利！</string>
-    <string name="error_loading_member_body">加载此玩家数据时出现错误。请确保你输入的@用户名无误。</string>
-    <string name="buy_gems_with_gold">用金币购买宝石</string>
-    <string name="subscription_benefit_armoire_sub">你的订阅给了你开启宝箱的额外机会！</string>
-    <string name="quest_mechanics_rage_description">一些困难的BOSS的生命值下会有一条橙色的怒气值。当参与者有未完成的日常任务时，怒气值就会增加。当它被蓄满时，BOSS会发动可怕的攻击，造成额外伤害！</string>
-    <string name="subscribe_prompt_2">订阅以用金币购买宝石并获得这些其他专属福利！</string>
-    <string name="subscribe_listitemArmoire_description_2">每次你打开宝箱后，都可以免费再开启一次！</string>
-    <string name="subscribe_listitem2_description_2">随着时间的推移获得可以在时空旅行者商店购买物品的神秘沙漏</string>
-    <string name="see_more_subscription_options">查看更多订阅选项</string>
-    <string name="faint_subscriber_description">如果你的生命值耗尽，你的订阅可使你每天获得一次第二次机会</string>
-    <string name="rage">怒气</string>
-    <string name="preference_push_invited_to_group_plan">你被邀请加入团队计划</string>
-    <string name="subscribe_hourglass_incentive_text">订阅者可获得可以在时空旅行者商店购买物品的神秘沙漏及这些其他专属福利！</string>
-    <string name="revive_broken_equipment">你的%s坏掉了</string>
-    <string name="purchase_saddles_in_market">鞍可以立即使一只宠物长成为坐骑。你可以在市场购买鞍。</string>
-    <string name="error_loading_member">无法找到玩家</string>
-    <string name="customizations">自定义</string>
-    <string name="avatar_shirts">衬衣</string>
-    <string name="avatar_skins">皮肤</string>
-    <string name="avatar_accents">装饰</string>
-    <string name="avatar_hair_styles">发型</string>
-    <string name="avatar_mustaches">上唇胡须</string>
-    <string name="avatar_beards">下唇胡须</string>
-    <string name="standard_backgrounds">基础背景</string>
-    <string name="avatar_hair_colors">发色</string>
-    <plurals name="x_hours">
-        <item quantity="other">%d小时</item>
-    </plurals>
-    <plurals name="x_minutes">
-        <item quantity="other">%d分钟</item>
-    </plurals>
-    <string name="looking_for_more">想要获得更多？</string>
-    <string name="customization_shop_more">查看自定义商店，获得更多自定义你的头像的方法！</string>
-    <string name="customizations_no_owned">你尚未获得过此类物品</string>
-    <string name="customization_shop_check_out">前往自定义商店来浏览自定义你的头像的多种方法！</string>
-    <string name="switches_in_x">%s后切换</string>
-    <string name="tap_to_reload">刷新以查看新物品</string>
-    <plurals name="x_days">
-        <item quantity="other">%d天</item>
-    </plurals>
-    <string name="monthly_backgrounds">每月背景</string>
-    <string name="winter">冬</string>
-    <string name="spring">春</string>
-    <string name="summer">夏</string>
-    <string name="fall">秋</string>
-    <string name="animal_tails">动物尾巴</string>
-    <string name="mages">法师</string>
-    <string name="healers">医者</string>
-    <string name="rogues">盗贼</string>
-    <string name="warriors">战士</string>
-    <string name="you_own_all_items">你已拥有全部此类物品</string>
-    <string name="try_on_equipment">你可以在装备中试穿它们。新商品将在每月月初更新！</string>
-    <string name="try_on_next_season">你可以通过自定义头像来试穿它们。记得下个季节回来看看新商品！</string>
-    <string name="class_equipment_shop_dialog_new">此物品只有%s可用。打开设置以更改职业。</string>
-    <string name="insufficient_level_equipment_dialog_new">此物品只有%s可用。你可以在10级后选择一个职业。</string>
-    <string name="try_on_customize">你可以通过自定义头像来试穿它们。</string>
-    <string name="try_on_next_month">你可以通过自定义头像来试穿它们。记得下个月回来看看新商品！</string>
-    <string name="clear_database">清除所有数据</string>
-    <string name="clear_cache_settings">清除缓存</string>
-    <string name="equipment">装备</string>
-    <string name="customizing_your_avatar">自定义你的头像</string>
-    <string name="error">错误</string>
-    <string name="error_loading_gems">加载宝石时错误</string>
-    <string name="customization_shop">自定义商店</string>
-    <string name="faint_loss_description_alt">你降到了等级 <b>%d</b>, 失去 <b>%d</b> 金币, 还有经验值… 但你可以通过努力把它们都赚回来！</string>
-    <string name="choose_member">选择成员</string>
-    <string name="unlocks_x_gems_per_month">每月可使用金币兑换%d个宝石</string>
-    <string name="best_deal">最佳优惠方案</string>
-    <string name="cleared_cache">已清除缓存</string>
-    <string name="customizations_owner">Felicitus</string>
-    <string name="two_gems_per_month">月度宝石获取数量+2</string>
-    <string name="subscribe_listitem3_description_alt">用最新的专属装备装扮自己。立即订阅来获取%1$s的%2$s！</string>
-</resources>
\ No newline at end of file
+    <string name="customize_avatar">自定义角色形象</string>
+    <string name="open_profile">打开个人资料</string>
+    <string name="list">清单</string>
+</resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 684b8f389..b47d8830a 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -305,7 +305,7 @@
     <string name="opt_out_class">Opt Out</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_confirmation_price">Do you want to change your class to %s for %d Gems?</string>
+    <string name="class_confirmation_price">Do you want to change your class to %1$s for %2$d Gems?</string>
     <string name="class_changed">You\'re a %s!</string>
     <string name="class_changed_description">You can now use %s skills and purchase gear from shops. Gain levels to earn stat points you can use to power up your skills.</string>
     <string name="choose_class">Choose Class</string>
@@ -684,11 +684,11 @@
     <string name="world_boss">World Boss</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
+    <string name="rage_strike_count" formatted="false">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_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="strike_active_description">Our beloved %1$s was devastated when the %2$s shattered the %3$s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
     <string name="questShop">Quests</string>
     <string name="market_owner_long">Alex the Merchant</string>
     <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -958,7 +958,7 @@
     <string name="id_copied">Copied User ID to clipboard</string>
     <string name="copy_username">Copy Username</string>
     <string name="password_too_short">Your password has to be at least %d characters long</string>
-    <string name="invitation_title">%s invited you to join their group %s</string>
+    <string name="invitation_title">%1$s invited you to join their group %2$s</string>
     <string name="someone">Someone</string>
     <string name="authentication_methods">Authentication Methods</string>
     <string name="local">local</string>
@@ -1146,10 +1146,10 @@
     <string name="x_to_y">%1$s to %2$s</string>
     <string name="how_it_works">How it works</string>
     <string name="limitations">Limitations</string>
-    <string name="fall_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="fall_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="fall_promo_info_prompt">The Fall Gala is in full swing so we thought it was the perfect time for a Gem Sale! Now you will get more Gems with each purchase than ever before.</string>
     <string name="view_gem_bundles">View Gem Bundles</string>
-    <string name="spooky_promo_info_instructions">Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
+    <string name="spooky_promo_info_instructions">Between %1$s and %2$s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!</string>
     <string name="gems_promo_info_limitations_fixed">This promotion only applies during the limited time event. This event starts on %1$s (%2$s) and will end %3$s (%4$s). The promo offer is only available when buying Gems for yourself.</string>
     <string name="spooky_promo_info_prompt">The Gem Sale is back to haunt the very end of this year’s Fall Gala! This is one last chance to get more Gems than ever, so stock up while it lasts!</string>
     <string name="dark_mode">Dark Mode</string>
@@ -1285,8 +1285,8 @@
     <string name="you_ran_out_of_health">You ran out of Health!</string>
     <string name="death_description">But you can get them all back with hard work! Good luck—you’ll do great.</string>
     <string name="faint_broken_equipment">Broken equipment can be repurchased \nfrom the Market</string>
-    <string name="faint_loss_description"><![CDATA[You’ll drop to level <b>%d</b>, lose <b>%d</b> Gold, and break <b>a piece of gear</b>… You can earn them all back with hard work!]]></string>
-    <string name="faint_loss_description_alt"><![CDATA[You’ll drop to level <b>%d</b>, lose <b>%d</b> Gold, and your Experience… You can earn them all back with hard work!]]></string>
+    <string name="faint_loss_description"><![CDATA[You’ll drop to level <b>%1$d</b>, lose <b>%2$d</b> Gold, and break <b>a piece of gear</b>… You can earn them all back with hard work!]]></string>
+    <string name="faint_loss_description_alt"><![CDATA[You’ll drop to level <b>%1$d</b>, lose <b>%2$d</b> Gold, and your Experience… You can earn them all back with hard work!]]></string>
     <string name="account_reset">Account Reset</string>
     <string name="avatar_skin_customization">Avatar Skin Customization</string>
     <string name="avatar_shirt_customization">Avatar Shirt Customization</string>
@@ -1569,7 +1569,7 @@
     <string name="thanks_for_subscribing">Thanks for subscribing</string>
     <string name="set">Set</string>
     <string name="rescrubscribe_to_pick_up">Resubscribe to pick up where you left off!</string>
-    <string name="gem_cap_extra">%d/%d Gem Cap</string>
+    <string name="gem_cap_extra">%1$d/%2$d Gem Cap</string>
     <string name="open_habitica_website">Open Habitica Website</string>
     <string name="nye">New Year\'s Eve</string>
     <string name="valentines">Valentines</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index e254ddd3b..77007e147 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="Theme.Material3.DayNight">
+    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle
         </item>
 
@@ -60,6 +60,7 @@
 
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:navigationBarColor">@color/transparent</item>
+        <item name="enableEdgeToEdge">true</item>
 
         <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="toolbarContentColor">@color/text_primary</item>
@@ -1023,7 +1024,8 @@
 
     <style name="FlatCardView">
         <item name="android:background">@drawable/layout_rounded_bg_window</item>
-        <item name="android:layout_margin">@dimen/spacing_sides</item>
+        <item name="android:layout_marginHorizontal">@dimen/spacing_sides</item>
+        <item name="android:layout_marginVertical">@dimen/spacing_medium</item>
     </style>
 
     <style name="CountLabel">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
index b4753f4a6..e401b2c6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
@@ -38,4 +38,24 @@ open class PushNotificationsPreference : RealmObject(), BaseObject {
         if (contentRelease) enabled.add("contentRelease")
         return enabled
     }
+
+    fun mapOfKeys(): Map<String, Boolean> {
+        return mapOf(
+            "unsubscribeFromAll" to unsubscribeFromAll,
+            "invitedParty" to invitedParty,
+            "invitedQuest" to invitedQuest,
+            "majorUpdates" to majorUpdates,
+            "wonChallenge" to wonChallenge,
+            "invitedGuild" to invitedGuild,
+            "newPM" to newPM,
+            "questStarted" to questStarted,
+            "giftedGems" to giftedGems,
+            "giftedSubscription" to giftedSubscription,
+            "partyActivity" to partyActivity,
+            "mentionParty" to mentionParty,
+            "mentionJoinedGuild" to mentionJoinedGuild,
+            "mentionUnjoinedGuild" to mentionUnjoinedGuild,
+            "contentRelease" to contentRelease
+        )
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index 4a52c8fdc..c392eb262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -9,10 +9,14 @@ import android.widget.FrameLayout
 import android.widget.RelativeLayout
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.ActivityArmoireBinding
+import com.habitrpg.android.habitica.extensions.consumeWindowInsetsAbove30
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.Analytics
@@ -215,6 +219,15 @@ class ArmoireActivity : BaseActivity() {
                 }
             }
         }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.dropRateButton) { v, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    + WindowInsetsCompat.Type.displayCutout()
+            )
+            v.updatePadding(bottom = insets.bottom)
+            consumeWindowInsetsAbove30(windowInsets)
+        }
     }
 
     private fun giveUserArmoire(): Boolean {
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 6dc4c2cf7..c2d69a1e7 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
@@ -94,9 +94,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     private val defaultNavigationBarStyle by lazy {
         SystemBarStyle.auto(ContextCompat.getColor(this, R.color.white_50_alpha),
-            ContextCompat.getColor(this, R.color.black_50_alpha),
-            { _ -> true}
-        )
+            ContextCompat.getColor(this, R.color.black_50_alpha))
     }
     internal var navigationBarStyle: SystemBarStyle? = null
 
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 8d6f93f84..88bafee83 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
@@ -8,10 +8,14 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
+import com.habitrpg.android.habitica.extensions.consumeWindowInsetsAbove30
 import com.habitrpg.android.habitica.helpers.ReviewManager
 import com.habitrpg.android.habitica.models.user.Gear
 import com.habitrpg.android.habitica.models.user.Items
@@ -96,6 +100,16 @@ class ClassSelectionActivity : BaseActivity() {
         binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
         binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
         binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.selectedWrapperView) { v, windowInsets ->
+            val paddingBottom = v.paddingBottom
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    + WindowInsetsCompat.Type.displayCutout()
+            )
+            v.updatePadding(bottom = insets.bottom + paddingBottom)
+            consumeWindowInsetsAbove30(windowInsets)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
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 f4d981927..1b676c89f 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
@@ -119,7 +119,8 @@ class FullProfileActivity : BaseActivity() {
                     isMyProfile = false,
                     onMemberRowClicked = {},
                     onClassSelectionClicked = {},
-                    configManager = configManager
+                    configManager = configManager,
+                    useWindowInsets = false
                 )
             }
         }
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 779fb9ab7..ba13eb9fc 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
@@ -1,13 +1,16 @@
 package com.habitrpg.android.habitica.ui.activities
 
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.activity.SystemBarStyle
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.Fragment
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.setNavigationBarDarkIcons
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment
@@ -22,6 +25,7 @@ class GemPurchaseActivity : PurchaseActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        navigationBarStyle = SystemBarStyle.dark(ContextCompat.getColor(this, R.color.brand_200))
         showSubscription = !(intent.extras?.containsKey("openSubscription") == true && intent.extras?.getBoolean("openSubscription") == false)
         super.onCreate(savedInstanceState)
 
@@ -46,8 +50,16 @@ class GemPurchaseActivity : PurchaseActivity() {
 
     override fun onResume() {
         super.onResume()
+        val controller = WindowCompat.getInsetsController(window, window.decorView)
+        controller.isAppearanceLightNavigationBars = false
+
         if (showSubscription) {
-            window.updateStatusBarColor(ContextCompat.getColor(this, R.color.brand_300), false)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                controller.isAppearanceLightStatusBars = false
+                window.setNavigationBarDarkIcons(false)
+            } else {
+                window.updateStatusBarColor(ContextCompat.getColor(this, R.color.brand_300), false)
+            }
             findViewById<View>(R.id.appbar).setBackgroundColor(ContextCompat.getColor(this, R.color.brand_300))
         }
     }
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 6caa840a0..426cb0db6 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
@@ -5,8 +5,12 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityGroupFormBinding
+import com.habitrpg.android.habitica.extensions.consumeWindowInsetsAbove30
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.common.habitica.helpers.MarkdownParser
@@ -64,6 +68,17 @@ class GroupFormActivity : BaseActivity() {
         binding.saveButton.setOnClickListener {
             finishActivitySuccessfuly()
         }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    + WindowInsetsCompat.Type.displayCutout()
+            )
+            v.updatePadding(top = insets.top,
+                left = insets.left,
+                right = insets.right)
+            consumeWindowInsetsAbove30(windowInsets)
+        }
     }
 
     private fun fillForm() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 63aa23261..750c13820 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -4,30 +4,26 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import androidx.activity.SystemBarStyle
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.lifecycle.lifecycleScope
-import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
 import com.habitrpg.android.habitica.extensions.setNavigationBarDarkIcons
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.viewpagerindicator.IconPagerAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
+class IntroActivity : BaseActivity() {
     private lateinit var binding: ActivityIntroBinding
 
     @Inject
@@ -46,10 +42,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         super.onCreate(savedInstanceState)
 
         setupIntro()
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
 
-        binding.skipButton.setOnClickListener(this)
-        binding.finishButton.setOnClickListener(this)
+        binding.skipButton.setOnClickListener { finishIntro() }
+        binding.finishButton.setOnClickListener { finishIntro() }
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
             contentRepository.retrieveContent()
@@ -59,7 +54,6 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
     override fun onResume() {
         super.onResume()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            window.navigationBarColor = ContextCompat.getColor(this, R.color.black)
             window.isNavigationBarContrastEnforced = false
             val controller = WindowCompat.getInsetsController(window, window.decorView)
             controller.isAppearanceLightNavigationBars = false
@@ -69,13 +63,17 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
     }
 
     private fun setupIntro() {
-        binding.viewPager.adapter = PagerAdapter(supportFragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-    }
-
-    override fun onClick(v: View) {
-        finishIntro()
+        setViewPagerAdapter()
+        binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                if (position == 2) {
+                    binding.finishButton.visibility = View.VISIBLE
+                } else {
+                    binding.finishButton.visibility = View.GONE
+                }
+            }
+        })
     }
 
     private fun finishIntro() {
@@ -87,50 +85,21 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         finish()
     }
 
-    override fun onPageScrolled(
-        position: Int,
-        positionOffset: Float,
-        positionOffsetPixels: Int
-    ) { // no-on
-    }
-
-    override fun onPageSelected(position: Int) {
-        if (position == 2) {
-            binding.finishButton.visibility = View.VISIBLE
-        } else {
-            binding.finishButton.visibility = View.GONE
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) { // no-on
-    }
-
-    private inner class PagerAdapter(fm: FragmentManager) :
-        FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-        override fun getItem(position: Int): Fragment {
-            val fragment = IntroFragment()
-            configureFragment(fragment, position)
-            return fragment
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun instantiateItem(
-            container: ViewGroup,
-            position: Int
-        ): Any {
-            val item = super.instantiateItem(container, position)
-            if (item is IntroFragment) {
-                configureFragment(item, position)
+    private fun setViewPagerAdapter() {
+        val fragmentManager = supportFragmentManager
+        val viewPagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+            override fun createFragment(position: Int): Fragment {
+                val fragment = IntroFragment()
+                configureFragment(fragment, position)
+                return fragment
+            }
+
+            override fun getItemCount(): Int {
+                return 3
             }
-            return item
         }
+        binding.viewPager.adapter = viewPagerAdapter
+        TabLayoutMediator(binding.viewPagerIndicator, binding.viewPager) { tab, position -> }.attach()
     }
 
     private fun configureFragment(
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 788f28d86..a49b4b35f 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
@@ -1,23 +1,19 @@
 package com.habitrpg.android.habitica.ui.activities
 
-import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsetsController
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
-import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -30,10 +26,8 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
-import com.viewpagerindicator.IconPagerAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce
@@ -44,7 +38,7 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 
 @AndroidEntryPoint
-class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
+class SetupActivity : BaseActivity() {
     private lateinit var binding: ActivitySetupBinding
 
     @Inject
@@ -66,7 +60,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private val isLastPage: Boolean
         get() =
             binding.viewPager.adapter == null || binding.viewPager.currentItem == (
-                binding.viewPager.adapter?.count
+                binding.viewPager.adapter?.itemCount
                     ?: 0
                 ) - 1
 
@@ -103,7 +97,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             }
         }
 
-        binding.viewPager.disableFading = true
+        binding.viewPager.isUserInputEnabled = false
 
         binding.previousButton.setOnClickListener { previousClicked() }
         binding.nextButton.setOnClickListener { nextClicked() }
@@ -115,12 +109,26 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     }
 
     private fun setupViewpager() {
-        val fragmentManager = supportFragmentManager
-
-        binding.viewPager.adapter = ViewPageAdapter(fragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
+        setViewPagerAdapter()
+        binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                when {
+                    position == 0 -> {
+                        setPreviousButtonEnabled(false)
+                        binding.nextButton.text = getString(R.string.next_button)
+                    }
+                    isLastPage -> {
+                        setPreviousButtonEnabled(true)
+                        binding.nextButton.text = getString(R.string.finish)
+                    }
+                    else -> {
+                        setPreviousButtonEnabled(true)
+                        binding.nextButton.text = getString(R.string.next_button)
+                    }
+                }
+            }
+        })
     }
 
     private fun nextClicked() {
@@ -147,7 +155,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         } else if (binding.viewPager.currentItem == 0) {
             confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
 
-            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+            val imm = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
             imm?.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
         }
         binding.viewPager.currentItem = binding.viewPager.currentItem + 1
@@ -187,34 +195,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         binding.nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
     }
 
-    override fun onPageScrolled(
-        position: Int,
-        positionOffset: Float,
-        positionOffsetPixels: Int
-    ) =
-        Unit
-
-    override fun onPageSelected(position: Int) {
-        when {
-            position == 0 -> {
-                this.setPreviousButtonEnabled(false)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-
-            isLastPage -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.finish)
-            }
-
-            else -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) = Unit
-
     private var hasCompleted = false
 
     private fun onUserReceived(user: User?) {
@@ -255,67 +235,41 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
-    private inner class ViewPageAdapter(fm: FragmentManager) :
-        FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-        override fun getItem(position: Int): Fragment {
-            return when (position) {
-                1 -> {
-                    val fragment = AvatarSetupFragment()
-                    fragment.activity = this@SetupActivity
-                    fragment.setUser(user)
-                    fragment.width = binding.viewPager.width
-                    avatarSetupFragment = fragment
-                    fragment
-                }
+    private fun setViewPagerAdapter() {
+        val fragmentManager = supportFragmentManager
+        val viewPagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+            override fun createFragment(position: Int): Fragment {
+                return when (position) {
+                    1 -> {
+                        val fragment = AvatarSetupFragment()
+                        fragment.activity = this@SetupActivity
+                        fragment.setUser(user)
+                        fragment.width = binding.viewPager.width
+                        avatarSetupFragment = fragment
+                        fragment
+                    }
 
-                2 -> {
-                    val fragment = TaskSetupFragment()
-                    fragment.setUser(user)
-                    taskSetupFragment = fragment
-                    fragment
-                }
+                    2 -> {
+                        val fragment = TaskSetupFragment()
+                        fragment.setUser(user)
+                        taskSetupFragment = fragment
+                        fragment
+                    }
 
-                else -> {
-                    val fragment = WelcomeFragment()
-                    welcomeFragment = fragment
-                    welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
-                    fragment
+                    else -> {
+                        val fragment = WelcomeFragment()
+                        welcomeFragment = fragment
+                        welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
+                        fragment
+                    }
                 }
             }
-        }
 
-        override fun instantiateItem(
-            container: ViewGroup,
-            position: Int
-        ): Any {
-            val item = super.instantiateItem(container, position)
-            when (item) {
-                is AvatarSetupFragment -> {
-                    avatarSetupFragment = item
-                    item.activity = this@SetupActivity
-                    item.setUser(user)
-                    item.width = binding.viewPager.width
-                }
-
-                is TaskSetupFragment -> {
-                    taskSetupFragment = item
-                    item.setUser(user)
-                }
-
-                is WelcomeFragment -> {
-                    welcomeFragment = item
-                    item.onNameValid = { setNextButtonEnabled(it == true) }
-                }
+            override fun getItemCount(): Int {
+                return 3
             }
-            return item
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
         }
+        binding.viewPager.adapter = viewPagerAdapter
+        TabLayoutMediator(binding.viewPagerIndicator, binding.viewPager) { tab, position -> }.attach()
     }
 }
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 6a4934fc0..bd867c51b 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
@@ -24,6 +24,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.CheckBox
 import android.widget.TextView
+import androidx.activity.SystemBarStyle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.widget.AppCompatCheckBox
@@ -227,6 +228,7 @@ class TaskFormActivity : BaseActivity() {
                 upperTintColor
             )
         }
+        window.navigationBarColor = getThemeColor(R.attr.colorTintedBackground)
         binding.appbar.setBackgroundColor(upperTintColor)
         supportActionBar?.setBackgroundDrawable(ColorDrawable(upperTintColor))
         binding.upperTextWrapper.setBackgroundColor(upperTintColor)
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 f2510fce1..5912fdb59 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
@@ -9,15 +9,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.rememberScrollableState
+import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsIgnoringVisibility
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -27,15 +36,19 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.map
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentComposeBinding
 import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.interactors.ShareAvatarUseCase
@@ -58,7 +71,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 open class AvatarOverviewFragment :
-    BaseMainFragment<FragmentComposeScrollingBinding>(),
+    BaseMainFragment<FragmentComposeBinding>(),
     AdapterView.OnItemSelectedListener {
     @Inject
     lateinit var userViewModel: MainUserViewModel
@@ -69,7 +82,7 @@ open class AvatarOverviewFragment :
     @Inject
     lateinit var appConfigManager: AppConfigManager
 
-    override var binding: FragmentComposeScrollingBinding? = null
+    override var binding: FragmentComposeBinding? = null
 
     protected var showCustomization = true
 
@@ -79,10 +92,11 @@ open class AvatarOverviewFragment :
     override fun createBinding(
         inflater: LayoutInflater,
         container: ViewGroup?
-    ): FragmentComposeScrollingBinding {
-        return FragmentComposeScrollingBinding.inflate(inflater, container, false)
+    ): FragmentComposeBinding {
+        return FragmentComposeBinding.inflate(inflater, container, false)
     }
 
+    @OptIn(ExperimentalLayoutApi::class)
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -96,38 +110,41 @@ open class AvatarOverviewFragment :
                 HabiticaTheme {
                     val avatar by userViewModel.user.observeAsState()
                     Column {
-                        Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.background(colorResource(R.color.window_background))) {
+                        Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth().background(colorResource(R.color.window_background))) {
                             ComposableAvatarView(
                                 avatar = avatar,
                                 configManager = appConfigManager,
                                 modifier =
                                 Modifier
-                                    .padding(top = 6.dp, bottom = 24.dp)
+                                    .padding(bottom = 24.dp)
                                     .size(140.dp, 147.dp)
                             )
-                            Box(
-                                Modifier
-                                    .background(colorResource(R.color.content_background), RoundedCornerShape(topStart = 22.dp, topEnd = 22.dp))
-                                    .fillMaxWidth()
-                                    .height(22.dp)
-                            )
                         }
-                        AvatarOverviewView(
-                            userViewModel,
-                            showCustomization,
-                            !showCustomization,
-                            battleGearWeapon.value?.twoHanded == true,
-                            costumeWeapon.value?.twoHanded == true,
-                            { type, category ->
-                                displayCustomizationFragment(type, category)
-                            },
-                            { type, category ->
-                                displayAvatarEquipmentFragment(type, category)
-                            },
-                            { type, equipped, isCostume ->
-                                displayEquipmentFragment(type, equipped, isCostume)
-                            }
-                        )
+                        Column(modifier = Modifier
+                            .background(colorResource(R.color.window_background))
+                            .clip(RoundedCornerShape(topStart = 22.dp, topEnd = 22.dp))
+                            .background(colorResource(R.color.content_background))
+                            .verticalScroll(rememberScrollState())
+                            .padding(top = 12.dp)
+                            ) {
+                            AvatarOverviewView(
+                                userViewModel,
+                                showCustomization,
+                                !showCustomization,
+                                battleGearWeapon.value?.twoHanded == true,
+                                costumeWeapon.value?.twoHanded == true,
+                                { type, category ->
+                                    displayCustomizationFragment(type, category)
+                                },
+                                { type, category ->
+                                    displayAvatarEquipmentFragment(type, category)
+                                },
+                                { type, equipped, isCostume ->
+                                    displayEquipmentFragment(type, equipped, isCostume)
+                                }
+                            )
+                            Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBarsIgnoringVisibility))
+                        }
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
index 3df073630..c69cab97a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.unit.dp
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -35,6 +36,7 @@ import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.promo.BirthdayBanner
+import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
@@ -128,15 +130,14 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
         loadInventory()
 
         binding?.bottomSpacing?.let {
-            val paddingBottom = it.paddingBottom
             ViewCompat.setOnApplyWindowInsetsListener(it) { v, insets ->
                 val bars = insets.getInsets(
                     WindowInsetsCompat.Type.systemBars()
                         or WindowInsetsCompat.Type.displayCutout()
                 )
-                v.updatePadding(
-                    bottom = bars.bottom + paddingBottom,
-                )
+                v.updateLayoutParams {
+                    height = bars.bottom + 30.dpToPx(requireContext())
+                }
                 consumeWindowInsetsAbove30(insets)
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 76b0dd3fa..24cfd17da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -12,7 +12,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.replace
 import androidx.lifecycle.lifecycleScope
@@ -22,6 +25,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.consumeWindowInsetsAbove30
 import com.habitrpg.android.habitica.helpers.Analytics
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
@@ -33,6 +37,7 @@ import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.promo.BirthdayBanner
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
@@ -149,6 +154,19 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
 
         binding?.content?.subscriptionDisclaimerView?.setMarkdown("Once we’ve confirmed your purchase, the payment will be charged to your Google Account.\n\nSubscriptions automatically renew unless auto-renewal is turned off at least 24-hours before the end of the current period. If you have an active subscription, your account will be charged for renewal within 24-hours prior to the end of your current subscription period and you will be charged the same price you initially paid.\n\nBy continuing you accept the [Terms of Use](https://habitica.com/static/terms) and [Privacy Policy](https://habitica.com/static/privacy).")
 
+        binding?.content?.bottomSpacing?.let {
+            ViewCompat.setOnApplyWindowInsetsListener(it) { v, insets ->
+                val bars = insets.getInsets(
+                    WindowInsetsCompat.Type.systemBars()
+                            or WindowInsetsCompat.Type.displayCutout()
+                )
+                v.updateLayoutParams {
+                    height = bars.bottom
+                }
+                consumeWindowInsetsAbove30(insets)
+            }
+        }
+
         Analytics.sendNavigationEvent("subscription screen")
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 7976f31d8..b232668d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import androidx.core.graphics.drawable.toDrawable
 
 @AndroidEntryPoint
 class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
@@ -47,17 +48,14 @@ class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
 
     private val checkmarkIcon: Drawable by lazy {
         context?.let {
-            BitmapDrawable(
-                resources,
-                HabiticaIconsHelper.imageOfCheckmark(
-                    ContextCompat.getColor(it, R.color.green_50),
-                    1f
-                )
-            )
+            HabiticaIconsHelper.imageOfCheckmark(
+                ContextCompat.getColor(it, R.color.green_50),
+                1f
+            ).toDrawable(resources)
         } ?: VectorDrawable()
     }
     private val alertIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
+        HabiticaIconsHelper.imageOfAlertIcon().toDrawable(resources)
     }
     val username: String
         get() = binding?.usernameEditText?.text?.toString() ?: ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
index cca1902a8..2aacb878c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
@@ -107,8 +107,8 @@ constructor(
                         "checkin_count",
                         user.loginIncentives.toString()
                     )
-                    user.preferences?.pushNotifications?.listOfEnabledKeys()?.let {
-                        Analytics.setUserProperty("allowed_push_notifications", it)
+                    user.preferences?.pushNotifications?.mapOfKeys()?.forEach { key, isEnabled ->
+                        Analytics.setUserProperty("allow_push_${key}", isEnabled)
                     }
                     Analytics.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
                     pushNotificationManager.setUser(user)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
index 87a349215..6d7a9245f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -134,11 +134,16 @@ fun AppHeaderView(
     onAvatarClicked: (() -> Unit)? = null,
     onMemberRowClicked: () -> Unit,
     onClassSelectionClicked: () -> Unit,
-    configManager: AppConfigManager? = null
+    configManager: AppConfigManager? = null,
+    useWindowInsets: Boolean = true
 ) {
     val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
-    Column(modifier
-        .windowInsetsPadding(WindowInsets.systemBarsIgnoringVisibility)) {
+    var wrapperModifier = modifier
+    if (useWindowInsets) {
+        wrapperModifier = wrapperModifier
+            .windowInsetsPadding(WindowInsets.systemBarsIgnoringVisibility)
+    }
+    Column(modifier = wrapperModifier) {
         Row {
             ComposableAvatarView(
                 user,
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 0384edf2f..c3a7bf8b0 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,22 +1,12 @@
 package com.habitrpg.android.habitica.ui.views;
 
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-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;
 
@@ -30,10 +20,6 @@ import java.util.Stack;
  * @author Phillip Thelen
  */
 public class HabiticaIcons {
-    private static class GlobalCache {
-        static PaintCodeBitmap rageStrikeNPC = new PaintCodeBitmap();
-        static PorterDuffXfermode blendModeSourceIn = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
-    }
 
     // Resizing Behavior
     public enum ResizingBehavior {
@@ -6711,386 +6697,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForQuestBackground {
-        private static final Paint paint = new Paint();
-        private static final RectF rectangleRect = new RectF();
-        private static final Path rectanglePath = new Path();
-        private static final RectF group = new RectF();
-        private static final RectF rectangle2Rect = new RectF();
-        private static final Path rectangle2Path = new Path();
-        private static final RectF rectangle3Rect = new RectF();
-        private static final Path rectangle3Path = new Path();
-        private static final RectF group2 = new RectF();
-        private static final RectF rectangle4Rect = new RectF();
-        private static final Path rectangle4Path = new Path();
-        private static final RectF rectangle5Rect = new RectF();
-        private static final Path rectangle5Path = new Path();
-        private static final RectF group3 = new RectF();
-        private static final RectF rectangle6Rect = new RectF();
-        private static final Path rectangle6Path = new Path();
-        private static final RectF rectangle7Rect = new RectF();
-        private static final Path rectangle7Path = new Path();
-        private static final RectF group4 = new RectF();
-        private static final RectF rectangle8Rect = new RectF();
-        private static final Path rectangle8Path = new Path();
-        private static final RectF rectangle9Rect = new RectF();
-        private static final Path rectangle9Path = new Path();
-        private static final RectF rectangle10Rect = new RectF();
-        private static final Path rectangle10Path = new Path();
-        private static final RectF rectangle11Rect = new RectF();
-        private static final Path rectangle11Path = new Path();
-        private static final RectF rectangle12Rect = new RectF();
-        private static final Path rectangle12Path = new Path();
-        private static final RectF rectangle13Rect = new RectF();
-        private static final Path rectangle13Path = new Path();
-        private static final RectF rectangle14Rect = new RectF();
-        private static final Path rectangle14Path = new Path();
-        private static final RectF rectangle15Rect = new RectF();
-        private static final Path rectangle15Path = new Path();
-    }
-
-
-    public static void drawQuestBackground(Canvas canvas, RectF frame, int bossColorDark, int bossColorMedium, int bossColorLight) {
-        // General Declarations
-        Paint paint = CacheForQuestBackground.paint;
-
-        // Rectangle
-        RectF rectangleRect = CacheForQuestBackground.rectangleRect;
-        rectangleRect.set(frame.left,
-                frame.top,
-                frame.left + (float) Math.floor(frame.width() + 0.5f),
-                frame.top + (float) Math.floor(frame.height() + 0.5f));
-        Path rectanglePath = CacheForQuestBackground.rectanglePath;
-        rectanglePath.reset();
-        rectanglePath.moveTo(rectangleRect.left, rectangleRect.top);
-        rectanglePath.lineTo(rectangleRect.right, rectangleRect.top);
-        rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
-        rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
-        rectanglePath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorMedium);
-        canvas.drawPath(rectanglePath, paint);
-
-        // Group
-        {
-            RectF group = CacheForQuestBackground.group;
-            group.set(frame.left + 2f,
-                    frame.bottom - 8f,
-                    frame.left + 8f,
-                    frame.bottom - 2f);
-
-            // Rectangle 2
-            RectF rectangle2Rect = CacheForQuestBackground.rectangle2Rect;
-            rectangle2Rect.set(group.left,
-                    group.top,
-                    group.left + (float) Math.floor(group.width() + 0.5f),
-                    group.top + (float) Math.floor(group.height() + 0.5f));
-            Path rectangle2Path = CacheForQuestBackground.rectangle2Path;
-            rectangle2Path.reset();
-            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
-            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
-            rectangle2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle2Path, paint);
-
-            // Rectangle 3
-            RectF rectangle3Rect = CacheForQuestBackground.rectangle3Rect;
-            rectangle3Rect.set(group.left + (float) Math.floor(group.width() * 0.33333f + 0.5f),
-                    group.top + (float) Math.floor(group.height() * 0.33333f + 0.5f),
-                    group.left + (float) Math.floor(group.width() * 0.66667f + 0.5f),
-                    group.top + (float) Math.floor(group.height() * 0.66667f + 0.5f));
-            Path rectangle3Path = CacheForQuestBackground.rectangle3Path;
-            rectangle3Path.reset();
-            rectangle3Path.moveTo(rectangle3Rect.left, rectangle3Rect.top);
-            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.top);
-            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
-            rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
-            rectangle3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle3Path, paint);
-        }
-
-        // Group 2
-        {
-            RectF group2 = CacheForQuestBackground.group2;
-            group2.set(frame.left + 2f,
-                    frame.top + 2f,
-                    frame.left + 8f,
-                    frame.top + 8f);
-
-            // Rectangle 4
-            RectF rectangle4Rect = CacheForQuestBackground.rectangle4Rect;
-            rectangle4Rect.set(group2.left,
-                    group2.top,
-                    group2.left + (float) Math.floor(group2.width() + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() + 0.5f));
-            Path rectangle4Path = CacheForQuestBackground.rectangle4Path;
-            rectangle4Path.reset();
-            rectangle4Path.moveTo(rectangle4Rect.left, rectangle4Rect.top);
-            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.top);
-            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
-            rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
-            rectangle4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle4Path, paint);
-
-            // Rectangle 5
-            RectF rectangle5Rect = CacheForQuestBackground.rectangle5Rect;
-            rectangle5Rect.set(group2.left + (float) Math.floor(group2.width() * 0.33333f + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() * 0.33333f + 0.5f),
-                    group2.left + (float) Math.floor(group2.width() * 0.66667f + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() * 0.66667f + 0.5f));
-            Path rectangle5Path = CacheForQuestBackground.rectangle5Path;
-            rectangle5Path.reset();
-            rectangle5Path.moveTo(rectangle5Rect.left, rectangle5Rect.top);
-            rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.top);
-            rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.bottom);
-            rectangle5Path.lineTo(rectangle5Rect.left, rectangle5Rect.bottom);
-            rectangle5Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle5Path, paint);
-        }
-
-        // Group 3
-        {
-            RectF group3 = CacheForQuestBackground.group3;
-            group3.set(frame.right - 8f,
-                    frame.top + 2f,
-                    frame.right - 2f,
-                    frame.top + 8f);
-
-            // Rectangle 6
-            RectF rectangle6Rect = CacheForQuestBackground.rectangle6Rect;
-            rectangle6Rect.set(group3.left,
-                    group3.top,
-                    group3.left + (float) Math.floor(group3.width() + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() + 0.5f));
-            Path rectangle6Path = CacheForQuestBackground.rectangle6Path;
-            rectangle6Path.reset();
-            rectangle6Path.moveTo(rectangle6Rect.left, rectangle6Rect.top);
-            rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.top);
-            rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.bottom);
-            rectangle6Path.lineTo(rectangle6Rect.left, rectangle6Rect.bottom);
-            rectangle6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle6Path, paint);
-
-            // Rectangle 7
-            RectF rectangle7Rect = CacheForQuestBackground.rectangle7Rect;
-            rectangle7Rect.set(group3.left + (float) Math.floor(group3.width() * 0.33333f + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() * 0.33333f + 0.5f),
-                    group3.left + (float) Math.floor(group3.width() * 0.66667f + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() * 0.66667f + 0.5f));
-            Path rectangle7Path = CacheForQuestBackground.rectangle7Path;
-            rectangle7Path.reset();
-            rectangle7Path.moveTo(rectangle7Rect.left, rectangle7Rect.top);
-            rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.top);
-            rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.bottom);
-            rectangle7Path.lineTo(rectangle7Rect.left, rectangle7Rect.bottom);
-            rectangle7Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle7Path, paint);
-        }
-
-        // Group 4
-        {
-            RectF group4 = CacheForQuestBackground.group4;
-            group4.set(frame.right - 8f,
-                    frame.bottom - 8f,
-                    frame.right - 2f,
-                    frame.bottom - 2f);
-
-            // Rectangle 8
-            RectF rectangle8Rect = CacheForQuestBackground.rectangle8Rect;
-            rectangle8Rect.set(group4.left,
-                    group4.top,
-                    group4.left + (float) Math.floor(group4.width() + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() + 0.5f));
-            Path rectangle8Path = CacheForQuestBackground.rectangle8Path;
-            rectangle8Path.reset();
-            rectangle8Path.moveTo(rectangle8Rect.left, rectangle8Rect.top);
-            rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.top);
-            rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.bottom);
-            rectangle8Path.lineTo(rectangle8Rect.left, rectangle8Rect.bottom);
-            rectangle8Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle8Path, paint);
-
-            // Rectangle 9
-            RectF rectangle9Rect = CacheForQuestBackground.rectangle9Rect;
-            rectangle9Rect.set(group4.left + (float) Math.floor(group4.width() * 0.33333f + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() * 0.33333f + 0.5f),
-                    group4.left + (float) Math.floor(group4.width() * 0.66667f + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() * 0.66667f + 0.5f));
-            Path rectangle9Path = CacheForQuestBackground.rectangle9Path;
-            rectangle9Path.reset();
-            rectangle9Path.moveTo(rectangle9Rect.left, rectangle9Rect.top);
-            rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.top);
-            rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.bottom);
-            rectangle9Path.lineTo(rectangle9Rect.left, rectangle9Rect.bottom);
-            rectangle9Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle9Path, paint);
-        }
-
-        // Rectangle 10
-        RectF rectangle10Rect = CacheForQuestBackground.rectangle10Rect;
-        rectangle10Rect.set(frame.right - 4f,
-                frame.top + 10f,
-                frame.right - 2f,
-                frame.bottom - 10f);
-        Path rectangle10Path = CacheForQuestBackground.rectangle10Path;
-        rectangle10Path.reset();
-        rectangle10Path.moveTo(rectangle10Rect.left, rectangle10Rect.top);
-        rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.top);
-        rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.bottom);
-        rectangle10Path.lineTo(rectangle10Rect.left, rectangle10Rect.bottom);
-        rectangle10Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle10Path, paint);
-
-        // Rectangle 11
-        RectF rectangle11Rect = CacheForQuestBackground.rectangle11Rect;
-        rectangle11Rect.set(frame.left + 10f,
-                frame.bottom - 4f,
-                frame.right - 10f,
-                frame.bottom - 2f);
-        Path rectangle11Path = CacheForQuestBackground.rectangle11Path;
-        rectangle11Path.reset();
-        rectangle11Path.moveTo(rectangle11Rect.left, rectangle11Rect.top);
-        rectangle11Path.lineTo(rectangle11Rect.right, rectangle11Rect.top);
-        rectangle11Path.lineTo(rectangle11Rect.right, rectangle11Rect.bottom);
-        rectangle11Path.lineTo(rectangle11Rect.left, rectangle11Rect.bottom);
-        rectangle11Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle11Path, paint);
-
-        // Rectangle 12
-        RectF rectangle12Rect = CacheForQuestBackground.rectangle12Rect;
-        rectangle12Rect.set(frame.left + 10f,
-                frame.top + 2f,
-                frame.right - 10f,
-                frame.top + 4f);
-        Path rectangle12Path = CacheForQuestBackground.rectangle12Path;
-        rectangle12Path.reset();
-        rectangle12Path.moveTo(rectangle12Rect.left, rectangle12Rect.top);
-        rectangle12Path.lineTo(rectangle12Rect.right, rectangle12Rect.top);
-        rectangle12Path.lineTo(rectangle12Rect.right, rectangle12Rect.bottom);
-        rectangle12Path.lineTo(rectangle12Rect.left, rectangle12Rect.bottom);
-        rectangle12Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle12Path, paint);
-
-        // Rectangle 13
-        RectF rectangle13Rect = CacheForQuestBackground.rectangle13Rect;
-        rectangle13Rect.set(frame.left + 10f,
-                frame.top + 4f,
-                frame.right - 10f,
-                frame.bottom - 4f);
-        Path rectangle13Path = CacheForQuestBackground.rectangle13Path;
-        rectangle13Path.reset();
-        rectangle13Path.moveTo(rectangle13Rect.left, rectangle13Rect.top);
-        rectangle13Path.lineTo(rectangle13Rect.right, rectangle13Rect.top);
-        rectangle13Path.lineTo(rectangle13Rect.right, rectangle13Rect.bottom);
-        rectangle13Path.lineTo(rectangle13Rect.left, rectangle13Rect.bottom);
-        rectangle13Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorDark);
-        canvas.drawPath(rectangle13Path, paint);
-
-        // Rectangle 14
-        RectF rectangle14Rect = CacheForQuestBackground.rectangle14Rect;
-        rectangle14Rect.set(frame.left + 4f,
-                frame.top + 10f,
-                frame.right - 4f,
-                frame.bottom - 10f);
-        Path rectangle14Path = CacheForQuestBackground.rectangle14Path;
-        rectangle14Path.reset();
-        rectangle14Path.moveTo(rectangle14Rect.left, rectangle14Rect.top);
-        rectangle14Path.lineTo(rectangle14Rect.right, rectangle14Rect.top);
-        rectangle14Path.lineTo(rectangle14Rect.right, rectangle14Rect.bottom);
-        rectangle14Path.lineTo(rectangle14Rect.left, rectangle14Rect.bottom);
-        rectangle14Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorDark);
-        canvas.drawPath(rectangle14Path, paint);
-
-        // Rectangle 15
-        RectF rectangle15Rect = CacheForQuestBackground.rectangle15Rect;
-        rectangle15Rect.set(frame.left + 2f,
-                frame.top + 10f,
-                frame.left + 4f,
-                frame.bottom - 10f);
-        Path rectangle15Path = CacheForQuestBackground.rectangle15Path;
-        rectangle15Path.reset();
-        rectangle15Path.moveTo(rectangle15Rect.left, rectangle15Rect.top);
-        rectangle15Path.lineTo(rectangle15Rect.right, rectangle15Rect.top);
-        rectangle15Path.lineTo(rectangle15Rect.right, rectangle15Rect.bottom);
-        rectangle15Path.lineTo(rectangle15Rect.left, rectangle15Rect.bottom);
-        rectangle15Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle15Path, paint);
-    }
-
     private static class CacheForDamage {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -7680,7 +7286,7 @@ public class HabiticaIcons {
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
 
         // Bezier
-        canvas.saveLayerAlpha(null, 138, Canvas.ALL_SAVE_FLAG);
+        canvas.saveLayerAlpha(null, 138);
         {
             canvas.translate(8f, 8f);
             currentTransformation.peek().postTranslate(8f, 8f);
@@ -7711,617 +7317,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForRageStrikeInactive {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF labelRect = new RectF();
-        private static final Path labelPath = new Path();
-    }
-
-    public static void drawRageStrikeInactive(Canvas canvas) {
-        HabiticaIcons.drawRageStrikeInactive(canvas, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawRageStrikeInactive(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForRageStrikeInactive.paint;
-
-        // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
-        int fillColor91 = Color.argb(255, 255, 200, 167);
-        int textForeground = Color.argb(255, 183, 90, 28);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRageStrikeInactive.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeInactive.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-
-        // Group 3
-        {
-            // Bezier 2
-            RectF bezier2Rect = CacheForRageStrikeInactive.bezier2Rect;
-            bezier2Rect.set(17f, 21f, 45f, 61f);
-            Path bezier2Path = CacheForRageStrikeInactive.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(17f, 48.08f);
-            bezier2Path.lineTo(21.6f, 41f);
-            bezier2Path.lineTo(17f, 33.92f);
-            bezier2Path.lineTo(31f, 21f);
-            bezier2Path.lineTo(45f, 33.92f);
-            bezier2Path.lineTo(40.4f, 41f);
-            bezier2Path.lineTo(45f, 48.08f);
-            bezier2Path.lineTo(31f, 61f);
-            bezier2Path.lineTo(17f, 48.08f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(16f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(strokeColor13);
-            canvas.drawPath(bezier2Path, paint);
-            canvas.restore();
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForRageStrikeInactive.bezier4Rect;
-            bezier4Rect.set(17f, 21f, 45f, 61f);
-            Path bezier4Path = CacheForRageStrikeInactive.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(17f, 48.08f);
-            bezier4Path.lineTo(21.6f, 41f);
-            bezier4Path.lineTo(17f, 33.92f);
-            bezier4Path.lineTo(31f, 21f);
-            bezier4Path.lineTo(45f, 33.92f);
-            bezier4Path.lineTo(40.4f, 41f);
-            bezier4Path.lineTo(45f, 48.08f);
-            bezier4Path.lineTo(31f, 61f);
-            bezier4Path.lineTo(17f, 48.08f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(8f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(strokeColor14);
-            canvas.drawPath(bezier4Path, paint);
-            canvas.restore();
-
-            // Bezier
-            RectF bezierRect = CacheForRageStrikeInactive.bezierRect;
-            bezierRect.set(17f, 21f, 45f, 61f);
-            Path bezierPath = CacheForRageStrikeInactive.bezierPath;
-            bezierPath.reset();
-            bezierPath.moveTo(17f, 48.08f);
-            bezierPath.lineTo(21.6f, 41f);
-            bezierPath.lineTo(17f, 33.92f);
-            bezierPath.lineTo(31f, 21f);
-            bezierPath.lineTo(45f, 33.92f);
-            bezierPath.lineTo(40.4f, 41f);
-            bezierPath.lineTo(45f, 48.08f);
-            bezierPath.lineTo(31f, 61f);
-            bezierPath.lineTo(17f, 48.08f);
-            bezierPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor91);
-            canvas.drawPath(bezierPath, paint);
-
-            // Label
-            RectF labelRect = CacheForRageStrikeInactive.labelRect;
-            labelRect.set(27.1f, 34.38f, 35.8f, 49f);
-            Path labelPath = CacheForRageStrikeInactive.labelPath;
-            labelPath.reset();
-            labelPath.moveTo(30.36f, 46.78f);
-            labelPath.lineTo(30.36f, 49f);
-            labelPath.lineTo(32.58f, 49f);
-            labelPath.lineTo(32.58f, 46.78f);
-            labelPath.lineTo(30.36f, 46.78f);
-            labelPath.close();
-            labelPath.moveTo(27.1f, 39.18f);
-            labelPath.lineTo(28.8f, 39.18f);
-            labelPath.cubicTo(28.8f, 38.71f, 28.85f, 38.28f, 28.96f, 37.88f);
-            labelPath.cubicTo(29.07f, 37.48f, 29.24f, 37.13f, 29.47f, 36.84f);
-            labelPath.cubicTo(29.7f, 36.55f, 29.99f, 36.31f, 30.34f, 36.14f);
-            labelPath.cubicTo(30.69f, 35.97f, 31.1f, 35.88f, 31.58f, 35.88f);
-            labelPath.cubicTo(32.3f, 35.88f, 32.87f, 36.09f, 33.29f, 36.5f);
-            labelPath.cubicTo(33.71f, 36.91f, 33.95f, 37.49f, 34f, 38.22f);
-            labelPath.cubicTo(34.03f, 38.71f, 33.97f, 39.13f, 33.82f, 39.48f);
-            labelPath.cubicTo(33.67f, 39.83f, 33.48f, 40.14f, 33.23f, 40.43f);
-            labelPath.cubicTo(32.98f, 40.72f, 32.72f, 40.99f, 32.43f, 41.25f);
-            labelPath.cubicTo(32.14f, 41.51f, 31.87f, 41.79f, 31.61f, 42.1f);
-            labelPath.cubicTo(31.35f, 42.41f, 31.13f, 42.76f, 30.95f, 43.15f);
-            labelPath.cubicTo(30.77f, 43.54f, 30.67f, 44.02f, 30.64f, 44.58f);
-            labelPath.lineTo(30.64f, 45.52f);
-            labelPath.lineTo(32.34f, 45.52f);
-            labelPath.lineTo(32.34f, 44.74f);
-            labelPath.cubicTo(32.34f, 44.39f, 32.39f, 44.08f, 32.49f, 43.81f);
-            labelPath.cubicTo(32.59f, 43.54f, 32.72f, 43.28f, 32.89f, 43.05f);
-            labelPath.cubicTo(33.06f, 42.82f, 33.24f, 42.6f, 33.45f, 42.39f);
-            labelPath.cubicTo(33.66f, 42.18f, 33.87f, 41.98f, 34.08f, 41.78f);
-            labelPath.cubicTo(34.29f, 41.57f, 34.5f, 41.35f, 34.71f, 41.12f);
-            labelPath.cubicTo(34.92f, 40.89f, 35.1f, 40.65f, 35.26f, 40.38f);
-            labelPath.cubicTo(35.42f, 40.11f, 35.55f, 39.82f, 35.65f, 39.49f);
-            labelPath.cubicTo(35.75f, 39.16f, 35.8f, 38.79f, 35.8f, 38.38f);
-            labelPath.cubicTo(35.8f, 37.74f, 35.7f, 37.17f, 35.49f, 36.68f);
-            labelPath.cubicTo(35.28f, 36.19f, 34.99f, 35.77f, 34.62f, 35.43f);
-            labelPath.cubicTo(34.25f, 35.09f, 33.8f, 34.83f, 33.29f, 34.65f);
-            labelPath.cubicTo(32.78f, 34.47f, 32.21f, 34.38f, 31.58f, 34.38f);
-            labelPath.cubicTo(30.89f, 34.38f, 30.26f, 34.5f, 29.7f, 34.74f);
-            labelPath.cubicTo(29.14f, 34.98f, 28.67f, 35.32f, 28.28f, 35.75f);
-            labelPath.cubicTo(27.89f, 36.18f, 27.6f, 36.69f, 27.39f, 37.28f);
-            labelPath.cubicTo(27.18f, 37.87f, 27.09f, 38.5f, 27.1f, 39.18f);
-            labelPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(textForeground);
-            canvas.drawPath(labelPath, paint);
-        }
-
-        canvas.restore();
-    }
-
-    private static class CacheForRageStrikeActive {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-    }
-
-    public static void drawRageStrikeActive(Canvas canvas, Context context, Bitmap rageStrikeNPC) {
-        HabiticaIcons.drawRageStrikeActive(canvas, context, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit, rageStrikeNPC);
-    }
-
-    public static void drawRageStrikeActive(Canvas canvas, Context context, RectF targetFrame, ResizingBehavior resizing, Bitmap rageStrikeNPC) {
-        // General Declarations
-        float displayDensity = context.getResources().getDisplayMetrics().density;
-        Paint paint = CacheForRageStrikeActive.paint;
-
-        // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
-
-        // Local Images
-        PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRageStrikeActive.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeActive.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-
-        // Bezier
-        RectF bezierRect = CacheForRageStrikeActive.bezierRect;
-        bezierRect.set(10.39f, 10.89f, 52.39f, 70.89f);
-        Path bezierPath = CacheForRageStrikeActive.bezierPath;
-        bezierPath.reset();
-        bezierPath.moveTo(10.39f, 51.5f);
-        bezierPath.lineTo(17.28f, 40.89f);
-        bezierPath.lineTo(10.39f, 30.27f);
-        bezierPath.lineTo(31.39f, 10.89f);
-        bezierPath.lineTo(52.39f, 30.27f);
-        bezierPath.lineTo(45.49f, 40.89f);
-        bezierPath.lineTo(52.39f, 51.5f);
-        bezierPath.lineTo(31.39f, 70.89f);
-        bezierPath.lineTo(10.39f, 51.5f);
-        bezierPath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(16f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(strokeColor13);
-        canvas.drawPath(bezierPath, paint);
-        canvas.restore();
-
-        // Bezier 3
-        RectF bezier3Rect = CacheForRageStrikeActive.bezier3Rect;
-        bezier3Rect.set(10.39f, 10.89f, 52.39f, 70.89f);
-        Path bezier3Path = CacheForRageStrikeActive.bezier3Path;
-        bezier3Path.reset();
-        bezier3Path.moveTo(10.39f, 51.5f);
-        bezier3Path.lineTo(17.28f, 40.89f);
-        bezier3Path.lineTo(10.39f, 30.27f);
-        bezier3Path.lineTo(31.39f, 10.89f);
-        bezier3Path.lineTo(52.39f, 30.27f);
-        bezier3Path.lineTo(45.49f, 40.89f);
-        bezier3Path.lineTo(52.39f, 51.5f);
-        bezier3Path.lineTo(31.39f, 70.89f);
-        bezier3Path.lineTo(10.39f, 51.5f);
-        bezier3Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(8f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(strokeColor14);
-        canvas.drawPath(bezier3Path, paint);
-        canvas.restore();
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForRageStrikeActive.bezier2Rect;
-        bezier2Rect.set(10f, 11f, 52f, 71f);
-        Path bezier2Path = CacheForRageStrikeActive.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(10f, 51.61f);
-        bezier2Path.lineTo(16.9f, 41f);
-        bezier2Path.lineTo(10f, 30.39f);
-        bezier2Path.lineTo(31f, 11f);
-        bezier2Path.lineTo(52f, 30.39f);
-        bezier2Path.lineTo(45.1f, 41f);
-        bezier2Path.lineTo(52f, 51.61f);
-        bezier2Path.lineTo(31f, 71f);
-        bezier2Path.lineTo(10f, 51.61f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setShader(pc_rageStrikeNPC.getShader());
-
-        canvas.save();
-        canvas.clipPath(bezier2Path);
-        canvas.translate(bezier2Rect.left - 27f, bezier2Rect.top - 18f);
-        canvas.scale(1 / displayDensity, 1 / displayDensity);
-        canvas.clipRect(pc_rageStrikeNPC.getBounds());
-        canvas.drawPaint(paint);
-        canvas.restore();
-
-        canvas.restore();
-    }
-
-    private static class CacheForRage {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezier5Rect = new RectF();
-        private static final Path bezier5Path = new Path();
-        private static final RectF bezier6Rect = new RectF();
-        private static final Path bezier6Path = new Path();
-        private static final RectF bezier7Rect = new RectF();
-        private static final Path bezier7Path = new Path();
-        private static final RectF bezier8Rect = new RectF();
-        private static final Path bezier8Path = new Path();
-        private static final RectF bezier9Rect = new RectF();
-        private static final Path bezier9Path = new Path();
-        private static final RectF bezier10Rect = new RectF();
-        private static final Path bezier10Path = new Path();
-        private static final RectF bezier11Rect = new RectF();
-        private static final Path bezier11Path = new Path();
-        private static final RectF bezier12Rect = new RectF();
-        private static final Path bezier12Path = new Path();
-        private static final RectF bezier13Rect = new RectF();
-        private static final Path bezier13Path = new Path();
-        private static final RectF bezier14Rect = new RectF();
-        private static final Path bezier14Path = new Path();
-    }
-
-    public static void drawRage(Canvas canvas) {
-        HabiticaIcons.drawRage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawRage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForRage.paint;
-
-        // Local Colors
-        int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor93 = Color.argb(255, 244, 120, 37);
-        int fillColor94 = Color.argb(89, 180, 89, 27);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRage.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRage.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-
-        // Group
-        {
-            // Bezier
-            RectF bezierRect = CacheForRage.bezierRect;
-            bezierRect.set(2f, 1f, 15.33f, 17f);
-            Path bezierPath = CacheForRage.bezierPath;
-            bezierPath.reset();
-            bezierPath.moveTo(2f, 7f);
-            bezierPath.lineTo(8.67f, 1f);
-            bezierPath.lineTo(15.33f, 7f);
-            bezierPath.lineTo(8.67f, 17f);
-            bezierPath.lineTo(2f, 7f);
-            bezierPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor14);
-            canvas.drawPath(bezierPath, paint);
-
-            // Bezier 2
-            RectF bezier2Rect = CacheForRage.bezier2Rect;
-            bezier2Rect.set(2f, 1f, 15.33f, 17f);
-            Path bezier2Path = CacheForRage.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(2f, 7f);
-            bezier2Path.lineTo(8.67f, 1f);
-            bezier2Path.lineTo(15.33f, 7f);
-            bezier2Path.lineTo(8.67f, 17f);
-            bezier2Path.lineTo(2f, 7f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor14);
-            canvas.drawPath(bezier2Path, paint);
-
-            // Bezier 3
-            RectF bezier3Rect = CacheForRage.bezier3Rect;
-            bezier3Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
-            Path bezier3Path = CacheForRage.bezier3Path;
-            bezier3Path.reset();
-            bezier3Path.moveTo(13.6f, 7.2f);
-            bezier3Path.lineTo(8.67f, 6.2f);
-            bezier3Path.lineTo(8.67f, 2.8f);
-            bezier3Path.lineTo(13.6f, 7.2f);
-            bezier3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier3Path, paint);
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForRage.bezier4Rect;
-            bezier4Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
-            Path bezier4Path = CacheForRage.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(8.67f, 6.2f);
-            bezier4Path.lineTo(3.73f, 7.2f);
-            bezier4Path.lineTo(8.67f, 2.8f);
-            bezier4Path.lineTo(8.67f, 6.2f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier4Path, paint);
-
-            // Bezier 5
-            RectF bezier5Rect = CacheForRage.bezier5Rect;
-            bezier5Rect.set(3.73f, 6.2f, 8.67f, 14.6f);
-            Path bezier5Path = CacheForRage.bezier5Path;
-            bezier5Path.reset();
-            bezier5Path.moveTo(8.67f, 6.2f);
-            bezier5Path.lineTo(8.67f, 14.6f);
-            bezier5Path.lineTo(3.73f, 7.2f);
-            bezier5Path.lineTo(8.67f, 6.2f);
-            bezier5Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor92);
-            canvas.drawPath(bezier5Path, paint);
-
-            // Bezier 6
-            RectF bezier6Rect = CacheForRage.bezier6Rect;
-            bezier6Rect.set(8.67f, 6.2f, 13.6f, 14.6f);
-            Path bezier6Path = CacheForRage.bezier6Path;
-            bezier6Path.reset();
-            bezier6Path.moveTo(13.6f, 7.2f);
-            bezier6Path.lineTo(8.67f, 14.6f);
-            bezier6Path.lineTo(8.67f, 6.2f);
-            bezier6Path.lineTo(13.6f, 7.2f);
-            bezier6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor15);
-            canvas.drawPath(bezier6Path, paint);
-
-            // Bezier 7
-            RectF bezier7Rect = CacheForRage.bezier7Rect;
-            bezier7Rect.set(2f, 1f, 15.33f, 17f);
-            Path bezier7Path = CacheForRage.bezier7Path;
-            bezier7Path.reset();
-            bezier7Path.moveTo(15.33f, 7f);
-            bezier7Path.lineTo(8.67f, 1f);
-            bezier7Path.lineTo(2f, 7f);
-            bezier7Path.lineTo(3.33f, 9f);
-            bezier7Path.lineTo(2f, 11f);
-            bezier7Path.lineTo(8.67f, 17f);
-            bezier7Path.lineTo(15.33f, 11f);
-            bezier7Path.lineTo(14f, 9f);
-            bezier7Path.lineTo(15.33f, 7f);
-            bezier7Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor93);
-            canvas.drawPath(bezier7Path, paint);
-
-            // Bezier 8
-            RectF bezier8Rect = CacheForRage.bezier8Rect;
-            bezier8Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
-            Path bezier8Path = CacheForRage.bezier8Path;
-            bezier8Path.reset();
-            bezier8Path.moveTo(13.6f, 7.2f);
-            bezier8Path.lineTo(8.67f, 6.2f);
-            bezier8Path.lineTo(8.67f, 2.8f);
-            bezier8Path.lineTo(13.6f, 7.2f);
-            bezier8Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier8Path, paint);
-
-            // Bezier 9
-            RectF bezier9Rect = CacheForRage.bezier9Rect;
-            bezier9Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
-            Path bezier9Path = CacheForRage.bezier9Path;
-            bezier9Path.reset();
-            bezier9Path.moveTo(8.67f, 6.2f);
-            bezier9Path.lineTo(3.73f, 7.2f);
-            bezier9Path.lineTo(8.67f, 2.8f);
-            bezier9Path.lineTo(8.67f, 6.2f);
-            bezier9Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier9Path, paint);
-
-            // Bezier 10
-            RectF bezier10Rect = CacheForRage.bezier10Rect;
-            bezier10Rect.set(3.73f, 3.4f, 13.6f, 14.6f);
-            Path bezier10Path = CacheForRage.bezier10Path;
-            bezier10Path.reset();
-            bezier10Path.moveTo(8.67f, 6.2f);
-            bezier10Path.lineTo(8.67f, 14.6f);
-            bezier10Path.lineTo(7.37f, 12.65f);
-            bezier10Path.lineTo(3.73f, 7.2f);
-            bezier10Path.lineTo(8.67f, 6.2f);
-            bezier10Path.close();
-            bezier10Path.moveTo(8.67f, 11.8f);
-            bezier10Path.lineTo(8.67f, 3.4f);
-            bezier10Path.lineTo(9.96f, 5.35f);
-            bezier10Path.lineTo(13.6f, 10.8f);
-            bezier10Path.lineTo(8.67f, 11.8f);
-            bezier10Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier10Path, paint);
-
-            // Bezier 11
-            RectF bezier11Rect = CacheForRage.bezier11Rect;
-            bezier11Rect.set(3.73f, 6.2f, 13.6f, 15.2f);
-            Path bezier11Path = CacheForRage.bezier11Path;
-            bezier11Path.reset();
-            bezier11Path.moveTo(13.6f, 7.2f);
-            bezier11Path.lineTo(8.67f, 14.6f);
-            bezier11Path.lineTo(8.67f, 6.2f);
-            bezier11Path.lineTo(13.6f, 7.2f);
-            bezier11Path.close();
-            bezier11Path.moveTo(3.73f, 10.8f);
-            bezier11Path.lineTo(8.67f, 11.8f);
-            bezier11Path.lineTo(8.67f, 15.2f);
-            bezier11Path.lineTo(3.73f, 10.8f);
-            bezier11Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor94);
-            canvas.drawPath(bezier11Path, paint);
-
-            // Bezier 12
-            RectF bezier12Rect = CacheForRage.bezier12Rect;
-            bezier12Rect.set(8.67f, 10.8f, 13.6f, 15.2f);
-            Path bezier12Path = CacheForRage.bezier12Path;
-            bezier12Path.reset();
-            bezier12Path.moveTo(8.67f, 11.8f);
-            bezier12Path.lineTo(13.6f, 10.8f);
-            bezier12Path.lineTo(8.67f, 15.2f);
-            bezier12Path.lineTo(8.67f, 11.8f);
-            bezier12Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier12Path, paint);
-
-            // Bezier 13
-            RectF bezier13Rect = CacheForRage.bezier13Rect;
-            bezier13Rect.set(3.73f, 3.4f, 8.67f, 11.8f);
-            Path bezier13Path = CacheForRage.bezier13Path;
-            bezier13Path.reset();
-            bezier13Path.moveTo(3.73f, 10.8f);
-            bezier13Path.lineTo(8.67f, 3.4f);
-            bezier13Path.lineTo(8.67f, 11.8f);
-            bezier13Path.lineTo(3.73f, 10.8f);
-            bezier13Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier13Path, paint);
-
-            // Bezier 14
-            RectF bezier14Rect = CacheForRage.bezier14Rect;
-            bezier14Rect.set(5.5f, 4.67f, 11.83f, 13.33f);
-            Path bezier14Path = CacheForRage.bezier14Path;
-            bezier14Path.reset();
-            bezier14Path.moveTo(5.5f, 10.53f);
-            bezier14Path.lineTo(6.54f, 9f);
-            bezier14Path.lineTo(5.5f, 7.47f);
-            bezier14Path.lineTo(8.67f, 4.67f);
-            bezier14Path.lineTo(11.83f, 7.47f);
-            bezier14Path.lineTo(10.79f, 9f);
-            bezier14Path.lineTo(11.83f, 10.53f);
-            bezier14Path.lineTo(8.67f, 13.33f);
-            bezier14Path.lineTo(5.5f, 10.53f);
-            bezier14Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier14Path, paint);
-        }
-
-        canvas.restore();
-    }
-
     private static class CacheForTaskDifficultyStars {
         private static final RectF originalFrame = new RectF(0f, 0f, 36f, 36f);
         private static final RectF resizedFrame = new RectF();
@@ -8693,560 +7688,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForGuildCrest {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 40f, 38f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF group = new RectF();
-        private static final Path clip5Path = new Path();
-        private static final RectF rectangleRect = new RectF();
-        private static final Path rectanglePath = new Path();
-        private static final RectF rectangle2Rect = new RectF();
-        private static final Path rectangle2Path = new Path();
-        private static final RectF rectangle4Rect = new RectF();
-        private static final Path rectangle4Path = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezier7Rect = new RectF();
-        private static final Path bezier7Path = new Path();
-        private static final RectF bezier8Rect = new RectF();
-        private static final Path bezier8Path = new Path();
-        private static final RectF group8 = new RectF();
-        private static final Path clip14Path = new Path();
-        private static final RectF rectangle3Rect = new RectF();
-        private static final Path rectangle3Path = new Path();
-        private static final RectF rectangle8Rect = new RectF();
-        private static final Path rectangle8Path = new Path();
-        private static final RectF rectangle5Rect = new RectF();
-        private static final Path rectangle5Path = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier6Rect = new RectF();
-        private static final Path bezier6Path = new Path();
-        private static final RectF bezier14Rect = new RectF();
-        private static final Path bezier14Path = new Path();
-        private static final RectF bezier15Rect = new RectF();
-        private static final Path bezier15Path = new Path();
-        private static final RectF bezier13Rect = new RectF();
-        private static final Path bezier13Path = new Path();
-        private static final RectF bezier10Rect = new RectF();
-        private static final Path bezier10Path = new Path();
-        private static final RectF bezier11Rect = new RectF();
-        private static final Path bezier11Path = new Path();
-        private static final RectF labelRect = new RectF();
-        private static final TextPaint labelTextPaint = new TextPaint();
-        private static final PaintCodeStaticLayout labelStaticLayout = new PaintCodeStaticLayout();
-    }
-
-    public static void drawGuildCrest(Canvas canvas, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        HabiticaIcons.drawGuildCrest(canvas, new RectF(0f, 0f, 40f, 38f), ResizingBehavior.AspectFit, isOwner, isPublic, memberCount, memberCountLabel);
-    }
-
-    public static void drawGuildCrest(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        // General Declarations
-        Stack<Matrix> currentTransformation = new Stack<>();
-        currentTransformation.push(new Matrix());
-        Paint paint = CacheForGuildCrest.paint;
-
-        // Local Colors
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestBronze5 = Color.argb(255, 179, 98, 19);
-        int crestSilver5 = Color.argb(255, 141, 141, 141);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestBronze6 = Color.argb(255, 179, 98, 19);
-        int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold5 = Color.argb(255, 223, 145, 30);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
-
-        // Local Variables
-        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
-        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
-        boolean isPrivate = !isPublic;
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForGuildCrest.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrest.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 40f, resizedFrame.height() / 38f);
-
-        // Group
-        if (isPublic) {
-            RectF group = CacheForGuildCrest.group;
-            group.set(0f, 0f, 40f, 38f);
-            canvas.save();
-
-            // Clip 5
-            Path clip5Path = CacheForGuildCrest.clip5Path;
-            clip5Path.reset();
-            clip5Path.moveTo(20.5f, 38f);
-            clip5Path.lineTo(33.14f, 30.6f);
-            clip5Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            clip5Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
-            clip5Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
-            clip5Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            clip5Path.lineTo(20.5f, 38f);
-            clip5Path.close();
-            canvas.clipPath(clip5Path);
-
-            // Rectangle
-            RectF rectangleRect = CacheForGuildCrest.rectangleRect;
-            rectangleRect.set(-5f, -5f, 45f, 43f);
-            Path rectanglePath = CacheForGuildCrest.rectanglePath;
-            rectanglePath.reset();
-            rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor1);
-            canvas.drawPath(rectanglePath, paint);
-
-            // Rectangle 2
-            canvas.save();
-            canvas.translate(23.03f, 23.53f);
-            currentTransformation.peek().postTranslate(23.03f, 23.53f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle2Rect = CacheForGuildCrest.rectangle2Rect;
-            rectangle2Rect.set(-6.01f, -38f, 6.01f, 38f);
-            Path rectangle2Path = CacheForGuildCrest.rectangle2Path;
-            rectangle2Path.reset();
-            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
-            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
-            rectangle2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle2Path, paint);
-            canvas.restore();
-
-            // Rectangle 4
-            canvas.save();
-            canvas.translate(35f, 22f);
-            currentTransformation.peek().postTranslate(35f, 22f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle4Rect = CacheForGuildCrest.rectangle4Rect;
-            rectangle4Rect.set(-1f, -38f, 1f, 38f);
-            Path rectangle4Path = CacheForGuildCrest.rectangle4Path;
-            rectangle4Path.reset();
-            rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle4Path, paint);
-            canvas.restore();
-
-            // Bezier 2
-            RectF bezier2Rect = CacheForGuildCrest.bezier2Rect;
-            bezier2Rect.set(0f, 0f, 40f, 38f);
-            Path bezier2Path = CacheForGuildCrest.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(20.5f, 38f);
-            bezier2Path.lineTo(33.14f, 30.6f);
-            bezier2Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            bezier2Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
-            bezier2Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
-            bezier2Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            bezier2Path.lineTo(20.5f, 38f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(10f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor3);
-            canvas.drawPath(bezier2Path, paint);
-            canvas.restore();
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForGuildCrest.bezier4Rect;
-            bezier4Rect.set(0f, -0f, 40f, 38f);
-            Path bezier4Path = CacheForGuildCrest.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(20.5f, 38f);
-            bezier4Path.lineTo(33.14f, 30.6f);
-            bezier4Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            bezier4Path.cubicTo(29.47f, 3.77f, 26.58f, -0f, 20.5f, -0f);
-            bezier4Path.cubicTo(14.6f, -0f, 10.53f, 3.77f, 0f, 4.93f);
-            bezier4Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            bezier4Path.lineTo(20.5f, 38f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(6f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor4);
-            canvas.drawPath(bezier4Path, paint);
-            canvas.restore();
-
-            // Bezier 7
-            if (isOwner) {
-                RectF bezier7Rect = CacheForGuildCrest.bezier7Rect;
-                bezier7Rect.set(10.85f, 8.25f, 15.75f, 13.16f);
-                Path bezier7Path = CacheForGuildCrest.bezier7Path;
-                bezier7Path.reset();
-                bezier7Path.moveTo(13.3f, 12.54f);
-                bezier7Path.lineTo(12.37f, 13.05f);
-                bezier7Path.cubicTo(11.89f, 13.31f, 11.57f, 13.08f, 11.65f, 12.55f);
-                bezier7Path.lineTo(11.84f, 11.43f);
-                bezier7Path.lineTo(11.07f, 10.65f);
-                bezier7Path.cubicTo(10.69f, 10.26f, 10.82f, 9.87f, 11.36f, 9.79f);
-                bezier7Path.lineTo(12.4f, 9.63f);
-                bezier7Path.lineTo(12.87f, 8.63f);
-                bezier7Path.cubicTo(13.11f, 8.13f, 13.49f, 8.12f, 13.73f, 8.63f);
-                bezier7Path.lineTo(14.2f, 9.63f);
-                bezier7Path.lineTo(15.24f, 9.79f);
-                bezier7Path.cubicTo(15.78f, 9.87f, 15.92f, 10.25f, 15.53f, 10.65f);
-                bezier7Path.lineTo(14.76f, 11.43f);
-                bezier7Path.lineTo(14.95f, 12.55f);
-                bezier7Path.cubicTo(15.04f, 13.09f, 14.72f, 13.32f, 14.23f, 13.05f);
-                bezier7Path.lineTo(13.3f, 12.54f);
-                bezier7Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier7Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier7Path, paint);
-            }
-
-            // Bezier 8
-            if (isOwner) {
-                RectF bezier8Rect = CacheForGuildCrest.bezier8Rect;
-                bezier8Rect.set(24.25f, 8.25f, 29.15f, 13.16f);
-                Path bezier8Path = CacheForGuildCrest.bezier8Path;
-                bezier8Path.reset();
-                bezier8Path.moveTo(26.7f, 12.54f);
-                bezier8Path.lineTo(25.77f, 13.05f);
-                bezier8Path.cubicTo(25.29f, 13.31f, 24.97f, 13.08f, 25.05f, 12.55f);
-                bezier8Path.lineTo(25.24f, 11.43f);
-                bezier8Path.lineTo(24.47f, 10.65f);
-                bezier8Path.cubicTo(24.09f, 10.26f, 24.22f, 9.87f, 24.76f, 9.79f);
-                bezier8Path.lineTo(25.8f, 9.63f);
-                bezier8Path.lineTo(26.27f, 8.63f);
-                bezier8Path.cubicTo(26.51f, 8.13f, 26.89f, 8.12f, 27.13f, 8.63f);
-                bezier8Path.lineTo(27.6f, 9.63f);
-                bezier8Path.lineTo(28.64f, 9.79f);
-                bezier8Path.cubicTo(29.18f, 9.87f, 29.32f, 10.25f, 28.93f, 10.65f);
-                bezier8Path.lineTo(28.16f, 11.43f);
-                bezier8Path.lineTo(28.35f, 12.55f);
-                bezier8Path.cubicTo(28.44f, 13.09f, 28.12f, 13.32f, 27.63f, 13.05f);
-                bezier8Path.lineTo(26.7f, 12.54f);
-                bezier8Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier8Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier8Path, paint);
-            }
-
-            canvas.restore();
-        }
-
-        // Group 8
-        if (isPrivate) {
-            RectF group8 = CacheForGuildCrest.group8;
-            group8.set(3f, 0f, 37f, 38f);
-            canvas.save();
-
-            // Clip 14
-            Path clip14Path = CacheForGuildCrest.clip14Path;
-            clip14Path.reset();
-            clip14Path.moveTo(20f, 0f);
-            clip14Path.lineTo(3f, 7.62f);
-            clip14Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            clip14Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            clip14Path.lineTo(20f, 0f);
-            clip14Path.close();
-            canvas.clipPath(clip14Path);
-
-            // Rectangle 3
-            RectF rectangle3Rect = CacheForGuildCrest.rectangle3Rect;
-            rectangle3Rect.set(2f, 0f, 37f, 38f);
-            Path rectangle3Path = CacheForGuildCrest.rectangle3Path;
-            rectangle3Path.reset();
-            rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor1);
-            canvas.drawPath(rectangle3Path, paint);
-
-            // Rectangle 8
-            canvas.save();
-            canvas.translate(23.7f, 10.7f);
-            currentTransformation.peek().postTranslate(23.7f, 10.7f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle8Rect = CacheForGuildCrest.rectangle8Rect;
-            rectangle8Rect.set(-1f, -11f, 1f, 11f);
-            Path rectangle8Path = CacheForGuildCrest.rectangle8Path;
-            rectangle8Path.reset();
-            rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle8Path, paint);
-            canvas.restore();
-
-            // Rectangle 5
-            canvas.save();
-            canvas.translate(17.73f, 24f);
-            currentTransformation.peek().postTranslate(17.73f, 24f);
-            canvas.rotate(45f);
-            currentTransformation.peek().postRotate(45f);
-            RectF rectangle5Rect = CacheForGuildCrest.rectangle5Rect;
-            rectangle5Rect.set(-19f, -10f, 19f, 10f);
-            Path rectangle5Path = CacheForGuildCrest.rectangle5Path;
-            rectangle5Path.reset();
-            rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle5Path, paint);
-            canvas.restore();
-
-            // Bezier 3
-            RectF bezier3Rect = CacheForGuildCrest.bezier3Rect;
-            bezier3Rect.set(3f, 0f, 37f, 38f);
-            Path bezier3Path = CacheForGuildCrest.bezier3Path;
-            bezier3Path.reset();
-            bezier3Path.moveTo(20f, 0f);
-            bezier3Path.lineTo(3f, 7.62f);
-            bezier3Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            bezier3Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            bezier3Path.lineTo(20f, 0f);
-            bezier3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(10f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor3);
-            canvas.drawPath(bezier3Path, paint);
-            canvas.restore();
-
-            // Bezier 6
-            RectF bezier6Rect = CacheForGuildCrest.bezier6Rect;
-            bezier6Rect.set(3f, 0f, 37f, 38f);
-            Path bezier6Path = CacheForGuildCrest.bezier6Path;
-            bezier6Path.reset();
-            bezier6Path.moveTo(20f, 0f);
-            bezier6Path.lineTo(3f, 7.62f);
-            bezier6Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            bezier6Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            bezier6Path.lineTo(20f, 0f);
-            bezier6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(6f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor4);
-            canvas.drawPath(bezier6Path, paint);
-            canvas.restore();
-
-            // Bezier 14
-            if (isOwner) {
-                RectF bezier14Rect = CacheForGuildCrest.bezier14Rect;
-                bezier14Rect.set(25.85f, 10.85f, 30.75f, 15.76f);
-                Path bezier14Path = CacheForGuildCrest.bezier14Path;
-                bezier14Path.reset();
-                bezier14Path.moveTo(28.3f, 15.14f);
-                bezier14Path.lineTo(27.37f, 15.65f);
-                bezier14Path.cubicTo(26.89f, 15.91f, 26.57f, 15.69f, 26.65f, 15.15f);
-                bezier14Path.lineTo(26.84f, 14.03f);
-                bezier14Path.lineTo(26.07f, 13.25f);
-                bezier14Path.cubicTo(25.69f, 12.86f, 25.82f, 12.47f, 26.36f, 12.39f);
-                bezier14Path.lineTo(27.4f, 12.23f);
-                bezier14Path.lineTo(27.87f, 11.23f);
-                bezier14Path.cubicTo(28.11f, 10.73f, 28.49f, 10.72f, 28.73f, 11.23f);
-                bezier14Path.lineTo(29.2f, 12.23f);
-                bezier14Path.lineTo(30.24f, 12.39f);
-                bezier14Path.cubicTo(30.78f, 12.47f, 30.92f, 12.85f, 30.53f, 13.25f);
-                bezier14Path.lineTo(29.76f, 14.03f);
-                bezier14Path.lineTo(29.95f, 15.15f);
-                bezier14Path.cubicTo(30.04f, 15.69f, 29.72f, 15.92f, 29.23f, 15.65f);
-                bezier14Path.lineTo(28.3f, 15.14f);
-                bezier14Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier14Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier14Path, paint);
-            }
-
-            // Bezier 15
-            if (isOwner) {
-                RectF bezier15Rect = CacheForGuildCrest.bezier15Rect;
-                bezier15Rect.set(9.25f, 10.85f, 14.15f, 15.76f);
-                Path bezier15Path = CacheForGuildCrest.bezier15Path;
-                bezier15Path.reset();
-                bezier15Path.moveTo(11.7f, 15.14f);
-                bezier15Path.lineTo(10.77f, 15.65f);
-                bezier15Path.cubicTo(10.29f, 15.91f, 9.97f, 15.69f, 10.05f, 15.15f);
-                bezier15Path.lineTo(10.24f, 14.03f);
-                bezier15Path.lineTo(9.47f, 13.25f);
-                bezier15Path.cubicTo(9.09f, 12.86f, 9.22f, 12.47f, 9.76f, 12.39f);
-                bezier15Path.lineTo(10.8f, 12.23f);
-                bezier15Path.lineTo(11.27f, 11.23f);
-                bezier15Path.cubicTo(11.51f, 10.73f, 11.89f, 10.72f, 12.13f, 11.23f);
-                bezier15Path.lineTo(12.6f, 12.23f);
-                bezier15Path.lineTo(13.64f, 12.39f);
-                bezier15Path.cubicTo(14.18f, 12.47f, 14.32f, 12.85f, 13.93f, 13.25f);
-                bezier15Path.lineTo(13.16f, 14.03f);
-                bezier15Path.lineTo(13.35f, 15.15f);
-                bezier15Path.cubicTo(13.44f, 15.69f, 13.12f, 15.92f, 12.63f, 15.65f);
-                bezier15Path.lineTo(11.7f, 15.14f);
-                bezier15Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier15Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier15Path, paint);
-            }
-
-            canvas.restore();
-        }
-
-        // Bezier 13
-        RectF bezier13Rect = CacheForGuildCrest.bezier13Rect;
-        bezier13Rect.set(15f, 7f, 25f, 17f);
-        Path bezier13Path = CacheForGuildCrest.bezier13Path;
-        bezier13Path.reset();
-        bezier13Path.moveTo(20f, 12.72f);
-        bezier13Path.cubicTo(18.33f, 12.72f, 15f, 13.55f, 15f, 15.22f);
-        bezier13Path.lineTo(15f, 17f);
-        bezier13Path.lineTo(25f, 17f);
-        bezier13Path.lineTo(25f, 15.22f);
-        bezier13Path.cubicTo(25f, 13.55f, 21.67f, 12.72f, 20f, 12.72f);
-        bezier13Path.close();
-        bezier13Path.moveTo(20f, 7f);
-        bezier13Path.cubicTo(18.82f, 7f, 17.86f, 7.96f, 17.86f, 9.14f);
-        bezier13Path.cubicTo(17.86f, 10.33f, 18.82f, 11.29f, 20f, 11.29f);
-        bezier13Path.cubicTo(21.18f, 11.29f, 22.14f, 10.33f, 22.14f, 9.14f);
-        bezier13Path.cubicTo(22.14f, 7.96f, 21.18f, 7f, 20f, 7f);
-        bezier13Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier13Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(crestColor6);
-        canvas.drawPath(bezier13Path, paint);
-
-        // Bezier 10
-        RectF bezier10Rect = CacheForGuildCrest.bezier10Rect;
-        bezier10Rect.set(2f, 19f, 38f, 34f);
-        Path bezier10Path = CacheForGuildCrest.bezier10Path;
-        bezier10Path.reset();
-        bezier10Path.moveTo(2f, 26.5f);
-        bezier10Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
-        bezier10Path.lineTo(30.5f, 19f);
-        bezier10Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
-        bezier10Path.lineTo(38f, 26.5f);
-        bezier10Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
-        bezier10Path.lineTo(9.5f, 34f);
-        bezier10Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
-        bezier10Path.lineTo(2f, 26.5f);
-        bezier10Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier10Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(Color.WHITE);
-        canvas.drawPath(bezier10Path, paint);
-
-        // Bezier 11
-        RectF bezier11Rect = CacheForGuildCrest.bezier11Rect;
-        bezier11Rect.set(2f, 19f, 38f, 34f);
-        Path bezier11Path = CacheForGuildCrest.bezier11Path;
-        bezier11Path.reset();
-        bezier11Path.moveTo(2f, 26.5f);
-        bezier11Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
-        bezier11Path.lineTo(30.5f, 19f);
-        bezier11Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
-        bezier11Path.lineTo(38f, 26.5f);
-        bezier11Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
-        bezier11Path.lineTo(9.5f, 34f);
-        bezier11Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
-        bezier11Path.lineTo(2f, 26.5f);
-        bezier11Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(2f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(crestColor3);
-        canvas.drawPath(bezier11Path, paint);
-        canvas.restore();
-
-        // Label
-        RectF labelRect = CacheForGuildCrest.labelRect;
-        labelRect.set(4f, 20f, 36f, 33f);
-        TextPaint labelTextPaint = CacheForGuildCrest.labelTextPaint;
-        labelTextPaint.reset();
-        labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        labelTextPaint.setColor(crestColor5);
-        labelTextPaint.setTextSize(12f);
-        StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), memberCountLabel, labelTextPaint);
-        canvas.save();
-        canvas.clipRect(labelRect);
-        canvas.translate(labelRect.left, labelRect.top + (labelRect.height() - labelStaticLayout.getHeight()) / 2f);
-        labelStaticLayout.draw(canvas);
-        canvas.restore();
-
-        canvas.restore();
-    }
-
     private static class CacheForGuildCrestMedium {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 30f, 34f);
@@ -9273,7 +7714,7 @@ public class HabiticaIcons {
 
     public static void drawGuildCrestMedium(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
         // General Declarations
-        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForGuildCrestMedium.paint;
 
@@ -9460,91 +7901,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForGuildCrestSmall {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-    }
-
-    public static void drawGuildCrestSmall(Canvas canvas, float memberCount) {
-        HabiticaIcons.drawGuildCrestSmall(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, memberCount);
-    }
-
-    public static void drawGuildCrestSmall(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
-        // General Declarations
-        Paint paint = CacheForGuildCrestSmall.paint;
-
-        // Local Colors
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-
-        // Local Variables
-        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForGuildCrestSmall.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestSmall.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-
-        // Bezier
-        RectF bezierRect = CacheForGuildCrestSmall.bezierRect;
-        bezierRect.set(0f, 0f, 16f, 16f);
-        Path bezierPath = CacheForGuildCrestSmall.bezierPath;
-        bezierPath.reset();
-        bezierPath.moveTo(15.94f, 3.41f);
-        bezierPath.cubicTo(15.94f, 2.94f, 15.69f, 2.5f, 15.18f, 2.25f);
-        bezierPath.cubicTo(13.64f, 1.5f, 9.97f, 0f, 8f, 0f);
-        bezierPath.cubicTo(6.02f, 0f, 2.36f, 1.5f, 0.82f, 2.25f);
-        bezierPath.cubicTo(0.31f, 2.5f, 0.06f, 2.94f, 0.05f, 3.41f);
-        bezierPath.cubicTo(0.01f, 5.65f, -0.93f, 12.24f, 7.1f, 15.81f);
-        bezierPath.cubicTo(7.65f, 16.05f, 8.35f, 16.07f, 8.9f, 15.81f);
-        bezierPath.cubicTo(16.95f, 12.24f, 15.98f, 5.65f, 15.94f, 3.41f);
-        bezierPath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezierPath.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(crestColor4);
-        canvas.drawPath(bezierPath, paint);
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForGuildCrestSmall.bezier2Rect;
-        bezier2Rect.set(4f, 3f, 12f, 11f);
-        Path bezier2Path = CacheForGuildCrestSmall.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(8f, 7.57f);
-        bezier2Path.cubicTo(6.67f, 7.57f, 4f, 8.24f, 4f, 9.57f);
-        bezier2Path.lineTo(4f, 11f);
-        bezier2Path.lineTo(12f, 11f);
-        bezier2Path.lineTo(12f, 9.57f);
-        bezier2Path.cubicTo(12f, 8.24f, 9.33f, 7.57f, 8f, 7.57f);
-        bezier2Path.close();
-        bezier2Path.moveTo(8f, 3f);
-        bezier2Path.cubicTo(7.05f, 3f, 6.29f, 3.77f, 6.29f, 4.71f);
-        bezier2Path.cubicTo(6.29f, 5.66f, 7.05f, 6.43f, 8f, 6.43f);
-        bezier2Path.cubicTo(8.95f, 6.43f, 9.71f, 5.66f, 9.71f, 4.71f);
-        bezier2Path.cubicTo(9.71f, 3.77f, 8.95f, 3f, 8f, 3f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor37);
-        canvas.drawPath(bezier2Path, paint);
-
-        canvas.restore();
-    }
-
     private static class CacheForTwoHandedIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
@@ -10648,86 +9004,6 @@ public class HabiticaIcons {
 
 }
 
-class PaintCodeColor extends Color {
-    private static float[] ColorToHSV(int originalColor) {
-        float[] hsv = new float[3];
-        RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv);
-        return hsv;
-    }
-
-    public static float hue(int color) {
-        return ColorToHSV(color)[0];
-    }
-
-
-    public static float brightness(int color) {
-        return ColorToHSV(color)[2];
-    }
-
-    public static int colorByChangingAlpha(int color, int newAlpha) {
-        return argb(newAlpha, red(color), green(color), blue(color));
-    }
-}
-
-class PaintCodeShadow {
-    int color;
-    float dx, dy;
-    private float radius;
-    private BlurMaskFilter blurMaskFilter;
-
-    PaintCodeShadow() {
-
-    }
-
-    PaintCodeShadow get(int color) {
-        this.color = color;
-        this.dx = (float) 0.0;
-        this.dy = (float) 1.0;
-
-        if (this.radius != (float) 1.0) {
-            this.blurMaskFilter = null;
-            this.radius = (float) 1.0;
-        }
-
-        return this;
-    }
-
-    void setBlurOfPaint(Paint paint) {
-        if (this.radius <= 0)
-            return;
-
-        if (this.blurMaskFilter == null)
-            this.blurMaskFilter = new BlurMaskFilter(this.radius, BlurMaskFilter.Blur.NORMAL);
-
-        paint.setMaskFilter(this.blurMaskFilter);
-    }
-}
-
-
-class PaintCodeBitmap {
-    private BitmapShader shader;
-    private Bitmap bitmap;
-    private RectF bounds;
-
-    PaintCodeBitmap get(Bitmap bitmap) {
-        if (this.bitmap != bitmap) {
-            this.bitmap = bitmap;
-            this.bounds = new RectF(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            this.shader = new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-        }
-        return this;
-    }
-
-    BitmapShader getShader() {
-        return this.shader;
-    }
-
-    RectF getBounds() {
-        return this.bounds;
-    }
-}
-
-
 class PaintCodeDashPathEffect {
     private DashPathEffect effect;
     private float dash, gap, phase;
@@ -10742,23 +9018,3 @@ class PaintCodeDashPathEffect {
         return this.effect;
     }
 }
-
-
-class PaintCodeStaticLayout {
-    private StaticLayout layout;
-    private int width;
-    private Layout.Alignment alignment;
-    private CharSequence source;
-    private TextPaint paint;
-
-    StaticLayout get(int width, CharSequence source, TextPaint paint) {
-        if (this.layout == null || this.width != width || this.alignment != Layout.Alignment.ALIGN_CENTER || !this.source.equals(source) || !this.paint.equals(paint)) {
-            this.width = width;
-            this.alignment = Layout.Alignment.ALIGN_CENTER;
-            this.source = source;
-            this.paint = paint;
-            this.layout = new StaticLayout(source, paint, width, Layout.Alignment.ALIGN_CENTER, 1, 0, false);
-        }
-        return this.layout;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index b056e2ca3..23893c9ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.RectF;
 
 import androidx.annotation.ColorInt;
@@ -470,44 +469,6 @@ public class HabiticaIconsHelper {
         return imageOfCaret;
     }
 
-    private static Bitmap imageOfRageStrikeInactive = null;
-
-    public static Bitmap imageOfRageStrikeInactive() {
-        if (imageOfRageStrikeInactive != null)
-            return imageOfRageStrikeInactive;
-
-        imageOfRageStrikeInactive = Bitmap.createBitmap(scaleSize(63), scaleSize(82), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRageStrikeInactive);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRageStrikeInactive(canvas);
-
-        return imageOfRageStrikeInactive;
-    }
-
-    public static Bitmap imageOfRageStrikeActive(Context context, Bitmap rageStrikeNPC) {
-        Bitmap imageOfRageStrikeActive = Bitmap.createBitmap(scaleSize(63), scaleSize(82), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRageStrikeActive);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRageStrikeActive(canvas, context, rageStrikeNPC);
-
-        return imageOfRageStrikeActive;
-    }
-
-    private static Bitmap imageOfRage = null;
-
-    public static Bitmap imageOfRage() {
-        if (imageOfRage != null)
-            return imageOfRage;
-
-        int size = scaleSize(18);
-        imageOfRage = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRage);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRage(canvas);
-
-        return imageOfRage;
-    }
-
     public static Bitmap imageOfLocked(@ColorInt int lockColor) {
         return imageOfLocked(lockColor, 15, 17);
     }
@@ -670,15 +631,6 @@ public class HabiticaIconsHelper {
         return imageOfHabitControlMinus;
     }
 
-    public static Bitmap imageOfGuildCrest(boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        Bitmap imageOfGuildCrest = Bitmap.createBitmap(scaleSize(40), scaleSize(38), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfGuildCrest);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawGuildCrest(canvas, isOwner, isPublic, memberCount, memberCountLabel);
-
-        return imageOfGuildCrest;
-    }
-
     public static Bitmap imageOfGuildCrestMedium(float memberCount) {
         Bitmap imageOfGuildCrestMedium = Bitmap.createBitmap(scaleSize(30), scaleSize(34), Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfGuildCrestMedium);
@@ -688,12 +640,4 @@ public class HabiticaIconsHelper {
         return imageOfGuildCrestMedium;
     }
 
-    public static Bitmap imageOfGuildCrestSmall(float memberCount) {
-        Bitmap imageOfGuildCrestSmall = Bitmap.createBitmap(scaleSize(16), scaleSize(16), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfGuildCrestSmall);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawGuildCrestSmall(canvas, memberCount);
-
-        return imageOfGuildCrestSmall;
-    }
 }
diff --git a/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt b/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
index 35d29aff3..54442cebf 100644
--- a/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/com/habitrpg/buildlogic/plugin/ApplicationPlugin.kt
@@ -23,7 +23,7 @@ class ApplicationPlugin : Plugin<Project> {
                     signingProps.containsKey("KEY_ALIAS") && signingProps.containsKey("KEY_PASSWORD")
 
             val versionProps = try {
-                Properties().apply { load(FileInputStream(File("version.properties"))) }
+                Properties().apply { load(FileInputStream(File(projectDir.absolutePath + "/../version.properties"))) }
             } catch (t: Throwable) {
                 Properties()
             }
@@ -65,4 +65,4 @@ class ApplicationPlugin : Plugin<Project> {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index 0aa78d1a4..962ec3350 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -213,6 +213,7 @@ object DataBindingUtils {
         tempMap["back_special_heroicAureole"] = "gif"
         tempMap["Pet_HatchingPotion_Fungi"] = "gif"
         tempMap["shop_armoire"] = "gif"
+        tempMap["Pet_HatchingPotion_Cryptid"] = "gif"
         FILEFORMAT_MAP = tempMap
 
         val tempNameMap = mutableMapOf<String, String>()
diff --git a/gradle.properties b/gradle.properties
index 3525d00e6..d46ffb092 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
-android.enableJetifier=true
 android.useAndroidX=true
 android.debug.obsoleteApi=true
 org.gradle.configureondemand=true
@@ -11,4 +10,4 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.enableR8.fullMode=false
 org.gradle.caching=true
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8c433e6c..06e75028c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,14 +22,14 @@ coordinatorlayout = "1.2.0"
 coreSplashscreen = "1.1.0-rc01"
 core_ktx = "1.15.0"
 coroutines = "1.9.0"
-crashlytics = "3.0.2"
+crashlytics = "3.0.3"
 credentials = "1.3.0"
 daggerhilt = "2.55"
 desuggar = "2.1.4"
 detekt = "1.19.0"
 deviceNames = "2.1.1"
 firebase-perf = "1.4.2"
-firebase_bom = "33.8.0"
+firebase_bom = "33.9.0"
 flexbox = "3.0.0"
 fragmentKtx = "1.8.5"
 fragmentTesting = "1.8.5"
diff --git a/version.properties b/version.properties
index d5a6e3e5d..0b155895f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.7.0
-CODE=12361
\ No newline at end of file
+CODE=12381
\ No newline at end of file