diff --git a/assets/common/abilities/custom/yeti/frostbreath.ron b/assets/common/abilities/custom/yeti/frostbreath.ron
index b3f7b8a8a5..a4e8052047 100644
--- a/assets/common/abilities/custom/yeti/frostbreath.ron
+++ b/assets/common/abilities/custom/yeti/frostbreath.ron
@@ -14,6 +14,6 @@ BasicBeam(
     ))),
     energy_regen: 0,
     energy_drain: 0,
-    ori_rate: 0.1,
+    ori_rate: 0.2,
     specifier: Frost,
 )
diff --git a/assets/common/entity/wild/aggressive/archaeos.ron b/assets/common/entity/wild/aggressive/archaeos.ron
index 7ee9b6196b..a7b2128b48 100644
--- a/assets/common/entity/wild/aggressive/archaeos.ron
+++ b/assets/common/entity/wild/aggressive/archaeos.ron
@@ -3,6 +3,6 @@
     body: RandomWith("archaeos"),
     alignment: Alignment(Enemy),
     loadout: FromBody,
-    loot: LootTable("common.loot_tables.creature.theropod.horned"),
+    loot: LootTable("common.loot_tables.creature.theropod.plate"),
     meta: [],
 )
\ No newline at end of file
diff --git a/assets/common/entity/wild/aggressive/ntouka.ron b/assets/common/entity/wild/aggressive/ntouka.ron
index 13296f0b5f..29030aacf0 100644
--- a/assets/common/entity/wild/aggressive/ntouka.ron
+++ b/assets/common/entity/wild/aggressive/ntouka.ron
@@ -3,6 +3,6 @@
     body: RandomWith("ntouka"),
     alignment: Alignment(Enemy),
     loadout: FromBody,
-    loot: LootTable("common.loot_tables.creature.theropod.horned"),
+    loot: LootTable("common.loot_tables.creature.theropod.plate"),
     meta: [],
 )
\ No newline at end of file
diff --git a/assets/common/entity/wild/peaceful/forest_fox.ron b/assets/common/entity/wild/peaceful/forest_fox.ron
index cddf3b0d11..d9c18d591d 100644
--- a/assets/common/entity/wild/peaceful/forest_fox.ron
+++ b/assets/common/entity/wild/peaceful/forest_fox.ron
@@ -1,5 +1,5 @@
 (
-    name: Name("Forest Fox"),
+    name: Name("Red Fox"),
     body: Exact(QuadrupedSmall((
         species: Fox,
         body_type: Male,
diff --git a/assets/common/entity/wild/peaceful/river_salamander.ron b/assets/common/entity/wild/peaceful/river_salamander.ron
index 790b4b61a1..7be4031a7f 100644
--- a/assets/common/entity/wild/peaceful/river_salamander.ron
+++ b/assets/common/entity/wild/peaceful/river_salamander.ron
@@ -1,5 +1,5 @@
 (
-    name: Name("River Salamander"),
+    name: Name("Elbst"),
     body: Exact(QuadrupedLow((
         species: Salamander,
         body_type: Female,
diff --git a/assets/common/entity/wild/peaceful/sand_hare.ron b/assets/common/entity/wild/peaceful/sand_hare.ron
index 40bdb5252b..8d8dd30ce6 100644
--- a/assets/common/entity/wild/peaceful/sand_hare.ron
+++ b/assets/common/entity/wild/peaceful/sand_hare.ron
@@ -1,5 +1,5 @@
 (
-    name: Name("Sand Hare"),
+    name: Name("Desert Hare"),
     body: Exact(QuadrupedSmall((
         species: Hare,
         body_type: Male,
diff --git a/assets/common/entity/wild/peaceful/sand_salamander.ron b/assets/common/entity/wild/peaceful/sand_salamander.ron
index 4e8a75cb4d..f77060477c 100644
--- a/assets/common/entity/wild/peaceful/sand_salamander.ron
+++ b/assets/common/entity/wild/peaceful/sand_salamander.ron
@@ -1,5 +1,5 @@
 (
-    name: Name("Desert Salamander"),
+    name: Name("Salamander"),
     body: Exact(QuadrupedLow((
         species: Salamander,
         body_type: Male,
diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron
index 29c6ce3017..cb8457ae3f 100644
--- a/assets/common/items/armor/twigsflowers/shoulder.ron
+++ b/assets/common/items/armor/twigsflowers/shoulder.ron
@@ -7,7 +7,7 @@ ItemDef(
             protection: Some(Normal(9.0)),
         ),
     )),
-    quality: Common,
+    quality: Moderate,
     tags: [
     ],
 )
diff --git a/assets/common/loot_tables/creature/quad_medium/catoblepas.ron b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron
index c1f80bea25..b9f754f9eb 100644
--- a/assets/common/loot_tables/creature/quad_medium/catoblepas.ron
+++ b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron
@@ -1,4 +1,5 @@
 [
     (1.5, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
     (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")),
+    (1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/creature/quad_medium/ice.ron b/assets/common/loot_tables/creature/quad_medium/ice.ron
index 4ac8226c7b..8b7d65f8e0 100644
--- a/assets/common/loot_tables/creature/quad_medium/ice.ron
+++ b/assets/common/loot_tables/creature/quad_medium/ice.ron
@@ -1,4 +1,4 @@
 [
-    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
+    (1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
     (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/creature/theropod/plate.ron b/assets/common/loot_tables/creature/theropod/plate.ron
new file mode 100644
index 0000000000..f4f8133003
--- /dev/null
+++ b/assets/common/loot_tables/creature/theropod/plate.ron
@@ -0,0 +1,4 @@
+[
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.plate", 1, 3)),
+    (1.0, Item("common.items.crafting_ing.animal_misc.large_horn")),
+]
diff --git a/assets/common/loot_tables/spots/bandit.ron b/assets/common/loot_tables/spots/bandit.ron
index f3abd2a23d..b6a4e0bd77 100644
--- a/assets/common/loot_tables/spots/bandit.ron
+++ b/assets/common/loot_tables/spots/bandit.ron
@@ -2,18 +2,18 @@
     // Crafting Ingredients
     (5.0, LootTable("common.loot_tables.materials.common")),
     // Consumables
-    (0.2, Item("common.items.consumable.potion_minor")),
+    (0.5, Item("common.items.consumable.potion_minor")),
     // Ring
-    (0.02, Item("common.items.armor.misc.ring.gold")),
+    (0.2, Item("common.items.armor.misc.ring.gold")),
     // Necklace
-    (0.02, Item("common.items.armor.misc.neck.gold")),
+    (0.2, Item("common.items.armor.misc.neck.gold")),
     // Utility
-    (0.05, Item("common.items.utility.collar")),
+    (0.5, Item("common.items.utility.collar")),
     // Armor
-    (0.01, Item("common.items.armor.misc.head.bandana.thief")),
-    (0.01, Item("common.items.armor.misc.head.bandana.red")),
-    (0.01, Item("common.items.armor.misc.head.hood")),
-    (0.01, Item("common.items.armor.misc.head.hood_dark")),
+    (0.1, Item("common.items.armor.misc.head.bandana.thief")),
+    (0.1, Item("common.items.armor.misc.head.bandana.red")),
+    (0.1, Item("common.items.armor.misc.head.hood")),
+    (0.1, Item("common.items.armor.misc.head.hood_dark")),
     // Food
     (1.0, LootTable("common.loot_tables.food.wild_ingredients")),
     (0.25, LootTable("common.loot_tables.food.prepared")),
diff --git a/assets/voxygen/element/ui/map/icons/dif_5.png b/assets/voxygen/element/ui/map/icons/dif_5.png
index cd194e84f6..1156c1fe21 100644
--- a/assets/voxygen/element/ui/map/icons/dif_5.png
+++ b/assets/voxygen/element/ui/map/icons/dif_5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c11a3e00c8f1ba1481e86d7df65f9d3a5cbf2b5366dab9b623605872a9e77f9
-size 95
+oid sha256:e7f03f422c20112e7ec77838c2936914b9f976fbe35da4c33ca820cd9cfd20ac
+size 483
diff --git a/assets/voxygen/element/ui/map/icons/dif_6.png b/assets/voxygen/element/ui/map/icons/dif_6.png
index fb18d96b5f..f9f47552a5 100644
--- a/assets/voxygen/element/ui/map/icons/dif_6.png
+++ b/assets/voxygen/element/ui/map/icons/dif_6.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d26939c8d8f510dbe2935e8daac7025de2ce2ac3552cb408a59f52d95f093e19
-size 119
+oid sha256:9b0f853c2f679c87641f0ef00a938c75cee1fca08cf44d2628234e1b4a141726
+size 648
diff --git a/assets/voxygen/element/ui/map/icons/dif_map_icon.png b/assets/voxygen/element/ui/map/icons/dif_map_icon.png
new file mode 100644
index 0000000000..fb18d96b5f
--- /dev/null
+++ b/assets/voxygen/element/ui/map/icons/dif_map_icon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d26939c8d8f510dbe2935e8daac7025de2ce2ac3552cb408a59f52d95f093e19
+size 119
diff --git a/assets/world/dungeon/difficulty_distribution.ron b/assets/world/dungeon/difficulty_distribution.ron
index 1af1cd87e0..8504467319 100644
--- a/assets/world/dungeon/difficulty_distribution.ron
+++ b/assets/world/dungeon/difficulty_distribution.ron
@@ -16,10 +16,10 @@
 /// 1) Set every probability to 0.0 and left one with any other number
 /// and you will have map full of dungeons of same level
 ([
-    (0, 0.20),
-    (1, 0.15),
-    (2, 0.15),
+    (0, 0.25),
+    (1, 0.20),
+    (2, 0.20),
     (3, 0.15),
-    (4, 0.15),
-    (5, 0.20),
+    (4, 0.10),
+    (5, 0.10),
 ])
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 4795cd6ca6..f6b21b9bef 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -623,11 +623,11 @@ impl Body {
                 quadruped_medium::Species::Wolf => 45,
                 quadruped_medium::Species::Frostfang => 40,
                 quadruped_medium::Species::Mouflon => 40,
-                quadruped_medium::Species::Catoblepas => 100,
+                quadruped_medium::Species::Catoblepas => 300,
                 quadruped_medium::Species::Bonerattler => 50,
                 quadruped_medium::Species::Deer => 50,
                 quadruped_medium::Species::Hirdrasil => 70,
-                quadruped_medium::Species::Roshwalr => 80,
+                quadruped_medium::Species::Roshwalr => 280,
                 quadruped_medium::Species::Donkey => 55,
                 quadruped_medium::Species::Zebra => 55,
                 quadruped_medium::Species::Antelope => 45,
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index dc200abda5..f5bb9cf849 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -397,6 +397,7 @@ image_ids! {
         map_dif_4: "voxygen.element.ui.map.icons.dif_4",
         map_dif_5: "voxygen.element.ui.map.icons.dif_5",
         map_dif_6: "voxygen.element.ui.map.icons.dif_6",
+        map_dif_icon: "voxygen.element.ui.map.icons.dif_map_icon",
         map_dif_unknown: "voxygen.element.ui.map.icons.dif_unknown",
         mmap_site_town: "voxygen.element.ui.map.buttons.town",
         mmap_site_town_hover: "voxygen.element.ui.map.buttons.town_hover",
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 765205f3a2..15aa671381 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -1,7 +1,7 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
-    Show, QUALITY_COMMON, QUALITY_DEBUG, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE,
-    TEXT_BG, TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, UI_HIGHLIGHT_0, UI_MAIN,
+    Show, QUALITY_COMMON, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE, TEXT_BG,
+    TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, UI_HIGHLIGHT_0, UI_MAIN,
 };
 use crate::{
     game_input::GameInput,
@@ -477,7 +477,7 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.map_settings_align, ui);
         // Checkboxes
         // Show difficulties
-        Image::new(self.imgs.map_dif_6)
+        Image::new(self.imgs.map_dif_icon)
             .top_left_with_margins_on(state.ids.map_settings_align, 5.0, 5.0)
             .w_h(20.0, 20.0)
             .set(state.ids.show_difficulty_img, ui);
@@ -873,11 +873,21 @@ impl<'a> Widget for Map<'a> {
             });
             let (difficulty, desc) = match &site.kind {
                 SiteKind::Town => (None, i18n.get("hud.map.town").to_string()),
-                SiteKind::Dungeon { difficulty } => (
-                    Some(*difficulty),
-                    i18n.get("hud.map.difficulty_dungeon")
-                        .replace("{difficulty}", (difficulty + 1).to_string().as_str()),
-                ),
+                SiteKind::Dungeon { difficulty } => {
+                    if *difficulty < 5 {
+                        (
+                            Some(*difficulty),
+                            i18n.get("hud.map.difficulty_dungeon")
+                                .replace("{difficulty}", (difficulty + 1).to_string().as_str()),
+                        )
+                    } else {
+                        (
+                            Some(*difficulty),
+                            i18n.get("hud.map.difficulty_dungeon")
+                                .replace("{difficulty}", (difficulty).to_string().as_str()),
+                        )
+                    }
+                },
                 SiteKind::Castle => (None, i18n.get("hud.map.castle").to_string()),
                 SiteKind::Cave => (None, i18n.get("hud.map.cave").to_string()),
                 SiteKind::Tree => (None, i18n.get("hud.map.tree").to_string()),
@@ -917,8 +927,7 @@ impl<'a> Widget for Map<'a> {
                         Some(1) => QUALITY_COMMON,
                         Some(2) => QUALITY_MODERATE,
                         Some(3) => QUALITY_HIGH,
-                        Some(4) => QUALITY_EPIC,
-                        Some(5) => QUALITY_DEBUG,
+                        Some(4 | 5) => QUALITY_EPIC,
                         _ => TEXT_COLOR,
                     },
                     SiteKind::Cave => TEXT_COLOR,
@@ -985,8 +994,7 @@ impl<'a> Widget for Map<'a> {
                     Some(1) => QUALITY_COMMON,
                     Some(2) => QUALITY_MODERATE,
                     Some(3) => QUALITY_HIGH,
-                    Some(4) => QUALITY_EPIC,
-                    Some(5) => QUALITY_DEBUG,
+                    Some(4 | 5) => QUALITY_EPIC,
                     _ => TEXT_COLOR,
                 }));
                 match &site.kind {