diff --git a/voxygen/i18n/src/lib.rs b/voxygen/i18n/src/lib.rs
index 99a2c9d0b7..ad40e9b8fa 100644
--- a/voxygen/i18n/src/lib.rs
+++ b/voxygen/i18n/src/lib.rs
@@ -233,28 +233,6 @@ pub struct LocalizationGuard {
 }
 
 impl LocalizationGuard {
-    /// !!!DEPRECATED!!!
-    ///
-    /// Get a localized text from the given key
-    ///
-    /// First lookup is done in the active language, second in
-    /// the fallback (if present).
-    /// If the key is not present in the localization object
-    /// then the key itself is returned.
-    ///
-    /// # NOTE:
-    /// This function shouldn't be used in new code.
-    /// It is kept for compatibility with old code that uses
-    /// old style dot-separated keys and this function internally
-    /// replaces them with dashes.
-    // FIXME (i18n old style keys):
-    // this is deprecated, fix all usages of this asap
-    pub fn get(&self, key: &str) -> Cow<str> {
-        // Fluent uses `-` as informal separator, while in the past with our
-        // RON based system we used `.` for that purpose.
-        self.get_msg(&key.replace('.', "-"))
-    }
-
     /// Get a localized text from the given key
     ///
     /// First lookup is done in the active language, second in
diff --git a/voxygen/src/game_input.rs b/voxygen/src/game_input.rs
index 3d418bad52..537e954f26 100644
--- a/voxygen/src/game_input.rs
+++ b/voxygen/src/game_input.rs
@@ -19,138 +19,138 @@ use strum::{AsRefStr, EnumIter, EnumString};
     EnumString,
 )]
 pub enum GameInput {
-    #[strum(serialize = "gameinput.primary")]
+    #[strum(serialize = "gameinput-primary")]
     Primary,
-    #[strum(serialize = "gameinput.secondary")]
+    #[strum(serialize = "gameinput-secondary")]
     Secondary,
-    #[strum(serialize = "gameinput.block")]
+    #[strum(serialize = "gameinput-block")]
     Block,
-    #[strum(serialize = "gameinput.slot1")]
+    #[strum(serialize = "gameinput-slot1")]
     Slot1,
-    #[strum(serialize = "gameinput.slot2")]
+    #[strum(serialize = "gameinput-slot2")]
     Slot2,
-    #[strum(serialize = "gameinput.slot3")]
+    #[strum(serialize = "gameinput-slot3")]
     Slot3,
-    #[strum(serialize = "gameinput.slot4")]
+    #[strum(serialize = "gameinput-slot4")]
     Slot4,
-    #[strum(serialize = "gameinput.slot5")]
+    #[strum(serialize = "gameinput-slot5")]
     Slot5,
-    #[strum(serialize = "gameinput.slot6")]
+    #[strum(serialize = "gameinput-slot6")]
     Slot6,
-    #[strum(serialize = "gameinput.slot7")]
+    #[strum(serialize = "gameinput-slot7")]
     Slot7,
-    #[strum(serialize = "gameinput.slot8")]
+    #[strum(serialize = "gameinput-slot8")]
     Slot8,
-    #[strum(serialize = "gameinput.slot9")]
+    #[strum(serialize = "gameinput-slot9")]
     Slot9,
-    #[strum(serialize = "gameinput.slot10")]
+    #[strum(serialize = "gameinput-slot10")]
     Slot10,
-    #[strum(serialize = "gameinput.togglecursor")]
+    #[strum(serialize = "gameinput-togglecursor")]
     ToggleCursor,
-    #[strum(serialize = "gameinput.moveforward")]
+    #[strum(serialize = "gameinput-moveforward")]
     MoveForward,
-    #[strum(serialize = "gameinput.moveback")]
+    #[strum(serialize = "gameinput-moveback")]
     MoveBack,
-    #[strum(serialize = "gameinput.moveleft")]
+    #[strum(serialize = "gameinput-moveleft")]
     MoveLeft,
-    #[strum(serialize = "gameinput.moveright")]
+    #[strum(serialize = "gameinput-moveright")]
     MoveRight,
-    #[strum(serialize = "gameinput.jump")]
+    #[strum(serialize = "gameinput-jump")]
     Jump,
-    #[strum(serialize = "gameinput.sit")]
+    #[strum(serialize = "gameinput-sit")]
     Sit,
-    #[strum(serialize = "gameinput.dance")]
+    #[strum(serialize = "gameinput-dance")]
     Dance,
-    #[strum(serialize = "gameinput.greet")]
+    #[strum(serialize = "gameinput-greet")]
     Greet,
-    #[strum(serialize = "gameinput.glide")]
+    #[strum(serialize = "gameinput-glide")]
     Glide,
-    #[strum(serialize = "gameinput.climb")]
+    #[strum(serialize = "gameinput-climb")]
     Climb,
-    #[strum(serialize = "gameinput.climbdown")]
+    #[strum(serialize = "gameinput-climbdown")]
     ClimbDown,
-    #[strum(serialize = "gameinput.swimup")]
+    #[strum(serialize = "gameinput-swimup")]
     SwimUp,
-    #[strum(serialize = "gameinput.swimdown")]
+    #[strum(serialize = "gameinput-swimdown")]
     SwimDown,
-    #[strum(serialize = "gameinput.fly")]
+    #[strum(serialize = "gameinput-fly")]
     Fly,
-    #[strum(serialize = "gameinput.sneak")]
+    #[strum(serialize = "gameinput-sneak")]
     Sneak,
-    #[strum(serialize = "gameinput.togglelantern")]
+    #[strum(serialize = "gameinput-togglelantern")]
     ToggleLantern,
-    #[strum(serialize = "gameinput.mount")]
+    #[strum(serialize = "gameinput-mount")]
     Mount,
-    #[strum(serialize = "gameinput.chat")]
+    #[strum(serialize = "gameinput-chat")]
     Chat,
-    #[strum(serialize = "gameinput.command")]
+    #[strum(serialize = "gameinput-command")]
     Command,
-    #[strum(serialize = "gameinput.escape")]
+    #[strum(serialize = "gameinput-escape")]
     Escape,
-    #[strum(serialize = "gameinput.map")]
+    #[strum(serialize = "gameinput-map")]
     Map,
-    #[strum(serialize = "gameinput.bag")]
+    #[strum(serialize = "gameinput-bag")]
     Bag,
-    #[strum(serialize = "gameinput.trade")]
+    #[strum(serialize = "gameinput-trade")]
     Trade,
-    #[strum(serialize = "gameinput.social")]
+    #[strum(serialize = "gameinput-social")]
     Social,
-    #[strum(serialize = "gameinput.crafting")]
+    #[strum(serialize = "gameinput-crafting")]
     Crafting,
-    #[strum(serialize = "gameinput.spellbook")]
+    #[strum(serialize = "gameinput-spellbook")]
     Spellbook,
-    #[strum(serialize = "gameinput.settings")]
+    #[strum(serialize = "gameinput-settings")]
     Settings,
-    #[strum(serialize = "gameinput.toggleinterface")]
+    #[strum(serialize = "gameinput-toggleinterface")]
     ToggleInterface,
-    #[strum(serialize = "gameinput.help")]
+    #[strum(serialize = "gameinput-help")]
     Help,
-    #[strum(serialize = "gameinput.toggledebug")]
+    #[strum(serialize = "gameinput-toggledebug")]
     ToggleDebug,
     #[cfg(feature = "egui-ui")]
-    #[strum(serialize = "gameinput.toggle_egui_debug")]
+    #[strum(serialize = "gameinput-toggle_egui_debug")]
     ToggleEguiDebug,
-    #[strum(serialize = "gameinput.togglechat")]
+    #[strum(serialize = "gameinput-togglechat")]
     ToggleChat,
-    #[strum(serialize = "gameinput.fullscreen")]
+    #[strum(serialize = "gameinput-fullscreen")]
     Fullscreen,
-    #[strum(serialize = "gameinput.screenshot")]
+    #[strum(serialize = "gameinput-screenshot")]
     Screenshot,
-    #[strum(serialize = "gameinput.toggleingameui")]
+    #[strum(serialize = "gameinput-toggleingameui")]
     ToggleIngameUi,
-    #[strum(serialize = "gameinput.roll")]
+    #[strum(serialize = "gameinput-roll")]
     Roll,
-    #[strum(serialize = "gameinput.respawn")]
+    #[strum(serialize = "gameinput-respawn")]
     Respawn,
-    #[strum(serialize = "gameinput.interact")]
+    #[strum(serialize = "gameinput-interact")]
     Interact,
-    #[strum(serialize = "gameinput.togglewield")]
+    #[strum(serialize = "gameinput-togglewield")]
     ToggleWield,
-    #[strum(serialize = "gameinput.swaploadout")]
+    #[strum(serialize = "gameinput-swaploadout")]
     SwapLoadout,
-    #[strum(serialize = "gameinput.freelook")]
+    #[strum(serialize = "gameinput-freelook")]
     FreeLook,
-    #[strum(serialize = "gameinput.autowalk")]
+    #[strum(serialize = "gameinput-autowalk")]
     AutoWalk,
-    #[strum(serialize = "gameinput.cameraclamp")]
+    #[strum(serialize = "gameinput-cameraclamp")]
     CameraClamp,
-    #[strum(serialize = "gameinput.cyclecamera")]
+    #[strum(serialize = "gameinput-cyclecamera")]
     CycleCamera,
-    #[strum(serialize = "gameinput.select")]
+    #[strum(serialize = "gameinput-select")]
     Select,
-    #[strum(serialize = "gameinput.acceptgroupinvite")]
+    #[strum(serialize = "gameinput-acceptgroupinvite")]
     AcceptGroupInvite,
-    #[strum(serialize = "gameinput.declinegroupinvite")]
+    #[strum(serialize = "gameinput-declinegroupinvite")]
     DeclineGroupInvite,
-    #[strum(serialize = "gameinput.mapzoomin")]
+    #[strum(serialize = "gameinput-mapzoomin")]
     MapZoomIn,
-    #[strum(serialize = "gameinput.mapzoomout")]
+    #[strum(serialize = "gameinput-mapzoomout")]
     MapZoomOut,
-    #[strum(serialize = "gameinput.map.locationmarkerbutton")]
+    #[strum(serialize = "gameinput-map-locationmarkerbutton")]
     MapSetMarker,
-    #[strum(serialize = "gameinput.spectatespeedboost")]
+    #[strum(serialize = "gameinput-spectatespeedboost")]
     SpectateSpeedBoost,
-    #[strum(serialize = "gameinput.spectateviewpoint")]
+    #[strum(serialize = "gameinput-spectateviewpoint")]
     SpectateViewpoint,
 }
 
diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs
index 14fb7d12c0..ae4c33f0a8 100644
--- a/voxygen/src/hud/bag.rs
+++ b/voxygen/src/hud/bag.rs
@@ -822,9 +822,9 @@ impl<'a> Widget for Bag<'a> {
             .with_tooltip(
                 self.tooltip_manager,
                 &(match inventory.next_sort_order() {
-                    InventorySortOrder::Name => i18n.get("hud.bag.sort_by_name"),
-                    InventorySortOrder::Quality => i18n.get("hud.bag.sort_by_quality"),
-                    InventorySortOrder::Tag => i18n.get("hud.bag.sort_by_category"),
+                    InventorySortOrder::Name => i18n.get_msg("hud-bag-sort_by_name"),
+                    InventorySortOrder::Quality => i18n.get_msg("hudbag-sort_by_quality"),
+                    InventorySortOrder::Tag => i18n.get_msg("hud-bag-sort_by_category"),
                 }),
                 "",
                 &tooltip,
@@ -894,7 +894,7 @@ impl<'a> Widget for Bag<'a> {
                 } else {
                     let manager = &mut *self.tooltip_manager;
                     $slot_maker
-                        .with_tooltip(manager, &i18n.get($desc), "", &tooltip, color::WHITE)
+                        .with_tooltip(manager, &i18n.get_msg($desc), "", &tooltip, color::WHITE)
                         .set($slot_id, ui)
                 }
             };
@@ -974,18 +974,18 @@ impl<'a> Widget for Bag<'a> {
                     btn.down_from(state.ids.stat_icons[i.0 - 1], 7.0)
                 };
                 let tooltip_head = match i.1 {
-                    "Health" => i18n.get("hud.bag.health"),
-                    "Energy" => i18n.get("hud.bag.energy"),
-                    "Combat Rating" => i18n.get("hud.bag.combat_rating"),
-                    "Protection" => i18n.get("hud.bag.protection"),
-                    "Stun Resilience" => i18n.get("hud.bag.stun_res"),
-                    "Stealth" => i18n.get("hud.bag.stealth"),
+                    "Health" => i18n.get_msg("hud-bag-health"),
+                    "Energy" => i18n.get_msg("hud-bag-energy"),
+                    "Combat Rating" => i18n.get_msg("hud-bag-combat_rating"),
+                    "Protection" => i18n.get_msg("hud-bag-protection"),
+                    "Stun Resilience" => i18n.get_msg("hud-bag-stun_res"),
+                    "Stealth" => i18n.get_msg("hud-bag-stealth"),
                     _ => Cow::Borrowed(""),
                 };
                 let tooltip_txt = match i.1 {
-                    "Combat Rating" => i18n.get("hud.bag.combat_rating_desc"),
-                    "Protection" => i18n.get("hud.bag.protection_desc"),
-                    "Stun Resilience" => i18n.get("hud.bag.stun_res_desc"),
+                    "Combat Rating" => i18n.get_msg("hud-bag-combat_rating_desc"),
+                    "Protection" => i18n.get_msg("hud-bag-protection_desc"),
+                    "Stun Resilience" => i18n.get_msg("hud-bag-stun_res_desc"),
                     _ => Cow::Borrowed(""),
                 };
                 btn.with_tooltip(
@@ -1022,7 +1022,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.head_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.head");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-head");
 
             //  Necklace
             let item_slot = EquipSlot::Armor(ArmorSlot::Neck);
@@ -1033,7 +1033,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.neck_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.neck");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-neck");
 
             // Chest
             //Image::new(self.imgs.armor_slot) // different graphics for empty/non empty
@@ -1045,7 +1045,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.chest_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.chest");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-chest");
 
             //  Shoulders
             let item_slot = EquipSlot::Armor(ArmorSlot::Shoulders);
@@ -1056,7 +1056,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.shoulders_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.shoulders");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-shoulders");
 
             // Hands
             let item_slot = EquipSlot::Armor(ArmorSlot::Hands);
@@ -1067,7 +1067,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.hands_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.hands");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-hands");
 
             // Belt
             let item_slot = EquipSlot::Armor(ArmorSlot::Belt);
@@ -1078,7 +1078,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.belt_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.belt");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-belt");
 
             // Legs
             let item_slot = EquipSlot::Armor(ArmorSlot::Legs);
@@ -1089,7 +1089,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.legs_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.legs");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-legs");
 
             // Ring
             let item_slot = EquipSlot::Armor(ArmorSlot::Ring1);
@@ -1100,7 +1100,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.ring1_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.ring");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-ring");
 
             // Ring 2
             let item_slot = EquipSlot::Armor(ArmorSlot::Ring2);
@@ -1111,7 +1111,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.ring2_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.ring");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-ring");
 
             // Back
             let item_slot = EquipSlot::Armor(ArmorSlot::Back);
@@ -1122,7 +1122,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.back_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.back");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-back");
 
             // Foot
             let item_slot = EquipSlot::Armor(ArmorSlot::Feet);
@@ -1133,7 +1133,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.feet_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.feet");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-feet");
 
             // Lantern
             let item_slot = EquipSlot::Lantern;
@@ -1144,7 +1144,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.lantern_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.lantern");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-lantern");
 
             // Glider
             let item_slot = EquipSlot::Glider;
@@ -1155,7 +1155,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.glider_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.glider");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-glider");
 
             // Tabard
             let item_slot = EquipSlot::Armor(ArmorSlot::Tabard);
@@ -1166,7 +1166,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.tabard_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.tabard");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-tabard");
 
             // Active Mainhand/Left-Slot
             let item_slot = EquipSlot::ActiveMainhand;
@@ -1177,7 +1177,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.active_mainhand_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.mainhand");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-mainhand");
 
             // Active Offhand/Right-Slot
             let item_slot = EquipSlot::ActiveOffhand;
@@ -1188,7 +1188,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.active_offhand_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.offhand");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-offhand");
 
             // Inactive Mainhand/Left-Slot
             let item_slot = EquipSlot::InactiveMainhand;
@@ -1199,7 +1199,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.inactive_mainhand_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.inactive_mainhand");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-inactive_mainhand");
 
             // Inactive Offhand/Right-Slot
             let item_slot = EquipSlot::InactiveOffhand;
@@ -1210,7 +1210,7 @@ impl<'a> Widget for Bag<'a> {
                 .filled_slot(filled_slot);
 
             let slot_id = state.ids.inactive_offhand_slot;
-            set_tooltip!(slot, slot_id, item_slot, "hud.bag.inactive_offhand");
+            set_tooltip!(slot, slot_id, item_slot, "hud-bag-inactive_offhand");
 
             if Button::image(self.imgs.swap_equipped_weapons_btn)
                 .hover_image(self.imgs.swap_equipped_weapons_btn_hover)
@@ -1220,7 +1220,7 @@ impl<'a> Widget for Bag<'a> {
                 .align_middle_y_of(state.ids.active_mainhand_slot)
                 .with_tooltip(
                     self.tooltip_manager,
-                    &i18n.get("hud.bag.swap_equipped_weapons_title"),
+                    &i18n.get_msg("hud-bag-swap_equipped_weapons_title"),
                     &(if let Some(key) = self
                         .global_state
                         .settings
@@ -1259,7 +1259,7 @@ impl<'a> Widget for Bag<'a> {
             .filled_slot(filled_slot);
 
         let slot_id = state.ids.bag1_slot;
-        set_tooltip!(slot, slot_id, item_slot, "hud.bag.bag");
+        set_tooltip!(slot, slot_id, item_slot, "hud-bag-bag");
 
         // Bag 2
         let item_slot = EquipSlot::Armor(ArmorSlot::Bag2);
@@ -1270,7 +1270,7 @@ impl<'a> Widget for Bag<'a> {
             .filled_slot(filled_slot);
 
         let slot_id = state.ids.bag2_slot;
-        set_tooltip!(slot, slot_id, item_slot, "hud.bag.bag");
+        set_tooltip!(slot, slot_id, item_slot, "hud-bag-bag");
 
         // Bag 3
         let item_slot = EquipSlot::Armor(ArmorSlot::Bag3);
@@ -1281,7 +1281,7 @@ impl<'a> Widget for Bag<'a> {
             .filled_slot(filled_slot);
 
         let slot_id = state.ids.bag3_slot;
-        set_tooltip!(slot, slot_id, item_slot, "hud.bag.bag");
+        set_tooltip!(slot, slot_id, item_slot, "hud-bag-bag");
 
         // Bag 4
         let item_slot = EquipSlot::Armor(ArmorSlot::Bag4);
@@ -1292,7 +1292,7 @@ impl<'a> Widget for Bag<'a> {
             .filled_slot(filled_slot);
 
         let slot_id = state.ids.bag4_slot;
-        set_tooltip!(slot, slot_id, item_slot, "hud.bag.bag");
+        set_tooltip!(slot, slot_id, item_slot, "hud-bag-bag");
 
         // Close button
         if Button::image(self.imgs.close_btn)
diff --git a/voxygen/src/hud/buffs.rs b/voxygen/src/hud/buffs.rs
index 4752d57fd3..bd04ce3b47 100644
--- a/voxygen/src/hud/buffs.rs
+++ b/voxygen/src/hud/buffs.rs
@@ -230,7 +230,8 @@ impl<'a> Widget for BuffsBar<'a> {
                     let title = hud::get_buff_title(buff.kind, localized_strings);
                     let desc_txt = hud::get_buff_desc(buff.kind, buff.data, localized_strings);
                     let remaining_time = hud::get_buff_time(*buff);
-                    let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
+                    let click_to_remove =
+                        format!("<{}>", &localized_strings.get_msg("buff-remove"));
                     let desc = format!("{}\n\n{}\n\n{}", desc_txt, remaining_time, click_to_remove);
                     // Timer overlay
                     if Button::image(self.get_duration_image(duration_percentage))
@@ -388,7 +389,8 @@ impl<'a> Widget for BuffsBar<'a> {
                     let title = hud::get_buff_title(buff.kind, localized_strings);
                     let desc_txt = hud::get_buff_desc(buff.kind, buff.data, localized_strings);
                     let remaining_time = hud::get_buff_time(*buff);
-                    let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
+                    let click_to_remove =
+                        format!("<{}>", &localized_strings.get_msg("buff-remove"));
                     let desc = if buff.is_buff {
                         format!("{}\n\n{}", desc_txt, click_to_remove)
                     } else {
diff --git a/voxygen/src/hud/buttons.rs b/voxygen/src/hud/buttons.rs
index 2e14c09ba0..61ce7abc2d 100644
--- a/voxygen/src/hud/buttons.rs
+++ b/voxygen/src/hud/buttons.rs
@@ -231,7 +231,7 @@ impl<'a> Widget for Buttons<'a> {
             .press_image(self.imgs.settings_press)
             .with_tooltip(
                 self.tooltip_manager,
-                &localized_strings.get("common.settings"),
+                &localized_strings.get_msg("common-settings"),
                 "",
                 &button_tooltip,
                 TEXT_COLOR,
@@ -264,7 +264,7 @@ impl<'a> Widget for Buttons<'a> {
             .press_image(self.imgs.social_press)
             .with_tooltip(
                 self.tooltip_manager,
-                &localized_strings.get("hud.social"),
+                &localized_strings.get_msg("hud-social"),
                 "",
                 &button_tooltip,
                 TEXT_COLOR,
@@ -296,7 +296,7 @@ impl<'a> Widget for Buttons<'a> {
             .press_image(self.imgs.map_press)
             .with_tooltip(
                 self.tooltip_manager,
-                &localized_strings.get("hud.map.map_title"),
+                &localized_strings.get_msg("hud-map-map_title"),
                 "",
                 &button_tooltip,
                 TEXT_COLOR,
@@ -333,7 +333,7 @@ impl<'a> Widget for Buttons<'a> {
         .press_image(self.imgs.spellbook_press)
         .with_tooltip(
             self.tooltip_manager,
-            &localized_strings.get("hud.diary"),
+            &localized_strings.get_msg("hud-diary"),
             "",
             &button_tooltip,
             TEXT_COLOR,
@@ -366,14 +366,14 @@ impl<'a> Widget for Buttons<'a> {
                 .mid_top_with_margin_on(state.ids.spellbook_button, -12.0 + arrow_ani as f64)
                 .color(Some(QUALITY_LEGENDARY))
                 .set(state.ids.sp_arrow, ui);
-            Text::new(&localized_strings.get("hud.sp_arrow_txt"))
+            Text::new(&localized_strings.get_msg("hud-sp_arrow_txt"))
                 .mid_top_with_margin_on(state.ids.sp_arrow, -18.0)
                 .graphics_for(state.ids.spellbook_button)
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(14))
                 .color(BLACK)
                 .set(state.ids.sp_arrow_txt_bg, ui);
-            Text::new(&localized_strings.get("hud.sp_arrow_txt"))
+            Text::new(&localized_strings.get_msg("hud-sp_arrow_txt"))
                 .graphics_for(state.ids.spellbook_button)
                 .bottom_right_with_margins_on(state.ids.sp_arrow_txt_bg, 1.0, 1.0)
                 .font_id(self.fonts.cyri.conrod_id)
@@ -389,7 +389,7 @@ impl<'a> Widget for Buttons<'a> {
             .press_image(self.imgs.crafting_icon_press)
             .with_tooltip(
                 self.tooltip_manager,
-                &localized_strings.get("hud.crafting"),
+                &localized_strings.get_msg("hud-crafting"),
                 "",
                 &button_tooltip,
                 TEXT_COLOR,
diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs
index dbdffb21cb..6ec3d2c32b 100644
--- a/voxygen/src/hud/chat.rs
+++ b/voxygen/src/hud/chat.rs
@@ -552,7 +552,7 @@ impl<'a> Widget for Chat<'a> {
             .hover_image(self.imgs.selection_hover)
             .hover_image(self.imgs.selection_press)
             .image_color(shading)
-            .label(&self.localized_strings.get("hud.chat.all"))
+            .label(&self.localized_strings.get_msg("hud-chat-all"))
             .label_font_size(self.fonts.cyri.scale(14))
             .label_font_id(self.fonts.cyri.conrod_id)
             .label_color(TEXT_COLOR.alpha(alpha))
@@ -613,7 +613,7 @@ impl<'a> Widget for Chat<'a> {
                     Text::new(
                         &self
                             .localized_strings
-                            .get("hud.chat.chat_tab_hover_tooltip"),
+                            .get_msg("hud-chat-chat_tab_hover_tooltip"),
                     )
                     .mid_top_with_margin_on(state.ids.chat_tab_tooltip_bg, 3.0)
                     .font_size(self.fonts.cyri.scale(10))
diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs
index c8c91e01e7..a3a30cf274 100644
--- a/voxygen/src/hud/crafting.rs
+++ b/voxygen/src/hud/crafting.rs
@@ -213,17 +213,17 @@ pub enum CraftingTab {
 impl CraftingTab {
     fn name_key(self) -> &'static str {
         match self {
-            CraftingTab::All => "hud.crafting.tabs.all",
-            CraftingTab::Armor => "hud.crafting.tabs.armor",
-            CraftingTab::Food => "hud.crafting.tabs.food",
-            CraftingTab::Glider => "hud.crafting.tabs.glider",
-            CraftingTab::Potion => "hud.crafting.tabs.potion",
-            CraftingTab::Tool => "hud.crafting.tabs.tool",
-            CraftingTab::Utility => "hud.crafting.tabs.utility",
-            CraftingTab::Weapon => "hud.crafting.tabs.weapon",
-            CraftingTab::Bag => "hud.crafting.tabs.bag",
-            CraftingTab::ProcessedMaterial => "hud.crafting.tabs.processed_material",
-            CraftingTab::Dismantle => "hud.crafting.tabs.dismantle",
+            CraftingTab::All => "hud-crafting-tabs-all",
+            CraftingTab::Armor => "hud-crafting-tabs-armor",
+            CraftingTab::Food => "hud-crafting-tabs-food",
+            CraftingTab::Glider => "hud-crafting-tabs-glider",
+            CraftingTab::Potion => "hud-crafting-tabs-potion",
+            CraftingTab::Tool => "hud-crafting-tabs-tool",
+            CraftingTab::Utility => "hud-crafting-tabs-utility",
+            CraftingTab::Weapon => "hud-crafting-tabs-weapon",
+            CraftingTab::Bag => "hud-crafting-tabs-bag",
+            CraftingTab::ProcessedMaterial => "hud-crafting-tabs-processed_material",
+            CraftingTab::Dismantle => "hud-crafting-tabs-dismantle",
         }
     }
 
@@ -391,7 +391,7 @@ impl<'a> Widget for Crafting<'a> {
         }
 
         // Title
-        Text::new(&self.localized_strings.get("hud.crafting"))
+        Text::new(&self.localized_strings.get_msg("hud-crafting"))
             .mid_top_with_margin_on(state.ids.window_frame, 9.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(20))
@@ -467,7 +467,7 @@ impl<'a> Widget for Crafting<'a> {
                 })
                 .with_tooltip(
                     self.tooltip_manager,
-                    &self.localized_strings.get(crafting_tab.name_key()),
+                    &self.localized_strings.get_msg(crafting_tab.name_key()),
                     "",
                     &tabs_tooltip,
                     TEXT_COLOR,
@@ -961,25 +961,25 @@ impl<'a> Widget for Crafting<'a> {
                         let (tooltip_title, tooltip_desc) = match recipe_kind {
                             RecipeKind::ModularWeapon => (
                                 self.localized_strings
-                                    .get("hud.crafting.mod_weap_prim_slot_title"),
+                                    .get_msg("hud-crafting-mod_weap_prim_slot_title"),
                                 self.localized_strings
-                                    .get("hud.crafting.mod_weap_prim_slot_desc"),
+                                    .get_msg("hud-crafting-mod_weap_prim_slot_desc"),
                             ),
                             RecipeKind::Component(
                                 ToolKind::Sword | ToolKind::Axe | ToolKind::Hammer,
                             ) => (
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_metal_prim_slot_title"),
+                                    .get_msg("hud-crafting-mod_comp_metal_prim_slot_title"),
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_metal_prim_slot_desc"),
+                                    .get_msg("hud-crafting-mod_comp_metal_prim_slot_desc"),
                             ),
                             RecipeKind::Component(
                                 ToolKind::Bow | ToolKind::Staff | ToolKind::Sceptre,
                             ) => (
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_wood_prim_slot_title"),
+                                    .get_msg("hud-crafting-mod_comp_wood_prim_slot_title"),
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_wood_prim_slot_desc"),
+                                    .get_msg("hud-crafting-mod_comp_wood_prim_slot_desc"),
                             ),
                             RecipeKind::Component(_) | RecipeKind::Simple => {
                                 (Cow::Borrowed(""), Cow::Borrowed(""))
@@ -1050,15 +1050,15 @@ impl<'a> Widget for Crafting<'a> {
                         let (tooltip_title, tooltip_desc) = match recipe_kind {
                             RecipeKind::ModularWeapon => (
                                 self.localized_strings
-                                    .get("hud.crafting.mod_weap_sec_slot_title"),
+                                    .get_msg("hud-crafting-mod_weap_sec_slot_title"),
                                 self.localized_strings
-                                    .get("hud.crafting.mod_weap_sec_slot_desc"),
+                                    .get_msg("hud-crafting-mod_weap_sec_slot_desc"),
                             ),
                             RecipeKind::Component(_) => (
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_sec_slot_title"),
+                                    .get_msg("hud-crafting-mod_comp_sec_slot_title"),
                                 self.localized_strings
-                                    .get("hud.crafting.mod_comp_sec_slot_desc"),
+                                    .get_msg("hud-crafting-mod_comp_sec_slot_desc"),
                             ),
                             RecipeKind::Simple => (Cow::Borrowed(""), Cow::Borrowed("")),
                         };
@@ -1221,7 +1221,7 @@ impl<'a> Widget for Crafting<'a> {
                                 == recipe.craft_sprite,
                         )
                     } else {
-                        Text::new(&self.localized_strings.get("hud.crafting.modular_desc"))
+                        Text::new(&self.localized_strings.get_msg("hud-crafting-modular_desc"))
                             .mid_top_with_margin_on(state.ids.modular_art, -18.0)
                             .font_id(self.fonts.cyri.conrod_id)
                             .font_size(self.fonts.cyri.scale(13))
@@ -1316,7 +1316,7 @@ impl<'a> Widget for Crafting<'a> {
                             };
                             icon.with_tooltip(
                                 self.tooltip_manager,
-                                &self.localized_strings.get(crafting_tab.name_key()),
+                                &self.localized_strings.get_msg(crafting_tab.name_key()),
                                 "",
                                 &tabs_tooltip,
                                 TEXT_COLOR,
@@ -1353,7 +1353,7 @@ impl<'a> Widget for Crafting<'a> {
                         .then_some(self.imgs.button_press)
                         .unwrap_or(self.imgs.button),
                 )
-                .label(&self.localized_strings.get("hud.crafting.craft"))
+                .label(&self.localized_strings.get_msg("hud-crafting-craft"))
                 .label_y(conrod_core::position::Relative::Scalar(1.0))
                 .label_color(can_perform.then_some(TEXT_COLOR).unwrap_or(TEXT_GRAY_COLOR))
                 .label_font_size(self.fonts.cyri.scale(12))
@@ -1406,7 +1406,7 @@ impl<'a> Widget for Crafting<'a> {
                         .then_some(self.imgs.button_press)
                         .unwrap_or(self.imgs.button),
                 )
-                .label(&self.localized_strings.get("hud.crafting.craft_all"))
+                .label(&self.localized_strings.get_msg("hud-crafting-craft_all"))
                 .label_y(conrod_core::position::Relative::Scalar(1.0))
                 .label_color(
                     can_perform_all
@@ -1446,7 +1446,7 @@ impl<'a> Widget for Crafting<'a> {
                 Text::new(
                     &self
                         .localized_strings
-                        .get("hud.crafting.req_crafting_station"),
+                        .get_msg("hud-crafting-req_crafting_station"),
                 )
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(18))
@@ -1485,18 +1485,18 @@ impl<'a> Widget for Crafting<'a> {
                 .set(state.ids.req_station_img, ui);
 
                 let station_name = match recipe.craft_sprite {
-                    Some(SpriteKind::Anvil) => "hud.crafting.anvil",
-                    Some(SpriteKind::Cauldron) => "hud.crafting.cauldron",
-                    Some(SpriteKind::CookingPot) => "hud.crafting.cooking_pot",
-                    Some(SpriteKind::CraftingBench) => "hud.crafting.crafting_bench",
-                    Some(SpriteKind::Forge) => "hud.crafting.forge",
-                    Some(SpriteKind::Loom) => "hud.crafting.loom",
-                    Some(SpriteKind::SpinningWheel) => "hud.crafting.spinning_wheel",
-                    Some(SpriteKind::TanningRack) => "hud.crafting.tanning_rack",
-                    Some(SpriteKind::DismantlingBench) => "hud.crafting.salvaging_station",
+                    Some(SpriteKind::Anvil) => "hud-crafting-anvil",
+                    Some(SpriteKind::Cauldron) => "hud-crafting-cauldron",
+                    Some(SpriteKind::CookingPot) => "hud.crafting-cooking_pot",
+                    Some(SpriteKind::CraftingBench) => "hud-crafting-crafting_bench",
+                    Some(SpriteKind::Forge) => "hud-crafting-forge",
+                    Some(SpriteKind::Loom) => "hud-crafting-loom",
+                    Some(SpriteKind::SpinningWheel) => "hud-crafting-spinning_wheel",
+                    Some(SpriteKind::TanningRack) => "hud-crafting-tanning_rack",
+                    Some(SpriteKind::DismantlingBench) => "hud-crafting-salvaging_station",
                     _ => "",
                 };
-                Text::new(&self.localized_strings.get(station_name))
+                Text::new(&self.localized_strings.get_msg(station_name))
                     .right_from(state.ids.req_station_img, 10.0)
                     .font_id(self.fonts.cyri.conrod_id)
                     .font_size(self.fonts.cyri.scale(14))
@@ -1558,7 +1558,7 @@ impl<'a> Widget for Crafting<'a> {
 
             let num_ingredients = ingredients.len();
             if num_ingredients > 0 {
-                Text::new(&self.localized_strings.get("hud.crafting.ingredients"))
+                Text::new(&self.localized_strings.get_msg("hud-crafting-ingredients"))
                     .font_id(self.fonts.cyri.conrod_id)
                     .font_size(self.fonts.cyri.scale(18))
                     .color(TEXT_COLOR)
@@ -1754,7 +1754,7 @@ impl<'a> Widget for Crafting<'a> {
                         } else {
                             state.ids.ingredient_frame[i - 1]
                         };
-                        Text::new(&self.localized_strings.get("hud.crafting.tool_cata"))
+                        Text::new(&self.localized_strings.get_msg("hud-crafting-tool_cata"))
                             .down_from(ref_widget, 20.0)
                             .font_id(self.fonts.cyri.conrod_id)
                             .font_size(self.fonts.cyri.scale(14))
@@ -1804,13 +1804,17 @@ impl<'a> Widget for Crafting<'a> {
             }
         } else if *sel_crafting_tab == CraftingTab::Dismantle {
             // Title
-            Text::new(&self.localized_strings.get("hud.crafting.dismantle_title"))
-                .mid_top_with_margin_on(state.ids.align_ing, 0.0)
-                .font_id(self.fonts.cyri.conrod_id)
-                .font_size(self.fonts.cyri.scale(24))
-                .color(TEXT_COLOR)
-                .parent(state.ids.window)
-                .set(state.ids.dismantle_title, ui);
+            Text::new(
+                &self
+                    .localized_strings
+                    .get_msg("hud-crafting-dismantle_title"),
+            )
+            .mid_top_with_margin_on(state.ids.align_ing, 0.0)
+            .font_id(self.fonts.cyri.conrod_id)
+            .font_size(self.fonts.cyri.scale(24))
+            .color(TEXT_COLOR)
+            .parent(state.ids.window)
+            .set(state.ids.dismantle_title, ui);
 
             // Bench Icon
             let size = 140.0;
@@ -1830,7 +1834,7 @@ impl<'a> Widget for Crafting<'a> {
             Text::new(
                 &self
                     .localized_strings
-                    .get("hud.crafting.dismantle_explanation"),
+                    .get_msg("hud-crafting-dismantle_explanation"),
             )
             .mid_bottom_with_margin_on(state.ids.dismantle_img, -60.0)
             .font_id(self.fonts.cyri.conrod_id)
@@ -1871,7 +1875,7 @@ impl<'a> Widget for Crafting<'a> {
                 events.push(Event::SearchRecipe(Some(string)));
             }
         } else {
-            Text::new(&self.localized_strings.get("hud.crafting.recipes"))
+            Text::new(&self.localized_strings.get_msg("hud-crafting-recipes"))
                 .mid_top_with_margin_on(state.ids.align_rec, -22.0)
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(14))
diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs
index ebe074b1a4..f761bcb2e6 100644
--- a/voxygen/src/hud/diary.rs
+++ b/voxygen/src/hud/diary.rs
@@ -436,7 +436,7 @@ impl<'a> Widget for Diary<'a> {
         }
 
         // Title
-        Text::new(&self.localized_strings.get("hud.diary"))
+        Text::new(&self.localized_strings.get_msg("hud-diary"))
             .mid_top_with_margin_on(state.ids.frame, 3.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(29))
@@ -632,7 +632,7 @@ impl<'a> Widget for Diary<'a> {
                     };
 
                     let tooltip_txt = if locked {
-                        self.localized_strings.get("hud.skill.not_unlocked")
+                        self.localized_strings.get_msg("hud-skill-not_unlocked")
                     } else {
                         Cow::Borrowed("")
                     };
@@ -1334,7 +1334,7 @@ impl<'a> Diary<'a> {
         ui: &mut UiCell,
         mut events: Vec<Event>,
     ) -> Vec<Event> {
-        let tree_title = &self.localized_strings.get("common.weapons.general");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-general");
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
             .font_id(self.fonts.cyri.conrod_id)
@@ -1440,8 +1440,8 @@ impl<'a> Diary<'a> {
             },
             // Bottom left skills
             SkillIcon::Descriptive {
-                title: "hud.skill.dodge_title",
-                desc: "hud.skill.dodge",
+                title: "hud-skill-dodge_title",
+                desc: "hud-skill-dodge",
                 image: self.imgs.skill_dodge_skill,
                 position: MidTopWithMarginOn(state.ids.skills_bot_l[0], 3.0),
                 id: state.ids.skill_general_roll_0,
@@ -1466,8 +1466,8 @@ impl<'a> Diary<'a> {
             },
             // Bottom right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.climbing_title",
-                desc: "hud.skill.climbing",
+                title: "hud-skill-climbing_title",
+                desc: "hud-skill-climbing",
                 image: self.imgs.skill_climbing_skill,
                 position: MidTopWithMarginOn(state.ids.skills_bot_r[0], 3.0),
                 id: state.ids.skill_general_climb_0,
@@ -1485,8 +1485,8 @@ impl<'a> Diary<'a> {
                 id: state.ids.skill_general_climb_2,
             },
             SkillIcon::Descriptive {
-                title: "hud.skill.swim_title",
-                desc: "hud.skill.swim",
+                title: "hud-skill-swim_title",
+                desc: "hud-skill-swim",
                 image: self.imgs.skill_swim_skill,
                 position: MidTopWithMarginOn(state.ids.skills_bot_r[3], 3.0),
                 id: state.ids.skill_general_swim_0,
@@ -1511,7 +1511,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.sword");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-sword");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -1556,8 +1556,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.sw_trip_str_title",
-                desc: "hud.skill.sw_trip_str",
+                title: "hud-skill-sw_trip_str_title",
+                desc: "hud-skill-sw_trip_str",
                 image: self.imgs.twohsword_m1,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_sword_combo_0,
@@ -1588,8 +1588,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.sw_dash_title",
-                desc: "hud.skill.sw_dash",
+                title: "hud-skill-sw_dash_title",
+                desc: "hud-skill-sw_dash",
                 image: self.imgs.twohsword_m2,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_sword_dash_0,
@@ -1682,7 +1682,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.hammer");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-hammer");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -1727,8 +1727,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.hmr_single_strike_title",
-                desc: "hud.skill.hmr_single_strike",
+                title: "hud-skill-hmr_single_strike_title",
+                desc: "hud-skill-hmr_single_strike",
                 image: self.imgs.twohhammer_m1,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_hammer_combo_0,
@@ -1759,8 +1759,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.hmr_charged_melee_title",
-                desc: "hud.skill.hmr_charged_melee",
+                title: "hud-skill-hmr_charged_melee_title",
+                desc: "hud-skill-hmr_charged_melee",
                 image: self.imgs.hammergolf,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_hammer_charged_0,
@@ -1840,7 +1840,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.axe");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-axe");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -1885,8 +1885,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.axe_double_strike_title",
-                desc: "hud.skill.axe_double_strike",
+                title: "hud-skill-axe_double_strike_title",
+                desc: "hud-skill-axe_double_strike",
                 image: self.imgs.twohaxe_m1,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_axe_combo_0,
@@ -1917,8 +1917,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.axe_spin_title",
-                desc: "hud.skill.axe_spin",
+                title: "hud-skill-axe_spin_title",
+                desc: "hud-skill-axe_spin",
                 image: self.imgs.axespin,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_axe_spin_0,
@@ -1998,7 +1998,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.sceptre");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-sceptre");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -2043,8 +2043,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.sc_lifesteal_title",
-                desc: "hud.skill.sc_lifesteal",
+                title: "hud-skill-sc_lifesteal_title",
+                desc: "hud-skill-sc_lifesteal",
                 image: self.imgs.skill_sceptre_lifesteal,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_sceptre_lifesteal_0,
@@ -2075,8 +2075,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.sc_heal_title",
-                desc: "hud.skill.sc_heal",
+                title: "hud-skill-sc_heal_title",
+                desc: "hud-skill-sc_heal",
                 image: self.imgs.skill_sceptre_heal,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_sceptre_heal_0,
@@ -2150,7 +2150,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.bow");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-bow");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -2194,8 +2194,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.bow_charged_title",
-                desc: "hud.skill.bow_charged",
+                title: "hud-skill-bow_charged_title",
+                desc: "hud-skill-bow_charged",
                 image: self.imgs.bow_m1,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_bow_charged_0,
@@ -2232,8 +2232,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.bow_repeater_title",
-                desc: "hud.skill.bow_repeater",
+                title: "hud-skill-bow_repeater_title",
+                desc: "hud-skill-bow_repeater",
                 image: self.imgs.bow_m2,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_bow_repeater_0,
@@ -2308,7 +2308,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.weapons.staff");
+        let tree_title = &self.localized_strings.get_msg("common-weapons-staff");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -2354,8 +2354,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.st_fireball_title",
-                desc: "hud.skill.st_fireball",
+                title: "hud-skill-st_fireball_title",
+                desc: "hud-skill-st_fireball",
                 image: self.imgs.fireball,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_staff_basic_0,
@@ -2380,8 +2380,8 @@ impl<'a> Diary<'a> {
             },
             // Top right skills
             SkillIcon::Descriptive {
-                title: "hud.skill.st_flamethrower_title",
-                desc: "hud.skill.st_flamethrower",
+                title: "hud-skill-st_flamethrower_title",
+                desc: "hud-skill-st_flamethrower",
                 image: self.imgs.flamethrower,
                 position: MidTopWithMarginOn(state.ids.skills_top_r[0], 3.0),
                 id: state.ids.skill_staff_beam_0,
@@ -2455,7 +2455,7 @@ impl<'a> Diary<'a> {
         mut events: Vec<Event>,
     ) -> Vec<Event> {
         // Title text
-        let tree_title = &self.localized_strings.get("common.tool.mining");
+        let tree_title = &self.localized_strings.get_msg("common-tool-mining");
 
         Text::new(tree_title)
             .mid_top_with_margin_on(state.ids.content_align, 2.0)
@@ -2501,8 +2501,8 @@ impl<'a> Diary<'a> {
             //        3 0 4
             //        8 2 7
             SkillIcon::Descriptive {
-                title: "hud.skill.pick_strike_title",
-                desc: "hud.skill.pick_strike",
+                title: "hud-skill-pick_strike_title",
+                desc: "hud-skill-pick_strike",
                 image: self.imgs.pickaxe,
                 position: MidTopWithMarginOn(state.ids.skills_top_l[0], 3.0),
                 id: state.ids.skill_pick_m1,
@@ -2553,8 +2553,8 @@ impl<'a> Diary<'a> {
                         .position(*position)
                         .with_tooltip(
                             self.tooltip_manager,
-                            &self.localized_strings.get(title),
-                            &self.localized_strings.get(desc),
+                            &self.localized_strings.get_msg(title),
+                            &self.localized_strings.get_msg(desc),
                             diary_tooltip,
                             TEXT_COLOR,
                         )
@@ -2793,13 +2793,13 @@ fn skill_strings(skill: Skill) -> SkillStrings<'static> {
 fn general_skill_strings(skill: GeneralSkill) -> SkillStrings<'static> {
     match skill {
         GeneralSkill::HealthIncrease => SkillStrings::with_const(
-            "hud.skill.inc_health_title",
-            "hud.skill.inc_health",
+            "hud-skill-inc_health_title",
+            "hud-skill-inc_health",
             u32::from(HP_PER_LEVEL),
         ),
         GeneralSkill::EnergyIncrease => SkillStrings::with_const(
-            "hud.skill.inc_energy_title",
-            "hud.skill.inc_energy",
+            "hud-skill-inc_energy_title",
+            "hud-skill-inc_energy",
             u32::from(ENERGY_PER_LEVEL),
         ),
     }
@@ -2808,22 +2808,22 @@ fn general_skill_strings(skill: GeneralSkill) -> SkillStrings<'static> {
 fn unlock_skill_strings(group: SkillGroupKind) -> SkillStrings<'static> {
     match group {
         SkillGroupKind::Weapon(ToolKind::Sword) => {
-            SkillStrings::plain("hud.skill.unlck_sword_title", "hud.skill.unlck_sword")
+            SkillStrings::plain("hud-skill-unlck_sword_title", "hud-skill-unlck_sword")
         },
         SkillGroupKind::Weapon(ToolKind::Axe) => {
-            SkillStrings::plain("hud.skill.unlck_axe_title", "hud.skill.unlck_axe")
+            SkillStrings::plain("hud-skill-unlck_axe_title", "hud-skill-unlck_axe")
         },
         SkillGroupKind::Weapon(ToolKind::Hammer) => {
-            SkillStrings::plain("hud.skill.unlck_hammer_title", "hud.skill.unlck_hammer")
+            SkillStrings::plain("hud-skill-unlck_hammer_title", "hud-skill-unlck_hammer")
         },
         SkillGroupKind::Weapon(ToolKind::Bow) => {
-            SkillStrings::plain("hud.skill.unlck_bow_title", "hud.skill.unlck_bow")
+            SkillStrings::plain("hud-skill-unlck_bow_title", "hud-skill-unlck_bow")
         },
         SkillGroupKind::Weapon(ToolKind::Staff) => {
-            SkillStrings::plain("hud.skill.unlck_staff_title", "hud.skill.unlck_staff")
+            SkillStrings::plain("hud-skill-unlck_staff_title", "hud-skill-unlck_staff")
         },
         SkillGroupKind::Weapon(ToolKind::Sceptre) => {
-            SkillStrings::plain("hud.skill.unlck_sceptre_title", "hud.skill.unlck_sceptre")
+            SkillStrings::plain("hud-skill-unlck_sceptre_title", "hud-skill-unlck_sceptre")
         },
         SkillGroupKind::General
         | SkillGroupKind::Weapon(
@@ -2848,77 +2848,77 @@ fn sword_skill_strings(skill: SwordSkill) -> SkillStrings<'static> {
     match skill {
         // triple strike
         SwordSkill::TsCombo => SkillStrings::plain(
-            "hud.skill.sw_trip_str_combo_title",
-            "hud.skill.sw_trip_str_combo",
+            "hud-skill-sw_trip_str_combo_title",
+            "hud-skill-sw_trip_str_combo",
         ),
         SwordSkill::TsDamage => SkillStrings::plain(
-            "hud.skill.sw_trip_str_dmg_title",
-            "hud.skill.sw_trip_str_dmg",
+            "hud-skill-sw_trip_str_dmg_title",
+            "hud-skill-sw_trip_str_dmg",
         ),
         SwordSkill::TsSpeed => {
-            SkillStrings::plain("hud.skill.sw_trip_str_sp_title", "hud.skill.sw_trip_str_sp")
+            SkillStrings::plain("hud-skill-sw_trip_str_sp_title", "hud-skill-sw_trip_str_sp")
         },
         SwordSkill::TsRegen => SkillStrings::plain(
-            "hud.skill.sw_trip_str_reg_title",
-            "hud.skill.sw_trip_str_reg",
+            "hud-skill-sw_trip_str_reg_title",
+            "hud-skill-sw_trip_str_reg",
         ),
         // dash
         SwordSkill::DDamage => SkillStrings::with_mult(
-            "hud.skill.sw_dash_dmg_title",
-            "hud.skill.sw_dash_dmg",
+            "hud-skill-sw_dash_dmg_title",
+            "hud-skill-sw_dash_dmg",
             modifiers.dash.base_damage,
         ),
         SwordSkill::DDrain => SkillStrings::with_mult(
-            "hud.skill.sw_dash_drain_title",
-            "hud.skill.sw_dash_drain",
+            "hud-skill-sw_dash_drain_title",
+            "hud-skill-sw_dash_drain",
             modifiers.dash.energy_drain,
         ),
         SwordSkill::DCost => SkillStrings::with_mult(
-            "hud.skill.sw_dash_cost_title",
-            "hud.skill.sw_dash_cost",
+            "hud-skill-sw_dash_cost_title",
+            "hud-skill-sw_dash_cost",
             modifiers.dash.energy_cost,
         ),
         SwordSkill::DSpeed => SkillStrings::with_mult(
-            "hud.skill.sw_dash_speed_title",
-            "hud.skill.sw_dash_speed",
+            "hud-skill-sw_dash_speed_title",
+            "hud-skill-sw_dash_speed",
             modifiers.dash.forward_speed,
         ),
         SwordSkill::DChargeThrough => SkillStrings::plain(
-            "hud.skill.sw_dash_charge_through_title",
-            "hud.skill.sw_dash_charge_through",
+            "hud-skill-sw_dash_charge_through_title",
+            "hud-skill-sw_dash_charge_through",
         ),
         SwordSkill::DScaling => SkillStrings::with_mult(
-            "hud.skill.sw_dash_scale_title",
-            "hud.skill.sw_dash_scale",
+            "hud-skill-sw_dash_scale_title",
+            "hud-skill-sw_dash_scale",
             modifiers.dash.scaled_damage,
         ),
         // spin
         SwordSkill::UnlockSpin => {
-            SkillStrings::plain("hud.skill.sw_spin_title", "hud.skill.sw_spin")
+            SkillStrings::plain("hud-skill-sw_spin_title", "hud-skill-sw_spin")
         },
         SwordSkill::SDamage => SkillStrings::with_mult(
-            "hud.skill.sw_spin_dmg_title",
-            "hud.skill.sw_spin_dmg",
+            "hud-skill-sw_spin_dmg_title",
+            "hud-skill-sw_spin_dmg",
             modifiers.spin.base_damage,
         ),
         SwordSkill::SSpeed => SkillStrings::with_mult(
-            "hud.skill.sw_spin_spd_title",
-            "hud.skill.sw_spin_spd",
+            "hud-skill-sw_spin_spd_title",
+            "hud-skill-sw_spin_spd",
             modifiers.spin.swing_duration,
         ),
         SwordSkill::SCost => SkillStrings::with_mult(
-            "hud.skill.sw_spin_cost_title",
-            "hud.skill.sw_spin_cost",
+            "hud-skill-sw_spin_cost_title",
+            "hud-skill-sw_spin_cost",
             modifiers.spin.energy_cost,
         ),
         SwordSkill::SSpins => SkillStrings::with_const(
-            "hud.skill.sw_spin_spins_title",
-            "hud.skill.sw_spin_spins",
+            "hud-skill-sw_spin_spins_title",
+            "hud-skill-sw_spin_spins",
             modifiers.spin.num,
         ),
         // independent skills
         SwordSkill::InterruptingAttacks => {
-            SkillStrings::plain("hud.skill.sw_interrupt_title", "hud.skill.sw_interrupt")
+            SkillStrings::plain("hud-skill-sw_interrupt_title", "hud-skill-sw_interrupt")
         },
     }
 }
@@ -2928,68 +2928,68 @@ fn axe_skill_strings(skill: AxeSkill) -> SkillStrings<'static> {
     match skill {
         // Double strike upgrades
         AxeSkill::DsCombo => SkillStrings::plain(
-            "hud.skill.axe_double_strike_combo_title",
-            "hud.skill.axe_double_strike_combo",
+            "hud-skill-axe_double_strike_combo_title",
+            "hud-skill-axe_double_strike_combo",
         ),
         AxeSkill::DsDamage => SkillStrings::plain(
-            "hud.skill.axe_double_strike_damage_title",
-            "hud.skill.axe_double_strike_damage",
+            "hud-skill-axe_double_strike_damage_title",
+            "hud-skill-axe_double_strike_damage",
         ),
         AxeSkill::DsSpeed => SkillStrings::plain(
-            "hud.skill.axe_double_strike_speed_title",
-            "hud.skill.axe_double_strike_speed",
+            "hud-skill-axe_double_strike_speed_title",
+            "hud-skill-axe_double_strike_speed",
         ),
         AxeSkill::DsRegen => SkillStrings::plain(
-            "hud.skill.axe_double_strike_regen_title",
-            "hud.skill.axe_double_strike_regen",
+            "hud-skill-axe_double_strike_regen_title",
+            "hud-skill-axe_double_strike_regen",
         ),
         // Spin upgrades
         AxeSkill::SInfinite => SkillStrings::plain(
-            "hud.skill.axe_infinite_axe_spin_title",
-            "hud.skill.axe_infinite_axe_spin",
+            "hud-skill-axe_infinite_axe_spin_title",
+            "hud-skill-axe_infinite_axe_spin",
         ),
         AxeSkill::SHelicopter => SkillStrings::plain(
-            "hud.skill.axe_spin_helicopter_title",
-            "hud.skill.axe_spin_helicopter",
+            "hud-skill-axe_spin_helicopter_title",
+            "hud-skill-axe_spin_helicopter",
         ),
         AxeSkill::SDamage => SkillStrings::with_mult(
-            "hud.skill.axe_spin_damage_title",
-            "hud.skill.axe_spin_damage",
+            "hud-skill-axe_spin_damage_title",
+            "hud-skill-axe_spin_damage",
             modifiers.spin.base_damage,
         ),
         AxeSkill::SSpeed => SkillStrings::with_mult(
-            "hud.skill.axe_spin_speed_title",
-            "hud.skill.axe_spin_speed",
+            "hud-skill-axe_spin_speed_title",
+            "hud-skill-axe_spin_speed",
             modifiers.spin.swing_duration,
         ),
         AxeSkill::SCost => SkillStrings::with_mult(
-            "hud.skill.axe_spin_cost_title",
-            "hud.skill.axe_spin_cost",
+            "hud-skill-axe_spin_cost_title",
+            "hud-skill-axe_spin_cost",
             modifiers.spin.energy_cost,
         ),
         // Leap upgrades
         AxeSkill::UnlockLeap => SkillStrings::plain(
-            "hud.skill.axe_unlock_leap_title",
-            "hud.skill.axe_unlock_leap",
+            "hud-skill-axe_unlock_leap_title",
+            "hud-skill-axe_unlock_leap",
         ),
         AxeSkill::LDamage => SkillStrings::with_mult(
-            "hud.skill.axe_leap_damage_title",
-            "hud.skill.axe_leap_damage",
+            "hud-skill-axe_leap_damage_title",
+            "hud-skill-axe_leap_damage",
             modifiers.leap.base_damage,
         ),
         AxeSkill::LKnockback => SkillStrings::with_mult(
-            "hud.skill.axe_leap_knockback_title",
-            "hud.skill.axe_leap_knockback",
+            "hud-skill-axe_leap_knockback_title",
+            "hud-skill-axe_leap_knockback",
             modifiers.leap.knockback,
         ),
         AxeSkill::LCost => SkillStrings::with_mult(
-            "hud.skill.axe_leap_cost_title",
-            "hud.skill.axe_leap_cost",
+            "hud-skill-axe_leap_cost_title",
+            "hud-skill-axe_leap_cost",
             modifiers.leap.energy_cost,
         ),
         AxeSkill::LDistance => SkillStrings::with_mult(
-            "hud.skill.axe_leap_distance_title",
-            "hud.skill.axe_leap_distance",
+            "hud-skill-axe_leap_distance_title",
+            "hud-skill-axe_leap_distance",
             modifiers.leap.leap_strength,
         ),
     }
@@ -3000,71 +3000,71 @@ fn hammer_skill_strings(skill: HammerSkill) -> SkillStrings<'static> {
     // Single strike upgrades
     match skill {
         HammerSkill::SsKnockback => SkillStrings::with_mult(
-            "hud.skill.hmr_single_strike_knockback_title",
-            "hud.skill.hmr_single_strike_knockback",
+            "hud-skill-hmr_single_strike_knockback_title",
+            "hud-skill-hmr_single_strike_knockback",
             modifiers.single_strike.knockback,
         ),
         HammerSkill::SsDamage => SkillStrings::plain(
-            "hud.skill.hmr_single_strike_damage_title",
-            "hud.skill.hmr_single_strike_damage",
+            "hud-skill-hmr_single_strike_damage_title",
+            "hud-skill-hmr_single_strike_damage",
         ),
         HammerSkill::SsSpeed => SkillStrings::plain(
-            "hud.skill.hmr_single_strike_speed_title",
-            "hud.skill.hmr_single_strike_speed",
+            "hud-skill-hmr_single_strike_speed_title",
+            "hud-skill-hmr_single_strike_speed",
         ),
         HammerSkill::SsRegen => SkillStrings::plain(
-            "hud.skill.hmr_single_strike_regen_title",
-            "hud.skill.hmr_single_strike_regen",
+            "hud-skill-hmr_single_strike_regen_title",
+            "hud-skill-hmr_single_strike_regen",
         ),
         // Charged melee upgrades
         HammerSkill::CDamage => SkillStrings::with_mult(
-            "hud.skill.hmr_charged_melee_damage_title",
-            "hud.skill.hmr_charged_melee_damage",
+            "hud-skill-hmr_charged_melee_damage_title",
+            "hud-skill-hmr_charged_melee_damage",
             modifiers.charged.scaled_damage,
         ),
         HammerSkill::CKnockback => SkillStrings::with_mult(
-            "hud.skill.hmr_charged_melee_knockback_title",
-            "hud.skill.hmr_charged_melee_knockback",
+            "hud-kill-hmr_charged_melee_knockback_title",
+            "hud-skill-hmr_charged_melee_knockback",
             modifiers.charged.scaled_knockback,
         ),
         HammerSkill::CDrain => SkillStrings::with_mult(
-            "hud.skill.hmr_charged_melee_nrg_drain_title",
-            "hud.skill.hmr_charged_melee_nrg_drain",
+            "hud-skill-hmr_charged_melee_nrg_drain_title",
+            "hud-skill-hmr_charged_melee_nrg_drain",
             modifiers.charged.energy_drain,
         ),
         HammerSkill::CSpeed => SkillStrings::with_mult(
-            "hud.skill.hmr_charged_rate_title",
-            "hud.skill.hmr_charged_rate",
+            "hud-skill-hmr_charged_rate_title",
+            "hud-skill-hmr_charged_rate",
             modifiers.charged.charge_rate,
         ),
         // Leap upgrades
         HammerSkill::UnlockLeap => SkillStrings::plain(
-            "hud.skill.hmr_unlock_leap_title",
-            "hud.skill.hmr_unlock_leap",
+            "hud-skill-hmr_unlock_leap_title",
+            "hud-skill-hmr_unlock_leap",
         ),
         HammerSkill::LDamage => SkillStrings::with_mult(
-            "hud.skill.hmr_leap_damage_title",
-            "hud.skill.hmr_leap_damage",
+            "hud-skill-hmr_leap_damage_title",
+            "hud-skill-hmr_leap_damage",
             modifiers.leap.base_damage,
         ),
         HammerSkill::LCost => SkillStrings::with_mult(
-            "hud.skill.hmr_leap_cost_title",
-            "hud.skill.hmr_leap_cost",
+            "hud-skill-hmr_leap_cost_title",
+            "hud-skill-hmr_leap_cost",
             modifiers.leap.energy_cost,
         ),
         HammerSkill::LDistance => SkillStrings::with_mult(
-            "hud.skill.hmr_leap_distance_title",
-            "hud.skill.hmr_leap_distance",
+            "hud-skill-hmr_leap_distance_title",
+            "hud-skill-hmr_leap_distance",
             modifiers.leap.leap_strength,
         ),
         HammerSkill::LKnockback => SkillStrings::with_mult(
-            "hud.skill.hmr_leap_knockback_title",
-            "hud.skill.hmr_leap_knockback",
+            "hud-skill-hmr_leap_knockback_title",
+            "hud-skill-hmr_leap_knockback",
             modifiers.leap.knockback,
         ),
         HammerSkill::LRange => SkillStrings::with_const_float(
-            "hud.skill.hmr_leap_radius_title",
-            "hud.skill.hmr_leap_radius",
+            "hud-skill-hmr_leap_radius_title",
+            "hud-skill-hmr_leap_radius",
             modifiers.leap.range,
         ),
     }
@@ -3075,75 +3075,75 @@ fn bow_skill_strings(skill: BowSkill) -> SkillStrings<'static> {
     match skill {
         // Passives
         BowSkill::ProjSpeed => SkillStrings::with_mult(
-            "hud.skill.bow_projectile_speed_title",
-            "hud.skill.bow_projectile_speed",
+            "hud-skill-bow_projectile_speed_title",
+            "hud-skill-bow_projectile_speed",
             modifiers.universal.projectile_speed,
         ),
         // Charged upgrades
         BowSkill::CDamage => SkillStrings::with_mult(
-            "hud.skill.bow_charged_damage_title",
-            "hud.skill.bow_charged_damage",
+            "hud-skill-bow_charged_damage_title",
+            "hud-skill-bow_charged_damage",
             modifiers.charged.damage_scaling,
         ),
         BowSkill::CRegen => SkillStrings::with_mult(
-            "hud.skill.bow_charged_energy_regen_title",
-            "hud.skill.bow_charged_energy_regen",
+            "hud-skill-bow_charged_energy_regen_title",
+            "hud-skill-bow_charged_energy_regen",
             modifiers.charged.regen_scaling,
         ),
         BowSkill::CKnockback => SkillStrings::with_mult(
-            "hud.skill.bow_charged_knockback_title",
-            "hud.skill.bow_charged_knockback",
+            "hud-skill-bow_charged_knockback_title",
+            "hud-skill-bow_charged_knockback",
             modifiers.charged.knockback_scaling,
         ),
         BowSkill::CSpeed => SkillStrings::with_mult(
-            "hud.skill.bow_charged_speed_title",
-            "hud.skill.bow_charged_speed",
+            "hud-skill-bow_charged_speed_title",
+            "hud-skill-bow_charged_speed",
             modifiers.charged.charge_rate,
         ),
         BowSkill::CMove => SkillStrings::with_mult(
-            "hud.skill.bow_charged_move_title",
-            "hud.skill.bow_charged_move",
+            "hud-skill-bow_charged_move_title",
+            "hud-skill-bow_charged_move",
             modifiers.charged.move_speed,
         ),
         // Repeater upgrades
         BowSkill::RDamage => SkillStrings::with_mult(
-            "hud.skill.bow_repeater_damage_title",
-            "hud.skill.bow_repeater_damage",
+            "hud-skill-bow_repeater_damage_title",
+            "hud-skill-bow_repeater_damage",
             modifiers.repeater.power,
         ),
         BowSkill::RCost => SkillStrings::with_mult(
-            "hud.skill.bow_repeater_cost_title",
-            "hud.skill.bow_repeater_cost",
+            "hud-skill-bow_repeater_cost_title",
+            "hud-skill-bow_repeater_cost",
             modifiers.repeater.energy_cost,
         ),
         BowSkill::RSpeed => SkillStrings::with_mult(
-            "hud.skill.bow_repeater_speed_title",
-            "hud.skill.bow_repeater_speed",
+            "hud-skill-bow_repeater_speed_title",
+            "hud-skill-bow_repeater_speed",
             modifiers.repeater.max_speed,
         ),
         // Shotgun upgrades
         BowSkill::UnlockShotgun => SkillStrings::plain(
-            "hud.skill.bow_shotgun_unlock_title",
-            "hud.skill.bow_shotgun_unlock",
+            "hud-skill-bow_shotgun_unlock_title",
+            "hud-skill-bow_shotgun_unlock",
         ),
         BowSkill::SDamage => SkillStrings::with_mult(
-            "hud.skill.bow_shotgun_damage_title",
-            "hud.skill.bow_shotgun_damage",
+            "hud-skill-bow_shotgun_damage_title",
+            "hud-skill-bow_shotgun_damage",
             modifiers.shotgun.power,
         ),
         BowSkill::SCost => SkillStrings::with_mult(
-            "hud.skill.bow_shotgun_cost_title",
-            "hud.skill.bow_shotgun_cost",
+            "hud-skill-bow_shotgun_cost_title",
+            "hud-skill-bow_shotgun_cost",
             modifiers.shotgun.energy_cost,
         ),
         BowSkill::SArrows => SkillStrings::with_const(
-            "hud.skill.bow_shotgun_arrow_count_title",
-            "hud.skill.bow_shotgun_arrow_count",
+            "hud-skill-bow_shotgun_arrow_count_title",
+            "hud-skill-bow_shotgun_arrow_count",
             modifiers.shotgun.num_projectiles,
         ),
         BowSkill::SSpread => SkillStrings::with_mult(
-            "hud.skill.bow_shotgun_spread_title",
-            "hud.skill.bow_shotgun_spread",
+            "hud-skill-bow_shotgun_spread_title",
+            "hud-skill-bow_shotgun_spread",
             modifiers.shotgun.spread,
         ),
     }
@@ -3154,64 +3154,64 @@ fn staff_skill_strings(skill: StaffSkill) -> SkillStrings<'static> {
     match skill {
         // Basic ranged upgrades
         StaffSkill::BDamage => SkillStrings::with_mult(
-            "hud.skill.st_damage_title",
-            "hud.skill.st_damage",
+            "hud-skill-st_damage_title",
+            "hud-skill-st_damage",
             modifiers.fireball.power,
         ),
         StaffSkill::BRegen => SkillStrings::with_mult(
-            "hud.skill.st_energy_regen_title",
-            "hud.skill.st_energy_regen",
+            "hud-skill-st_energy_regen_title",
+            "hud-skill-st_energy_regen",
             modifiers.fireball.regen,
         ),
         StaffSkill::BRadius => SkillStrings::with_mult(
-            "hud.skill.st_explosion_radius_title",
-            "hud.skill.st_explosion_radius",
+            "hud-skill-st_explosion_radius_title",
+            "hud-skill-st_explosion_radius",
             modifiers.fireball.range,
         ),
         // Flamethrower upgrades
         StaffSkill::FDamage => SkillStrings::with_mult(
-            "hud.skill.st_flamethrower_damage_title",
-            "hud.skill.st_flamethrower_damage",
+            "hud-skill-st_flamethrower_damage_title",
+            "hud-skill-st_flamethrower_damage",
             modifiers.flamethrower.damage,
         ),
         StaffSkill::FRange => SkillStrings::with_mult(
-            "hud.skill.st_flamethrower_range_title",
-            "hud.skill.st_flamethrower_range",
+            "hud-skill-st_flamethrower_range_title",
+            "hud-skill-st_flamethrower_range",
             modifiers.flamethrower.range,
         ),
         StaffSkill::FDrain => SkillStrings::with_mult(
-            "hud.skill.st_energy_drain_title",
-            "hud.skill.st_energy_drain",
+            "hud-skill-st_energy_drain_title",
+            "hud-skill-st_energy_drain",
             modifiers.flamethrower.energy_drain,
         ),
         StaffSkill::FVelocity => SkillStrings::with_mult(
-            "hud.skill.st_flame_velocity_title",
-            "hud.skill.st_flame_velocity",
+            "hud-skill-st_flame_velocity_title",
+            "hud-skill-st_flame_velocity",
             modifiers.flamethrower.velocity,
         ),
         // Shockwave upgrades
         StaffSkill::UnlockShockwave => SkillStrings::plain(
-            "hud.skill.st_shockwave_unlock_title",
-            "hud.skill.st_shockwave_unlock",
+            "hud-skill-st_shockwave_unlock_title",
+            "hud-skill-st_shockwave_unlock",
         ),
         StaffSkill::SDamage => SkillStrings::with_mult(
-            "hud.skill.st_shockwave_damage_title",
-            "hud.skill.st_shockwave_damage",
+            "hud-skill-st_shockwave_damage_title",
+            "hud-skill-st_shockwave_damage",
             modifiers.shockwave.damage,
         ),
         StaffSkill::SKnockback => SkillStrings::with_mult(
-            "hud.skill.st_shockwave_knockback_title",
-            "hud.skill.st_shockwave_knockback",
+            "hud-skill-st_shockwave_knockback_title",
+            "hud-skill-st_shockwave_knockback",
             modifiers.shockwave.knockback,
         ),
         StaffSkill::SRange => SkillStrings::with_mult(
-            "hud.skill.st_shockwave_range_title",
-            "hud.skill.st_shockwave_range",
+            "hud-skill-st_shockwave_range_title",
+            "hud-skill-st_shockwave_range",
             modifiers.shockwave.duration,
         ),
         StaffSkill::SCost => SkillStrings::with_mult(
-            "hud.skill.st_shockwave_cost_title",
-            "hud.skill.st_shockwave_cost",
+            "hud-skill-st_shockwave_cost_title",
+            "hud-skill-st_shockwave_cost",
             modifiers.shockwave.energy_cost,
         ),
     }
@@ -3222,69 +3222,69 @@ fn sceptre_skill_strings(skill: SceptreSkill) -> SkillStrings<'static> {
     match skill {
         // Lifesteal beam upgrades
         SceptreSkill::LDamage => SkillStrings::with_mult(
-            "hud.skill.sc_lifesteal_damage_title",
-            "hud.skill.sc_lifesteal_damage",
+            "hud-skill-sc_lifesteal_damage_title",
+            "hud-skill-sc_lifesteal_damage",
             modifiers.beam.damage,
         ),
         SceptreSkill::LRange => SkillStrings::with_mult(
-            "hud.skill.sc_lifesteal_range_title",
-            "hud.skill.sc_lifesteal_range",
+            "hud-skill-sc_lifesteal_range_title",
+            "hud-skill-sc_lifesteal_range",
             modifiers.beam.range,
         ),
         SceptreSkill::LLifesteal => SkillStrings::with_mult(
-            "hud.skill.sc_lifesteal_lifesteal_title",
-            "hud.skill.sc_lifesteal_lifesteal",
+            "hud-skill-sc_lifesteal_lifesteal_title",
+            "hud-skill-sc_lifesteal_lifesteal",
             modifiers.beam.lifesteal,
         ),
         SceptreSkill::LRegen => SkillStrings::with_mult(
-            "hud.skill.sc_lifesteal_regen_title",
-            "hud.skill.sc_lifesteal_regen",
+            "hud-skill-sc_lifesteal_regen_title",
+            "hud-skill-sc_lifesteal_regen",
             modifiers.beam.energy_regen,
         ),
         // Healing aura upgrades
         SceptreSkill::HHeal => SkillStrings::with_mult(
-            "hud.skill.sc_heal_heal_title",
-            "hud.skill.sc_heal_heal",
+            "hud-skill-sc_heal_heal_title",
+            "hud-skill-sc_heal_heal",
             modifiers.healing_aura.strength,
         ),
         SceptreSkill::HRange => SkillStrings::with_mult(
-            "hud.skill.sc_heal_range_title",
-            "hud.skill.sc_heal_range",
+            "hud-skill-sc_heal_range_title",
+            "hud-skill-sc_heal_range",
             modifiers.healing_aura.range,
         ),
         SceptreSkill::HDuration => SkillStrings::with_mult(
-            "hud.skill.sc_heal_duration_title",
-            "hud.skill.sc_heal_duration",
+            "hud-skill-sc_heal_duration_title",
+            "hud-skill-sc_heal_duration",
             modifiers.healing_aura.duration,
         ),
         SceptreSkill::HCost => SkillStrings::with_mult(
-            "hud.skill.sc_heal_cost_title",
-            "hud.skill.sc_heal_cost",
+            "hud-skill-sc_heal_cost_title",
+            "hud-skill-sc_heal_cost",
             modifiers.healing_aura.energy_cost,
         ),
         // Warding aura upgrades
         SceptreSkill::UnlockAura => SkillStrings::plain(
-            "hud.skill.sc_wardaura_unlock_title",
-            "hud.skill.sc_wardaura_unlock",
+            "hud-skill-sc_wardaura_unlock_title",
+            "hud-skill-sc_wardaura_unlock",
         ),
         SceptreSkill::AStrength => SkillStrings::with_mult(
-            "hud.skill.sc_wardaura_strength_title",
-            "hud.skill.sc_wardaura_strength",
+            "hud-skill-sc_wardaura_strength_title",
+            "hud-skill-sc_wardaura_strength",
             modifiers.warding_aura.strength,
         ),
         SceptreSkill::ADuration => SkillStrings::with_mult(
-            "hud.skill.sc_wardaura_duration_title",
-            "hud.skill.sc_wardaura_duration",
+            "hud-skill-sc_wardaura_duration_title",
+            "hud-kill-sc_wardaura_duration",
             modifiers.warding_aura.duration,
         ),
         SceptreSkill::ARange => SkillStrings::with_mult(
-            "hud.skill.sc_wardaura_range_title",
-            "hud.skill.sc_wardaura_range",
+            "hud-skill-sc_wardaura_range_title",
+            "hud-skill-sc_wardaura_range",
             modifiers.warding_aura.range,
         ),
         SceptreSkill::ACost => SkillStrings::with_mult(
-            "hud.skill.sc_wardaura_cost_title",
-            "hud.skill.sc_wardaura_cost",
+            "hud-skill-sc_wardaura_cost_title",
+            "hud-skill-sc_wardaura_cost",
             modifiers.warding_aura.energy_cost,
         ),
     }
@@ -3294,18 +3294,18 @@ fn roll_skill_strings(skill: RollSkill) -> SkillStrings<'static> {
     let modifiers = SKILL_MODIFIERS.general_tree.roll;
     match skill {
         RollSkill::Cost => SkillStrings::with_mult(
-            "hud.skill.roll_energy_title",
-            "hud.skill.roll_energy",
+            "hud-skill-roll_energy_title",
+            "hud-skill-roll_energy",
             modifiers.energy_cost,
         ),
         RollSkill::Strength => SkillStrings::with_mult(
-            "hud.skill.roll_speed_title",
-            "hud.skill.roll_speed",
+            "hud-skill-roll_speed_title",
+            "hud-skill-roll_speed",
             modifiers.strength,
         ),
         RollSkill::Duration => SkillStrings::with_mult(
-            "hud.skill.roll_dur_title",
-            "hud.skill.roll_dur",
+            "hud-skill-roll_dur_title",
+            "hud-skill-roll_dur",
             modifiers.duration,
         ),
     }
@@ -3315,13 +3315,13 @@ fn climb_skill_strings(skill: ClimbSkill) -> SkillStrings<'static> {
     let modifiers = SKILL_MODIFIERS.general_tree.climb;
     match skill {
         ClimbSkill::Cost => SkillStrings::with_mult(
-            "hud.skill.climbing_cost_title",
-            "hud.skill.climbing_cost",
+            "hud-skill-climbing_cost_title",
+            "hud-skill-climbing_cost",
             modifiers.energy_cost,
         ),
         ClimbSkill::Speed => SkillStrings::with_mult(
-            "hud.skill.climbing_speed_title",
-            "hud.skill.climbing_speed",
+            "hud-skill-climbing_speed_title",
+            "hud-skill-climbing_speed",
             modifiers.speed,
         ),
     }
@@ -3331,8 +3331,8 @@ fn swim_skill_strings(skill: SwimSkill) -> SkillStrings<'static> {
     let modifiers = SKILL_MODIFIERS.general_tree.swim;
     match skill {
         SwimSkill::Speed => SkillStrings::with_mult(
-            "hud.skill.swim_speed_title",
-            "hud.skill.swim_speed",
+            "hud-skill-swim_speed_title",
+            "hud-skill-swim_speed",
             modifiers.speed,
         ),
     }
@@ -3342,18 +3342,18 @@ fn mining_skill_strings(skill: MiningSkill) -> SkillStrings<'static> {
     let modifiers = SKILL_MODIFIERS.mining_tree;
     match skill {
         MiningSkill::Speed => SkillStrings::with_mult(
-            "hud.skill.pick_strike_speed_title",
-            "hud.skill.pick_strike_speed",
+            "hud-skill-pick_strike_speed_title",
+            "hud-skill-pick_strike_speed",
             modifiers.speed,
         ),
         MiningSkill::OreGain => SkillStrings::with_const(
-            "hud.skill.pick_strike_oregain_title",
-            "hud.skill.pick_strike_oregain",
+            "hud-skill-pick_strike_oregain_title",
+            "hud-skill-pick_strike_oregain",
             (modifiers.ore_gain * 100.0).round() as u32,
         ),
         MiningSkill::GemGain => SkillStrings::with_const(
-            "hud.skill.pick_strike_gemgain_title",
-            "hud.skill.pick_strike_gemgain",
+            "hud-skill-pick_strike_gemgain_title",
+            "hud-skill-pick_strike_gemgain",
             (modifiers.gem_gain * 100.0).round() as u32,
         ),
     }
@@ -3419,12 +3419,12 @@ impl<'a> SkillStrings<'a> {
     ) -> (Cow<'loc, str>, Cow<'loc, str>) {
         match self {
             Self::Plain { title, desc } => {
-                let title = i18n.get(title);
+                let title = i18n.get_msg(title);
 
                 let args = i18n::fluent_args! {
                     "SP" => sp(i18n, skill_set, skill),
                 };
-                let desc = i18n.get_msg_ctx(&desc.replace('.', "-"), &args);
+                let desc = i18n.get_msg_ctx(desc, &args);
 
                 (title, desc)
             },
@@ -3433,12 +3433,12 @@ impl<'a> SkillStrings<'a> {
                 desc,
                 constant,
             } => {
-                let title = i18n.get(title);
+                let title = i18n.get_msg(title);
                 let args = i18n::fluent_args! {
                     "boost" => constant,
                     "SP" => sp(i18n, skill_set, skill),
                 };
-                let desc = i18n.get_msg_ctx(&desc.replace('.', "-"), &args);
+                let desc = i18n.get_msg_ctx(desc, &args);
 
                 (title, desc)
             },
@@ -3447,12 +3447,12 @@ impl<'a> SkillStrings<'a> {
                 desc,
                 constant,
             } => {
-                let title = i18n.get(title);
+                let title = i18n.get_msg(title);
                 let args = i18n::fluent_args! {
                     "boost" => constant,
                     "SP" => sp(i18n, skill_set, skill),
                 };
-                let desc = i18n.get_msg_ctx(&desc.replace('.', "-"), &args);
+                let desc = i18n.get_msg_ctx(desc, &args);
 
                 (title, desc)
             },
@@ -3463,13 +3463,13 @@ impl<'a> SkillStrings<'a> {
             } => {
                 let percentage = hud::multiplier_to_percentage(*multiplier).abs();
 
-                let title = i18n.get(title);
+                let title = i18n.get_msg(title);
 
                 let args = i18n::fluent_args! {
                     "boost" => format!("{percentage:.0}"),
                     "SP" => sp(i18n, skill_set, skill),
                 };
-                let desc = i18n.get_msg_ctx(&desc.replace('.', "-"), &args);
+                let desc = i18n.get_msg_ctx(desc, &args);
 
                 (title, desc)
             },
diff --git a/voxygen/src/hud/esc_menu.rs b/voxygen/src/hud/esc_menu.rs
index a72b432c83..cbb7cfca03 100644
--- a/voxygen/src/hud/esc_menu.rs
+++ b/voxygen/src/hud/esc_menu.rs
@@ -87,7 +87,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("common.resume"))
+            .label(&self.localized_strings.get_msg("common-resume"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
@@ -104,7 +104,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("common.settings"))
+            .label(&self.localized_strings.get_msg("common-settings"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
@@ -120,7 +120,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("common.controls"))
+            .label(&self.localized_strings.get_msg("common-controls"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
@@ -136,7 +136,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("common.characters"))
+            .label(&self.localized_strings.get_msg("common-characters"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
@@ -152,7 +152,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("esc_menu.logout"))
+            .label(&self.localized_strings.get_msg("esc_menu-logout"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
@@ -168,7 +168,7 @@ impl<'a> Widget for EscMenu<'a> {
             .w_h(210.0, 50.0)
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
-            .label(&self.localized_strings.get("esc_menu.quit_game"))
+            .label(&self.localized_strings.get_msg("esc_menu-quit_game"))
             .label_y(conrod_core::position::Relative::Scalar(3.0))
             .label_color(TEXT_COLOR)
             .label_font_size(self.fonts.cyri.scale(20))
diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs
index 51371d6327..b5e041b8b5 100644
--- a/voxygen/src/hud/group.rs
+++ b/voxygen/src/hud/group.rs
@@ -428,7 +428,7 @@ impl<'a> Widget for Group<'a> {
                     }
                     if health.is_dead {
                         // Death Text
-                        Text::new(&self.localized_strings.get("hud.group.dead"))
+                        Text::new(&self.localized_strings.get_msg("hud-group-dead"))
                             .mid_top_with_margin_on(state.ids.member_panels_bg[i], 1.0)
                             .font_size(20)
                             .font_id(self.fonts.cyri.conrod_id)
@@ -611,7 +611,7 @@ impl<'a> Widget for Group<'a> {
                             .color(Some(UI_HIGHLIGHT_0))
                             .set(state.ids.member_panels_frame[i], ui);
                         // Panel Text
-                        Text::new(&self.localized_strings.get("hud.group.out_of_range"))
+                        Text::new(&self.localized_strings.get_msg("hud-group-out_of_range"))
                             .mid_top_with_margin_on(state.ids.member_panels_bg[i], 3.0)
                             .font_size(16)
                             .font_id(self.fonts.cyri.conrod_id)
@@ -630,7 +630,7 @@ impl<'a> Widget for Group<'a> {
                     .press_image(self.imgs.button)
                     .label_color(TEXT_COLOR_GREY)
                     .image_color(TEXT_COLOR_GREY)
-                    .label(&self.localized_strings.get("hud.group.add_friend"))
+                    .label(&self.localized_strings.get_msg("hud-group-add_friend"))
                     .label_font_id(self.fonts.cyri.conrod_id)
                     .label_font_size(self.fonts.cyri.scale(10))
                     .set(state.ids.btn_friend, ui)
@@ -641,7 +641,7 @@ impl<'a> Widget for Group<'a> {
                     .bottom_right_with_margins_on(state.ids.bg, 5.0, 5.0)
                     .hover_image(self.imgs.button_hover)
                     .press_image(self.imgs.button_press)
-                    .label(&self.localized_strings.get("hud.group.leave"))
+                    .label(&self.localized_strings.get_msg("hud-group-leave"))
                     .label_color(TEXT_COLOR)
                     .label_font_id(self.fonts.cyri.conrod_id)
                     .label_font_size(self.fonts.cyri.scale(10))
@@ -659,7 +659,7 @@ impl<'a> Widget for Group<'a> {
                         .mid_bottom_with_margin_on(state.ids.btn_friend, -27.0)
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
-                        .label(&self.localized_strings.get("hud.group.assign_leader"))
+                        .label(&self.localized_strings.get_msg("hud-group-assign_leader"))
                         .label_color(if state.selected_member.is_some() {
                             TEXT_COLOR
                         } else {
@@ -682,7 +682,7 @@ impl<'a> Widget for Group<'a> {
                         .mid_bottom_with_margin_on(state.ids.btn_leader, -27.0)
                         .hover_image(self.imgs.button)
                         .press_image(self.imgs.button)
-                        .label(&self.localized_strings.get("hud.group.link_group"))
+                        .label(&self.localized_strings.get_msg("hud-group-link_group"))
                         .hover_image(self.imgs.button)
                         .press_image(self.imgs.button)
                         .label_color(TEXT_COLOR_GREY)
@@ -698,7 +698,7 @@ impl<'a> Widget for Group<'a> {
                         .down_from(state.ids.btn_link, 5.0)
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
-                        .label(&self.localized_strings.get("hud.group.kick"))
+                        .label(&self.localized_strings.get_msg("hud-group-kick"))
                         .label_color(if state.selected_member.is_some() {
                             TEXT_COLOR
                         } else {
@@ -826,7 +826,7 @@ impl<'a> Widget for Group<'a> {
                 .label(&format!(
                     "[{}] {}",
                     &accept_key,
-                    self.localized_strings.get("common.accept")
+                    self.localized_strings.get_msg("common-accept")
                 ))
                 .label_color(TEXT_COLOR)
                 .label_font_id(self.fonts.cyri.conrod_id)
@@ -851,7 +851,7 @@ impl<'a> Widget for Group<'a> {
                 .label(&format!(
                     "[{}] {}",
                     &decline_key,
-                    self.localized_strings.get("common.decline")
+                    self.localized_strings.get_msg("common-decline")
                 ))
                 .label_color(TEXT_COLOR)
                 .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 6a292718dc..85f7c6cff2 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -278,7 +278,7 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.icon, ui);
 
         // Map Title
-        Text::new(&i18n.get("hud.map.map_title"))
+        Text::new(&i18n.get_msg("hud-map-map_title"))
             .mid_top_with_margin_on(state.ids.frame, 3.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(29))
@@ -286,7 +286,7 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.map_title, ui);
 
         // Questlog Title
-        Text::new(&i18n.get("hud.map.qlog_title"))
+        Text::new(&i18n.get_msg("hud-map-qlog_title"))
             .mid_top_with_margin_on(state.ids.qlog_align, 6.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(21))
@@ -506,7 +506,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowDifficulty(!show_difficulty)));
         }
-        Text::new(&i18n.get("hud.map.difficulty"))
+        Text::new(&i18n.get_msg("hud-map-difficulty"))
             .right_from(state.ids.show_difficulty_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -540,7 +540,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowTowns(!show_towns)));
         }
-        Text::new(&i18n.get("hud.map.towns"))
+        Text::new(&i18n.get_msg("hud-map-towns"))
             .right_from(state.ids.show_towns_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -574,7 +574,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowCastles(!show_castles)));
         }
-        Text::new(&i18n.get("hud.map.castles"))
+        Text::new(&i18n.get_msg("hud-map-castles"))
             .right_from(state.ids.show_castles_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -608,7 +608,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowDungeons(!show_dungeons)));
         }
-        Text::new(&i18n.get("hud.map.dungeons"))
+        Text::new(&i18n.get_msg("hud-map-dungeons"))
             .right_from(state.ids.show_dungeons_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -642,7 +642,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowCaves(!show_caves)));
         }
-        Text::new(&i18n.get("hud.map.caves"))
+        Text::new(&i18n.get_msg("hud-map-caves"))
             .right_from(state.ids.show_caves_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -676,7 +676,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowTrees(!show_trees)));
         }
-        Text::new(&i18n.get("hud.map.trees"))
+        Text::new(&i18n.get_msg("hud-map-trees"))
             .right_from(state.ids.show_trees_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -710,7 +710,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowBiomes(!show_biomes)));
         }
-        Text::new(&i18n.get("hud.map.biomes"))
+        Text::new(&i18n.get_msg("hud-map-biomes"))
             .right_from(state.ids.show_biomes_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -744,7 +744,7 @@ impl<'a> Widget for Map<'a> {
         {
             events.push(Event::SettingsChange(MapShowPeaks(!show_peaks)));
         }
-        Text::new(&i18n.get("hud.map.peaks"))
+        Text::new(&i18n.get_msg("hud-map-peaks"))
             .right_from(state.ids.show_peaks_box, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -781,7 +781,7 @@ impl<'a> Widget for Map<'a> {
             {
                 events.push(Event::SettingsChange(MapShowVoxelMap(!show_voxel_map)));
             }
-            Text::new(&i18n.get("hud.map.voxel_map"))
+            Text::new(&i18n.get_msg("hud-map-voxel_map"))
                 .right_from(state.ids.show_voxel_map_box, 10.0)
                 .font_size(self.fonts.cyri.scale(14))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -872,15 +872,15 @@ impl<'a> Widget for Map<'a> {
                     .as_deref()
                     .map(Cow::Borrowed)
                     .unwrap_or_else(|| match &site.kind {
-                        SiteKind::Town => i18n.get("hud.map.town"),
-                        SiteKind::Dungeon { .. } => i18n.get("hud.map.dungeon"),
-                        SiteKind::Castle => i18n.get("hud.map.castle"),
-                        SiteKind::Cave => i18n.get("hud.map.cave"),
-                        SiteKind::Tree => i18n.get("hud.map.tree"),
-                        SiteKind::Gnarling => i18n.get("hud.map.gnarling"),
+                        SiteKind::Town => i18n.get_msg("hud-map-town"),
+                        SiteKind::Dungeon { .. } => i18n.get_msg("hud-map-dungeon"),
+                        SiteKind::Castle => i18n.get_msg("hud-map-castle"),
+                        SiteKind::Cave => i18n.get_msg("hud-map-cave"),
+                        SiteKind::Tree => i18n.get_msg("hud-map-tree"),
+                        SiteKind::Gnarling => i18n.get_msg("hud-map-gnarling"),
                     });
             let (difficulty, desc) = match &site.kind {
-                SiteKind::Town => (None, i18n.get("hud.map.town")),
+                SiteKind::Town => (None, i18n.get_msg("hud-map-town")),
                 SiteKind::Dungeon { difficulty } => {
                     if *difficulty < 5 {
                         (
@@ -898,10 +898,10 @@ impl<'a> Widget for Map<'a> {
                         )
                     }
                 },
-                SiteKind::Castle => (None, i18n.get("hud.map.castle")),
-                SiteKind::Cave => (None, i18n.get("hud.map.cave")),
-                SiteKind::Tree => (None, i18n.get("hud.map.tree")),
-                SiteKind::Gnarling => (Some(0), i18n.get("hud.map.gnarling")),
+                SiteKind::Castle => (None, i18n.get_msg("hud-map-castle")),
+                SiteKind::Cave => (None, i18n.get_msg("hud-map-cave")),
+                SiteKind::Tree => (None, i18n.get_msg("hud-map-tree")),
+                SiteKind::Gnarling => (Some(0), i18n.get_msg("hud-map-gnarling")),
             };
             let desc = desc.into_owned() + &get_site_economy(site_rich);
             let site_btn = Button::image(match &site.kind {
@@ -1274,7 +1274,7 @@ impl<'a> Widget for Map<'a> {
                     .floating(true)
                     .with_tooltip(
                         self.tooltip_manager,
-                        &i18n.get("hud.map.marked_location"),
+                        &i18n.get_msg("hud-map-marked_location"),
                         &format!(
                             "X: {}, Y: {}\n\n{}",
                             lm.x as i32,
@@ -1316,12 +1316,12 @@ impl<'a> Widget for Map<'a> {
                 .floating(true)
                 .with_tooltip(
                     self.tooltip_manager,
-                    &i18n.get("hud.map.marked_location"),
+                    &i18n.get_msg("hud-map-marked_location"),
                     &format!(
                         "X: {}, Y: {}\n\n{}",
                         lm.x as i32,
                         lm.y as i32,
-                        i18n.get("hud.map.marked_location_remove")
+                        i18n.get_msg("hud-map-marked_location_remove")
                     ),
                     &site_tooltip,
                     TEXT_VELORITE,
@@ -1389,7 +1389,7 @@ impl<'a> Widget for Map<'a> {
             } else {
                 self.imgs.button
             })
-            .label(&i18n.get("hud.map.recenter"))
+            .label(&i18n.get_msg("hud-map-recenter"))
             .label_y(position::Relative::Scalar(1.0))
             .label_color(if recenter {
                 TEXT_COLOR
@@ -1414,7 +1414,7 @@ impl<'a> Widget for Map<'a> {
             .w_h(icon_size.x, icon_size.y)
             .color(Some(UI_HIGHLIGHT_0))
             .set(state.ids.drag_ico, ui);
-        Text::new(&i18n.get("hud.map.drag"))
+        Text::new(&i18n.get_msg("hud-map-drag"))
             .right_from(state.ids.drag_ico, 5.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1426,7 +1426,7 @@ impl<'a> Widget for Map<'a> {
             .w_h(icon_size.x, icon_size.y)
             .color(Some(UI_HIGHLIGHT_0))
             .set(state.ids.zoom_ico, ui);
-        Text::new(&i18n.get("hud.map.zoom"))
+        Text::new(&i18n.get_msg("hud-map-zoom"))
             .right_from(state.ids.zoom_ico, 5.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1442,7 +1442,7 @@ impl<'a> Widget for Map<'a> {
             .color(TEXT_COLOR)
             .set(state.ids.waypoint_binding_txt, ui);
 
-        Text::new(&i18n.get("hud.map.mid_click"))
+        Text::new(&i18n.get_msg("hud-map-mid_click"))
             .right_from(state.ids.waypoint_binding_txt, 5.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1458,7 +1458,7 @@ impl<'a> Widget for Map<'a> {
             .bottom_right_with_margins_on(state.ids.map_layers[0], -36.0, 0.0)
             .with_tooltip(
                 self.tooltip_manager,
-                &i18n.get("hud.map.change_map_mode"),
+                &i18n.get_msg("hud-map-change_map_mode"),
                 "",
                 &site_tooltip,
                 TEXT_COLOR,
@@ -1482,8 +1482,8 @@ impl<'a> Widget for Map<'a> {
             .left_from(state.ids.map_mode_btn, 5.0)
             .with_tooltip(
                 self.tooltip_manager,
-                &i18n.get("hud.map.toggle_minimap_voxel"),
-                &i18n.get("hud.map.zoom_minimap_explanation"),
+                &i18n.get_msg("hud-map-toggle_minimap_voxel"),
+                &i18n.get_msg("hud-map-zoom_minimap_explanation"),
                 &site_tooltip,
                 TEXT_COLOR,
             )
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index 3c7f322347..322a8fc95e 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -1640,13 +1640,13 @@ impl Hud {
                         .mid_top_with_margin_on(self.ids.player_rank_up, fontsize.1)
                         .set(self.ids.player_rank_up_txt_number, ui_widgets);
                     // Static "New Rank!" text
-                    Text::new(&i18n.get("hud.rank_up"))
+                    Text::new(&i18n.get_msg("hud-rank_up"))
                         .font_size(40)
                         .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(0.0, 0.0, 0.0, fade))
                         .mid_bottom_with_margin_on(self.ids.player_rank_up, 20.0)
                         .set(self.ids.player_rank_up_txt_0_bg, ui_widgets);
-                    Text::new(&i18n.get("hud.rank_up"))
+                    Text::new(&i18n.get_msg("hud-rank_up"))
                         .font_size(40)
                         .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(1.0, 1.0, 1.0, fade))
@@ -1654,14 +1654,14 @@ impl Hud {
                         .set(self.ids.player_rank_up_txt_0, ui_widgets);
                     // Variable skilltree text
                     let skill = match display.skill_tree {
-                        General => i18n.get("common.weapons.general"),
-                        Weapon(ToolKind::Hammer) => i18n.get("common.weapons.hammer"),
-                        Weapon(ToolKind::Axe) => i18n.get("common.weapons.axe"),
-                        Weapon(ToolKind::Sword) => i18n.get("common.weapons.sword"),
-                        Weapon(ToolKind::Sceptre) => i18n.get("common.weapons.sceptre"),
-                        Weapon(ToolKind::Bow) => i18n.get("common.weapons.bow"),
-                        Weapon(ToolKind::Staff) => i18n.get("common.weapons.staff"),
-                        Weapon(ToolKind::Pick) => i18n.get("common.tool.mining"),
+                        General => i18n.get_msg("common-weapons-general"),
+                        Weapon(ToolKind::Hammer) => i18n.get_msg("common-weapons-hammer"),
+                        Weapon(ToolKind::Axe) => i18n.get_msg("common-weapons-axe"),
+                        Weapon(ToolKind::Sword) => i18n.get_msg("common-weapons-sword"),
+                        Weapon(ToolKind::Sceptre) => i18n.get_msg("common-weapons-sceptre"),
+                        Weapon(ToolKind::Bow) => i18n.get_msg("common-weapons-bow"),
+                        Weapon(ToolKind::Staff) => i18n.get_msg("common-weapons-staff"),
+                        Weapon(ToolKind::Pick) => i18n.get_msg("common-tool-mining"),
                         _ => Cow::Borrowed("Unknown"),
                     };
                     Text::new(&skill)
@@ -1720,7 +1720,7 @@ impl Hud {
                         1.0
                     };
 
-                    Text::new(&i18n.get("hud.sct.block"))
+                    Text::new(&i18n.get_msg("hud-sct-block"))
                         .font_size(font_size)
                         .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(0.0, 0.0, 0.0, fade))
@@ -1729,7 +1729,7 @@ impl Hud {
                             ui_widgets.win_h * (-0.3) + y - 3.0,
                         )
                         .set(player_sct_bg_id, ui_widgets);
-                    Text::new(&i18n.get("hud.sct.block"))
+                    Text::new(&i18n.get_msg("hud-sct-block"))
                         .font_size(font_size)
                         .font_id(self.fonts.cyri.conrod_id)
                         .color(Color::Rgba(0.69, 0.82, 0.88, fade))
@@ -1823,7 +1823,7 @@ impl Hud {
                         pickup_failed_pulse: self.failed_entity_pickups.get(&entity).cloned(),
                     },
                     &self.fonts,
-                    vec![(GameInput::Interact, i18n.get("hud.pick_up").to_string())],
+                    vec![(GameInput::Interact, i18n.get_msg("hud-pick_up").to_string())],
                 )
                 .set(overitem_id, ui_widgets);
             }
@@ -1858,7 +1858,7 @@ impl Hud {
                         overitem_properties,
                         self.pulse,
                         &global_state.window.key_layout,
-                        vec![(GameInput::Interact, i18n.get("hud.open").to_string())],
+                        vec![(GameInput::Interact, i18n.get_msg("hud-open").to_string())],
                     )
                     .x_y(0.0, 100.0)
                     .position_ingame(over_pos)
@@ -1872,13 +1872,13 @@ impl Hud {
                         &self.fonts,
                         match interaction {
                             Interaction::Collect => {
-                                vec![(GameInput::Interact, i18n.get("hud.collect").to_string())]
+                                vec![(GameInput::Interact, i18n.get_msg("hud-collect").to_string())]
                             },
                             Interaction::Craft(_) => {
-                                vec![(GameInput::Interact, i18n.get("hud.use").to_string())]
+                                vec![(GameInput::Interact, i18n.get_msg("hud-use").to_string())]
                             },
                             Interaction::Mine => {
-                                vec![(GameInput::Primary, i18n.get("hud.mine").to_string())]
+                                vec![(GameInput::Primary, i18n.get_msg("hud-mine").to_string())]
                             },
                         },
                     )
@@ -1895,7 +1895,7 @@ impl Hud {
                         overitem_properties,
                         self.pulse,
                         &global_state.window.key_layout,
-                        vec![(GameInput::Interact, i18n.get("hud.use").to_string())],
+                        vec![(GameInput::Interact, i18n.get_msg("hud-use").to_string())],
                     )
                     .x_y(0.0, 100.0)
                     .position_ingame(over_pos)
@@ -1928,7 +1928,7 @@ impl Hud {
                     let over_pos = pos + Vec3::unit_z() * 1.5;
 
                     overitem::Overitem::new(
-                        i18n.get("hud.crafting.campfire"),
+                        i18n.get_msg("hud-crafting-campfire"),
                         overitem::TEXT_COLOR,
                         pos.distance_squared(player_pos),
                         &self.fonts,
@@ -1937,7 +1937,7 @@ impl Hud {
                         overitem_properties,
                         self.pulse,
                         &global_state.window.key_layout,
-                        vec![(GameInput::Interact, i18n.get("hud.sit").to_string())],
+                        vec![(GameInput::Interact, i18n.get_msg("hud-sit").to_string())],
                     )
                     .x_y(0.0, 100.0)
                     .position_ingame(over_pos)
@@ -2100,8 +2100,8 @@ impl Hud {
                                     == Some(entity) =>
                         {
                             vec![
-                                (GameInput::Interact, i18n.get("hud.talk").to_string()),
-                                (GameInput::Trade, i18n.get("hud.trade").to_string()),
+                                (GameInput::Interact, i18n.get_msg("hud-talk").to_string()),
+                                (GameInput::Trade, i18n.get_msg("hud-trade").to_string()),
                             ]
                         },
                         Some(comp::Alignment::Owned(owner))
@@ -2111,7 +2111,7 @@ impl Hud {
                                 && is_mountable(body, bodies.get(client.entity()))
                                 && dist_sqr < common::consts::MAX_MOUNT_RANGE.powi(2) =>
                         {
-                            vec![(GameInput::Mount, i18n.get("hud.mount").to_string())]
+                            vec![(GameInput::Mount, i18n.get_msg("hud-mount").to_string())]
                         },
                         _ => Vec::new(),
                     },
@@ -3306,14 +3306,14 @@ impl Hud {
 
         // Auto walk indicator
         if self.show.auto_walk {
-            Text::new(&i18n.get("hud.auto_walk_indicator"))
+            Text::new(&i18n.get_msg("hud-auto_walk_indicator"))
                 .color(TEXT_BG)
                 .mid_top_with_margin_on(ui_widgets.window, indicator_offset)
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(20))
                 .set(self.ids.auto_walk_bg, ui_widgets);
             indicator_offset += 30.0;
-            Text::new(&i18n.get("hud.auto_walk_indicator"))
+            Text::new(&i18n.get_msg("hud-auto_walk_indicator"))
                 .color(KILL_COLOR)
                 .top_left_with_margins_on(self.ids.auto_walk_bg, -1.0, -1.0)
                 .font_id(self.fonts.cyri.conrod_id)
@@ -3763,7 +3763,7 @@ impl Hud {
                         .hover_image(self.imgs.button_hover)
                         .press_image(self.imgs.button_press)
                         .bottom_left_with_margins_on(ui_widgets.window, 350.0, 150.0)
-                        .label(&i18n.get("hud.tutorial_btn"))
+                        .label(&i18n.get_msg("hud-tutorial_btn"))
                         .label_font_id(self.fonts.cyri.conrod_id)
                         .label_font_size(self.fonts.cyri.scale(18))
                         .label_color(TEXT_COLOR)
@@ -3811,8 +3811,8 @@ impl Hud {
                 Intro::Show => {
                     if self.show.intro {
                         self.show.want_grab = false;
-                        let quest_headline = i18n.get("hud.temp_quest_headline");
-                        let quest_text = i18n.get("hud.temp_quest_text");
+                        let quest_headline = i18n.get_msg("hud-temp_quest_headline");
+                        let quest_text = i18n.get_msg("hud-temp_quest_text");
                         Image::new(self.imgs.quest_bg)
                             .w_h(404.0, 858.0)
                             .middle_of(ui_widgets.window)
@@ -3851,7 +3851,7 @@ impl Hud {
                             .hover_image(self.imgs.button_hover)
                             .press_image(self.imgs.button_press)
                             .mid_bottom_with_margin_on(self.ids.q_text_bg, -80.0)
-                            .label(&i18n.get("common.close"))
+                            .label(&i18n.get_msg("common-close"))
                             .label_font_id(self.fonts.cyri.conrod_id)
                             .label_font_size(self.fonts.cyri.scale(22))
                             .label_color(TEXT_COLOR)
@@ -3875,14 +3875,14 @@ impl Hud {
                                 )
                                 .color(Some(QUALITY_LEGENDARY))
                                 .set(self.ids.tut_arrow, ui_widgets);
-                            Text::new(&i18n.get("hud.tutorial_elements"))
+                            Text::new(&i18n.get_msg("hud-tutorial_elements"))
                                 .mid_top_with_margin_on(self.ids.tut_arrow, -50.0)
                                 .font_id(self.fonts.cyri.conrod_id)
                                 .font_size(self.fonts.cyri.scale(40))
                                 .color(BLACK)
                                 .floating(true)
                                 .set(self.ids.tut_arrow_txt_bg, ui_widgets);
-                            Text::new(&i18n.get("hud.tutorial_elements"))
+                            Text::new(&i18n.get_msg("hud-tutorial_elements"))
                                 .bottom_right_with_margins_on(self.ids.tut_arrow_txt_bg, 1.0, 1.0)
                                 .font_id(self.fonts.cyri.conrod_id)
                                 .font_size(self.fonts.cyri.scale(40))
@@ -4584,69 +4584,75 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id {
 pub fn get_buff_title(buff: BuffKind, localized_strings: &Localization) -> Cow<str> {
     match buff {
         // Buffs
-        BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
-        BuffKind::Saturation { .. } => localized_strings.get("buff.title.saturation"),
-        BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
-        BuffKind::CampfireHeal { .. } => localized_strings.get("buff.title.campfire_heal"),
-        BuffKind::IncreaseMaxHealth { .. } => localized_strings.get("buff.title.IncreaseMaxHealth"),
-        BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.title.energyup"),
-        BuffKind::Invulnerability => localized_strings.get("buff.title.invulnerability"),
-        BuffKind::ProtectingWard => localized_strings.get("buff.title.protectingward"),
-        BuffKind::Frenzied => localized_strings.get("buff.title.frenzied"),
-        BuffKind::Hastened => localized_strings.get("buff.title.hastened"),
+        BuffKind::Regeneration { .. } => localized_strings.get_msg("buff-title-heal"),
+        BuffKind::Saturation { .. } => localized_strings.get_msg("buff-title-saturation"),
+        BuffKind::Potion { .. } => localized_strings.get_msg("buff-title-potion"),
+        BuffKind::CampfireHeal { .. } => localized_strings.get_msg("buff-title-campfire_heal"),
+        BuffKind::IncreaseMaxHealth { .. } => {
+            localized_strings.get_msg("buff-title-IncreaseMaxHealth")
+        },
+        BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get_msg("buff-title-energyup"),
+        BuffKind::Invulnerability => localized_strings.get_msg("buff-title-invulnerability"),
+        BuffKind::ProtectingWard => localized_strings.get_msg("buff-title-protectingward"),
+        BuffKind::Frenzied => localized_strings.get_msg("buff-title-frenzied"),
+        BuffKind::Hastened => localized_strings.get_msg("buff-title-hastened"),
         // Debuffs
-        BuffKind::Bleeding { .. } => localized_strings.get("buff.title.bleed"),
-        BuffKind::Cursed { .. } => localized_strings.get("buff.title.cursed"),
-        BuffKind::Burning { .. } => localized_strings.get("buff.title.burn"),
-        BuffKind::Crippled { .. } => localized_strings.get("buff.title.crippled"),
-        BuffKind::Frozen { .. } => localized_strings.get("buff.title.frozen"),
-        BuffKind::Wet { .. } => localized_strings.get("buff.title.wet"),
-        BuffKind::Ensnared { .. } => localized_strings.get("buff.title.ensnared"),
-        BuffKind::Poisoned { .. } => localized_strings.get("buff.title.poisoned"),
+        BuffKind::Bleeding { .. } => localized_strings.get_msg("buff-title-bleed"),
+        BuffKind::Cursed { .. } => localized_strings.get_msg("buff-title-cursed"),
+        BuffKind::Burning { .. } => localized_strings.get_msg("buff-title-burn"),
+        BuffKind::Crippled { .. } => localized_strings.get_msg("buff-title-crippled"),
+        BuffKind::Frozen { .. } => localized_strings.get_msg("buff-title-frozen"),
+        BuffKind::Wet { .. } => localized_strings.get_msg("buff-title-wet"),
+        BuffKind::Ensnared { .. } => localized_strings.get_msg("buff-title-ensnared"),
+        BuffKind::Poisoned { .. } => localized_strings.get_msg("buff-title-poisoned"),
     }
 }
 
 pub fn get_buff_desc(buff: BuffKind, data: BuffData, localized_strings: &Localization) -> Cow<str> {
     match buff {
         // Buffs
-        BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
-        BuffKind::Saturation { .. } => localized_strings.get("buff.desc.saturation"),
-        BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
+        BuffKind::Regeneration { .. } => localized_strings.get_msg("buff-desc-heal"),
+        BuffKind::Saturation { .. } => localized_strings.get_msg("buff-desc-saturation"),
+        BuffKind::Potion { .. } => localized_strings.get_msg("buff-desc-potion"),
         BuffKind::CampfireHeal { .. } => {
             localized_strings.get_msg_ctx("buff-desc-campfire_heal", &i18n::fluent_args! {
                 "rate" => data.strength * 100.0
             })
         },
-        BuffKind::IncreaseMaxHealth { .. } => localized_strings.get("buff.desc.IncreaseMaxHealth"),
-        BuffKind::IncreaseMaxEnergy { .. } => localized_strings.get("buff.desc.IncreaseMaxEnergy"),
-        BuffKind::Invulnerability => localized_strings.get("buff.desc.invulnerability"),
-        BuffKind::ProtectingWard => localized_strings.get("buff.desc.protectingward"),
-        BuffKind::Frenzied => localized_strings.get("buff.desc.frenzied"),
-        BuffKind::Hastened => localized_strings.get("buff.desc.hastened"),
+        BuffKind::IncreaseMaxHealth { .. } => {
+            localized_strings.get_msg("buff-desc-IncreaseMaxHealth")
+        },
+        BuffKind::IncreaseMaxEnergy { .. } => {
+            localized_strings.get_msg("buff-desc-IncreaseMaxEnergy")
+        },
+        BuffKind::Invulnerability => localized_strings.get_msg("buff-desc-invulnerability"),
+        BuffKind::ProtectingWard => localized_strings.get_msg("buff-desc-protectingward"),
+        BuffKind::Frenzied => localized_strings.get_msg("buff-desc-frenzied"),
+        BuffKind::Hastened => localized_strings.get_msg("buff-desc-hastened"),
         // Debuffs
-        BuffKind::Bleeding { .. } => localized_strings.get("buff.desc.bleed"),
-        BuffKind::Cursed { .. } => localized_strings.get("buff.desc.cursed"),
-        BuffKind::Burning { .. } => localized_strings.get("buff.desc.burn"),
-        BuffKind::Crippled { .. } => localized_strings.get("buff.desc.crippled"),
-        BuffKind::Frozen { .. } => localized_strings.get("buff.desc.frozen"),
-        BuffKind::Wet { .. } => localized_strings.get("buff.desc.wet"),
-        BuffKind::Ensnared { .. } => localized_strings.get("buff.desc.ensnared"),
-        BuffKind::Poisoned { .. } => localized_strings.get("buff.desc.poisoned"),
+        BuffKind::Bleeding { .. } => localized_strings.get_msg("buff-desc-bleed"),
+        BuffKind::Cursed { .. } => localized_strings.get_msg("buff-desc-cursed"),
+        BuffKind::Burning { .. } => localized_strings.get_msg("buff-desc-burn"),
+        BuffKind::Crippled { .. } => localized_strings.get_msg("buff-desc-crippled"),
+        BuffKind::Frozen { .. } => localized_strings.get_msg("buff-desc-frozen"),
+        BuffKind::Wet { .. } => localized_strings.get_msg("buff-desc-wet"),
+        BuffKind::Ensnared { .. } => localized_strings.get_msg("buff-desc-ensnared"),
+        BuffKind::Poisoned { .. } => localized_strings.get_msg("buff-desc-poisoned"),
     }
 }
 
 pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) -> Option<Cow<str>> {
     let i18n_key = match sprite {
         SpriteKind::Empty => return None,
-        SpriteKind::Anvil => "hud.crafting.anvil",
-        SpriteKind::Cauldron => "hud.crafting.cauldron",
-        SpriteKind::CookingPot => "hud.crafting.cooking_pot",
-        SpriteKind::CraftingBench => "hud.crafting.crafting_bench",
-        SpriteKind::Forge => "hud.crafting.forge",
-        SpriteKind::Loom => "hud.crafting.loom",
-        SpriteKind::SpinningWheel => "hud.crafting.spinning_wheel",
-        SpriteKind::TanningRack => "hud.crafting.tanning_rack",
-        SpriteKind::DismantlingBench => "hud.crafting.salvaging_station",
+        SpriteKind::Anvil => "hud-crafting-anvil",
+        SpriteKind::Cauldron => "hud-crafting-cauldron",
+        SpriteKind::CookingPot => "hud-crafting-cooking_pot",
+        SpriteKind::CraftingBench => "hud-crafting-crafting_bench",
+        SpriteKind::Forge => "hud-crafting-forge",
+        SpriteKind::Loom => "hud-crafting-loom",
+        SpriteKind::SpinningWheel => "hud-crafting-spinning_wheel",
+        SpriteKind::TanningRack => "hud-crafting-tanning_rack",
+        SpriteKind::DismantlingBench => "hud-crafting-salvaging_station",
         SpriteKind::ChestBuried
         | SpriteKind::Chest
         | SpriteKind::DungeonChest0
@@ -4654,10 +4660,10 @@ pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) ->
         | SpriteKind::DungeonChest2
         | SpriteKind::DungeonChest3
         | SpriteKind::DungeonChest4
-        | SpriteKind::DungeonChest5 => "common.sprite.chest",
+        | SpriteKind::DungeonChest5 => "common-sprite-chest",
         sprite => return Some(Cow::Owned(format!("{:?}", sprite))),
     };
-    Some(localized_strings.get(i18n_key))
+    Some(localized_strings.get_msg(i18n_key))
 }
 
 pub fn get_buff_time(buff: BuffInfo) -> String {
diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs
index d0b94fc028..4a311428c3 100644
--- a/voxygen/src/hud/overhead.rs
+++ b/voxygen/src/hud/overhead.rs
@@ -394,7 +394,7 @@ impl<'a> Widget for Overhead<'a> {
                     }
                     let mut txt = format!("{}/{}", health_cur_txt, health_max_txt);
                     if health.is_dead {
-                        txt = self.i18n.get("hud.group.dead").to_string()
+                        txt = self.i18n.get_msg("hud-group-dead").to_string()
                     };
                     Text::new(&txt)
                         .mid_top_with_margin_on(state.ids.health_bar_bg, 2.0)
diff --git a/voxygen/src/hud/overitem.rs b/voxygen/src/hud/overitem.rs
index 25f0463a1d..00112ab29b 100644
--- a/voxygen/src/hud/overitem.rs
+++ b/voxygen/src/hud/overitem.rs
@@ -230,13 +230,13 @@ impl<'a> Widget for Overitem<'a> {
 
             let text = match collect_failed_data.reason {
                 HudCollectFailedReason::InventoryFull => {
-                    self.localized_strings.get("hud.inventory_full")
+                    self.localized_strings.get_msg("hud-inventory_full")
                 },
                 HudCollectFailedReason::LootOwned { owner, expiry_secs } => {
                     let owner_name = match owner {
                         HudLootOwner::Name(name) => Cow::Owned(name),
-                        HudLootOwner::Group => self.localized_strings.get("hud.another_group"),
-                        HudLootOwner::Unknown => self.localized_strings.get("hud.someone_else"),
+                        HudLootOwner::Group => self.localized_strings.get_msg("hud-another_group"),
+                        HudLootOwner::Unknown => self.localized_strings.get_msg("hud-someone_else"),
                     };
                     self.localized_strings.get_msg_ctx(
                         "hud-owned_by_for_secs",
diff --git a/voxygen/src/hud/popup.rs b/voxygen/src/hud/popup.rs
index 9daca35dec..5053425e12 100644
--- a/voxygen/src/hud/popup.rs
+++ b/voxygen/src/hud/popup.rs
@@ -127,7 +127,7 @@ impl<'a> Widget for Popup<'a> {
                         if s.infos.is_empty() {
                             s.last_info_update = Instant::now();
                         }
-                        let text = self.i18n.get("hud.waypoint_saved");
+                        let text = self.i18n.get_msg("hud-waypoint_saved");
                         s.infos.push_back(text.to_string());
                     });
                 },
diff --git a/voxygen/src/hud/settings_window/chat.rs b/voxygen/src/hud/settings_window/chat.rs
index f03d8c3b69..d57143d6e9 100644
--- a/voxygen/src/hud/settings_window/chat.rs
+++ b/voxygen/src/hud/settings_window/chat.rs
@@ -141,7 +141,7 @@ impl<'a> Widget for Chat<'a> {
             .set(state.ids.window_r, ui);
 
         // General Title
-        Text::new(&self.localized_strings.get("hud.settings.general"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-general"))
             .top_left_with_margins_on(state.ids.window, 5.0, 5.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
@@ -152,7 +152,7 @@ impl<'a> Widget for Chat<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.background_opacity"),
+                .get_msg("hud-settings-background_opacity"),
         )
         .down_from(state.ids.general_txt, 20.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -188,7 +188,7 @@ impl<'a> Widget for Chat<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.chat_character_name"),
+                .get_msg("hud-settings-chat_character_name"),
         )
         .down_from(state.ids.transp_slider, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -219,7 +219,7 @@ impl<'a> Widget for Chat<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .down_from(state.ids.char_name_text, 20.0)
-            .label(&self.localized_strings.get("hud.settings.reset_chat"))
+            .label(&self.localized_strings.get_msg("hud-settings-reset_chat"))
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
@@ -231,7 +231,7 @@ impl<'a> Widget for Chat<'a> {
         }
 
         // Tabs Title
-        Text::new(&self.localized_strings.get("hud.settings.chat_tabs"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-chat_tabs"))
             .top_left_with_margins_on(state.ids.window_r, 5.0, 5.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
@@ -335,7 +335,7 @@ impl<'a> Widget for Chat<'a> {
         {
             let mut updated_chat_tab = chat_tab.clone();
 
-            Text::new(&self.localized_strings.get("hud.settings.label"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-label"))
                 .top_left_with_margins_on(state.ids.tab_content_align, 5.0, 25.0)
                 .font_size(self.fonts.cyri.scale(16))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -363,7 +363,7 @@ impl<'a> Widget for Chat<'a> {
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
                 .w_h(100.0, 30.0)
-                .label(&self.localized_strings.get("hud.settings.delete"))
+                .label(&self.localized_strings.get_msg("hud-settings-delete"))
                 .label_font_size(self.fonts.cyri.scale(14))
                 .label_font_id(self.fonts.cyri.conrod_id)
                 .label_color(TEXT_COLOR)
@@ -418,7 +418,7 @@ impl<'a> Widget for Chat<'a> {
             };
 
             //Messages
-            Text::new(&self.localized_strings.get("hud.settings.messages"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-messages"))
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(16))
                 .color(TEXT_COLOR)
@@ -441,7 +441,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_all = !chat_tab.filter.message_all;
             };
 
-            Text::new(&self.localized_strings.get("hud.settings.show_all"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-show_all"))
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(16))
                 .color(TEXT_COLOR)
@@ -458,7 +458,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_group = !chat_tab.filter.message_group;
             }
 
-            let group_text = self.localized_strings.get("hud.settings.group");
+            let group_text = self.localized_strings.get_msg("hud-settings-group");
             create_toggle_text(&group_text, !chat_tab.filter.message_all)
                 .right_from(state.ids.btn_messages_group, 5.0)
                 .set(state.ids.text_messages_group, ui);
@@ -480,7 +480,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_faction = !chat_tab.filter.message_faction;
             }
 
-            let faction_text = self.localized_strings.get("hud.settings.faction");
+            let faction_text = self.localized_strings.get_msg("hud-settings-faction");
             create_toggle_text(&faction_text, !chat_tab.filter.message_all)
                 .right_from(state.ids.btn_messages_faction, 5.0)
                 .set(state.ids.text_messages_faction, ui);
@@ -499,7 +499,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_world = !chat_tab.filter.message_world;
             }
 
-            let world_text = self.localized_strings.get("hud.settings.world");
+            let world_text = self.localized_strings.get_msg("hud-settings-world");
             create_toggle_text(&world_text, !chat_tab.filter.message_all)
                 .right_from(state.ids.btn_messages_world, 5.0)
                 .set(state.ids.text_messages_world, ui);
@@ -518,7 +518,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_region = !chat_tab.filter.message_region;
             }
 
-            let region_text = self.localized_strings.get("hud.settings.region");
+            let region_text = self.localized_strings.get_msg("hud-settings-region");
             create_toggle_text(&region_text, !chat_tab.filter.message_all)
                 .right_from(state.ids.btn_messages_region, 5.0)
                 .set(state.ids.text_messages_region, ui);
@@ -537,7 +537,7 @@ impl<'a> Widget for Chat<'a> {
                 updated_chat_tab.filter.message_say = !chat_tab.filter.message_say;
             }
 
-            let say_text = self.localized_strings.get("hud.settings.say");
+            let say_text = self.localized_strings.get_msg("hud-settings-say");
             create_toggle_text(&say_text, !chat_tab.filter.message_all)
                 .right_from(state.ids.btn_messages_say, 5.0)
                 .set(state.ids.text_messages_say, ui);
@@ -547,7 +547,7 @@ impl<'a> Widget for Chat<'a> {
                 .set(state.ids.icon_messages_say, ui);
 
             //Activity
-            Text::new(&self.localized_strings.get("hud.settings.activity"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-activity"))
                 .top_left_with_margins_on(state.ids.tab_content_align_r, 0.0, 5.0)
                 .align_middle_y_of(state.ids.text_messages)
                 .font_size(self.fonts.cyri.scale(16))
@@ -557,9 +557,9 @@ impl<'a> Widget for Chat<'a> {
 
             if let Some(clicked) = DropDownList::new(
                 &[
-                    &self.localized_strings.get("hud.settings.none"),
-                    &self.localized_strings.get("hud.settings.all"),
-                    &self.localized_strings.get("hud.settings.group_only"),
+                    &self.localized_strings.get_msg("hud-settings-none"),
+                    &self.localized_strings.get_msg("hud-settings-all"),
+                    &self.localized_strings.get_msg("hud-settings-group_only"),
                 ],
                 Some(if chat_tab.filter.activity_all {
                     //all
@@ -598,7 +598,7 @@ impl<'a> Widget for Chat<'a> {
             }
 
             //Death
-            Text::new(&self.localized_strings.get("hud.settings.death"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-death"))
                 .down_from(state.ids.list_activity, 20.0)
                 .font_size(self.fonts.cyri.scale(16))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -607,9 +607,9 @@ impl<'a> Widget for Chat<'a> {
 
             if let Some(clicked) = DropDownList::new(
                 &[
-                    &self.localized_strings.get("hud.settings.none"),
-                    &self.localized_strings.get("hud.settings.all"),
-                    &self.localized_strings.get("hud.settings.group_only"),
+                    &self.localized_strings.get_msg("hud-settings-none"),
+                    &self.localized_strings.get_msg("hud-settings-all"),
+                    &self.localized_strings.get_msg("hud-settings-group_only"),
                 ],
                 Some(if chat_tab.filter.death_all {
                     //all
diff --git a/voxygen/src/hud/settings_window/controls.rs b/voxygen/src/hud/settings_window/controls.rs
index a9113c59c5..9381510a61 100644
--- a/voxygen/src/hud/settings_window/controls.rs
+++ b/voxygen/src/hud/settings_window/controls.rs
@@ -125,7 +125,7 @@ impl<'a> Widget for Controls<'a> {
                 if self.global_state.window.remapping_keybindings == Some(game_input) {
                     (
                         self.localized_strings
-                            .get("hud.settings.awaitingkey")
+                            .get_msg("hud-settings-awaitingkey")
                             .into_owned(),
                         TEXT_COLOR,
                     )
@@ -146,14 +146,14 @@ impl<'a> Widget for Controls<'a> {
                 } else {
                     (
                         self.localized_strings
-                            .get("hud.settings.unbound")
+                            .get_msg("hud-settings-unbound")
                             .into_owned(),
                         ERROR_COLOR,
                     )
                 };
             let loc_key = self
                 .localized_strings
-                .get(game_input.get_localization_key());
+                .get_msg(game_input.get_localization_key());
             let text_widget = Text::new(&loc_key)
                 .color(TEXT_COLOR)
                 .font_id(self.fonts.cyri.conrod_id)
@@ -196,7 +196,11 @@ impl<'a> Widget for Controls<'a> {
                 .hover_image(self.imgs.button_hover)
                 .press_image(self.imgs.button_press)
                 .down_from(prev_id, 20.0)
-                .label(&self.localized_strings.get("hud.settings.reset_keybinds"))
+                .label(
+                    &self
+                        .localized_strings
+                        .get_msg("hud-settings-reset_keybinds"),
+                )
                 .label_font_size(self.fonts.cyri.scale(14))
                 .label_color(TEXT_COLOR)
                 .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/settings_window/gameplay.rs b/voxygen/src/hud/settings_window/gameplay.rs
index dbffc915cb..bc107631e9 100644
--- a/voxygen/src/hud/settings_window/gameplay.rs
+++ b/voxygen/src/hud/settings_window/gameplay.rs
@@ -122,12 +122,16 @@ impl<'a> Widget for Gameplay<'a> {
         let display_clamp = self.global_state.settings.gameplay.camera_clamp_angle;
 
         // Mouse Pan Sensitivity
-        Text::new(&self.localized_strings.get("hud.settings.pan_sensitivity"))
-            .top_left_with_margins_on(state.ids.window, 10.0, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.mouse_pan_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-setting-pan_sensitivity"),
+        )
+        .top_left_with_margins_on(state.ids.window, 10.0, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.mouse_pan_label, ui);
 
         if let Some(new_val) = ImageSlider::discrete(
             display_pan,
@@ -154,12 +158,16 @@ impl<'a> Widget for Gameplay<'a> {
             .set(state.ids.mouse_pan_value, ui);
 
         // Mouse Zoom Sensitivity
-        Text::new(&self.localized_strings.get("hud.settings.zoom_sensitivity"))
-            .down_from(state.ids.mouse_pan_slider, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.mouse_zoom_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-zoom_sensitivity"),
+        )
+        .down_from(state.ids.mouse_pan_slider, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.mouse_zoom_label, ui);
 
         if let Some(new_val) = ImageSlider::discrete(
             display_zoom,
@@ -189,7 +197,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.camera_clamp_angle"),
+                .get_msg("hud-settings-camera_clamp_angle"),
         )
         .down_from(state.ids.mouse_zoom_slider, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -242,7 +250,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.invert_scroll_zoom"),
+                .get_msg("hud-settings-invert_scroll_zoom"),
         )
         .right_from(state.ids.mouse_zoom_invert_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -272,7 +280,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.invert_mouse_y_axis"),
+                .get_msg("hud-settings-invert_mouse_y_axis"),
         )
         .right_from(state.ids.mouse_y_invert_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -302,7 +310,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.invert_controller_y_axis"),
+                .get_msg("hud-settings-invert_controller_y_axis"),
         )
         .right_from(state.ids.controller_y_invert_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -332,7 +340,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.enable_mouse_smoothing"),
+                .get_msg("hud-settings-enable_mouse_smoothing"),
         )
         .right_from(state.ids.smooth_pan_toggle_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -345,7 +353,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.free_look_behavior"),
+                .get_msg("hud-settings-free_look_behavior"),
         )
         .down_from(state.ids.mouse_zoom_invert_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -355,9 +363,9 @@ impl<'a> Widget for Gameplay<'a> {
 
         let mode_label_list = [
             self.localized_strings
-                .get("hud.settings.press_behavior.toggle"),
+                .get_msg("hud-settings-press_behavior-toggle"),
             self.localized_strings
-                .get("hud.settings.press_behavior.hold"),
+                .get_msg("hud-settings-press_behavior-hold"),
         ];
 
         // Get which free look behavior is currently active
@@ -382,7 +390,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.auto_walk_behavior"),
+                .get_msg("hud-settings-auto_walk_behavior"),
         )
         .down_from(state.ids.mouse_zoom_invert_button, 10.0)
         .right_from(state.ids.free_look_behavior_text, 150.0)
@@ -412,7 +420,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.camera_clamp_behavior"),
+                .get_msg("hud-settings-camera_clamp_behavior"),
         )
         .down_from(state.ids.free_look_behavior_list, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -461,7 +469,7 @@ impl<'a> Widget for Gameplay<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.stop_auto_walk_on_input"),
+                .get_msg("hud-settings-stop_auto_walk_on_input"),
         )
         .right_from(state.ids.stop_auto_walk_on_input_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -488,7 +496,7 @@ impl<'a> Widget for Gameplay<'a> {
             ));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.auto_camera"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-auto_camera"))
             .right_from(state.ids.auto_camera_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -512,7 +520,7 @@ impl<'a> Widget for Gameplay<'a> {
             events.push(ChangeBowZoom(!self.global_state.settings.gameplay.bow_zoom));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.bow_zoom"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-bow_zoom"))
             .right_from(state.ids.bow_zoom_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -526,7 +534,11 @@ impl<'a> Widget for Gameplay<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .down_from(state.ids.camera_clamp_behavior_list, 12.0)
-            .label(&self.localized_strings.get("hud.settings.reset_gameplay"))
+            .label(
+                &self
+                    .localized_strings
+                    .get_msg("hud-settings-reset_gameplay"),
+            )
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/settings_window/interface.rs b/voxygen/src/hud/settings_window/interface.rs
index 2b74a5d42c..8dab3486ff 100644
--- a/voxygen/src/hud/settings_window/interface.rs
+++ b/voxygen/src/hud/settings_window/interface.rs
@@ -174,7 +174,7 @@ impl<'a> Widget for Interface<'a> {
         let crosshair_type = self.global_state.settings.interface.crosshair_type;
         let ui_scale = self.global_state.settings.interface.ui_scale;
 
-        Text::new(&self.localized_strings.get("hud.settings.general"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-general"))
             .top_left_with_margins_on(state.ids.window, 5.0, 5.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
@@ -197,7 +197,7 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleHelp(show_help));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.help_window"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-help_window"))
             .right_from(state.ids.button_help, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -223,7 +223,7 @@ impl<'a> Widget for Interface<'a> {
             ));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.loading_tips"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-loading_tips"))
             .right_from(state.ids.load_tips_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -247,7 +247,7 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleDebug(show_debug));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.debug_info"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-debug_info"))
             .right_from(state.ids.debug_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -271,7 +271,7 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleHitboxes(show_hitboxes));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.show_hitboxes"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-show_hitboxes"))
             .right_from(state.ids.hitboxes_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -295,7 +295,7 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleChat(show_chat));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.show_chat"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-show_chat"))
             .right_from(state.ids.chat_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -319,16 +319,20 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleHotkeyHints(show_hotkey_hints));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.show_hotkey_hints"))
-            .right_from(state.ids.hotkey_hints_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.hotkey_hints_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.hotkey_hints_button_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-show_hotkey_hints"),
+        )
+        .right_from(state.ids.hotkey_hints_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.hotkey_hints_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.hotkey_hints_button_label, ui);
 
         // Ui Scale
-        Text::new(&self.localized_strings.get("hud.settings.ui_scale"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-ui_scale"))
             .down_from(state.ids.hotkey_hints_button, 20.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
@@ -362,13 +366,17 @@ impl<'a> Widget for Interface<'a> {
             events.push(UiScale(ScaleChange::ToRelative));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.relative_scaling"))
-            .right_from(state.ids.relative_to_win_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.relative_to_win_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.relative_to_win_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-relative_scaling"),
+        )
+        .right_from(state.ids.relative_to_win_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.relative_to_win_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.relative_to_win_text, ui);
 
         // Absolute Scaling Button
         let (check_img, check_mo_img, check_press_img, absolute_selected) = match ui_scale {
@@ -397,13 +405,17 @@ impl<'a> Widget for Interface<'a> {
             events.push(UiScale(ScaleChange::ToAbsolute));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.custom_scaling"))
-            .right_from(state.ids.absolute_scale_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.absolute_scale_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.absolute_scale_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-custom_scaling"),
+        )
+        .right_from(state.ids.absolute_scale_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.absolute_scale_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.absolute_scale_text, ui);
 
         // Slider -> Inactive when "Relative to window" is selected
         if let ScaleMode::Absolute(scale) = ui_scale {
@@ -574,13 +586,13 @@ impl<'a> Widget for Interface<'a> {
             .graphics_for(state.ids.ch_3_bg)
             .set(state.ids.crosshair_inner_3, ui);
         // Crosshair Transparency Text and Slider
-        Text::new(&self.localized_strings.get("hud.settings.crosshair"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-crosshair"))
             .down_from(state.ids.absolute_scale_button, 20.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(state.ids.ch_title, ui);
-        Text::new(&self.localized_strings.get("hud.settings.opacity"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-opacity"))
             .right_from(state.ids.ch_3_bg, 20.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -613,7 +625,7 @@ impl<'a> Widget for Interface<'a> {
             .set(state.ids.ch_transp_value, ui);
 
         // Hotbar text
-        Text::new(&self.localized_strings.get("hud.settings.hotbar"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-hotbar"))
             .down_from(state.ids.ch_1_bg, 20.0)
             .font_size(self.fonts.cyri.scale(18))
             .font_id(self.fonts.cyri.conrod_id)
@@ -648,13 +660,17 @@ impl<'a> Widget for Interface<'a> {
                 ShortcutNumbers::Off => events.push(ToggleShortcutNumbers(ShortcutNumbers::On)),
             }
         }
-        Text::new(&self.localized_strings.get("hud.settings.toggle_shortcuts"))
-            .right_from(state.ids.show_shortcuts_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.show_shortcuts_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.show_shortcuts_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-toggle_shortcuts"),
+        )
+        .right_from(state.ids.show_shortcuts_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.show_shortcuts_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.show_shortcuts_text, ui);
         // Buff Position
         // Buffs above skills
         if Button::image(match self.global_state.settings.interface.buff_position {
@@ -676,13 +692,17 @@ impl<'a> Widget for Interface<'a> {
         {
             events.push(BuffPosition(BuffPosition::Bar))
         }
-        Text::new(&self.localized_strings.get("hud.settings.buffs_skillbar"))
-            .right_from(state.ids.buff_pos_bar_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.show_shortcuts_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.buff_pos_bar_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-buffs_skillbar"),
+        )
+        .right_from(state.ids.buff_pos_bar_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.show_shortcuts_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.buff_pos_bar_text, ui);
         // Buffs left from minimap
         if Button::image(match self.global_state.settings.interface.buff_position {
             BuffPosition::Map => self.imgs.check_checked,
@@ -703,7 +723,7 @@ impl<'a> Widget for Interface<'a> {
         {
             events.push(BuffPosition(BuffPosition::Map))
         }
-        Text::new(&self.localized_strings.get("hud.settings.buffs_mmap"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-buffs_mmap"))
             .right_from(state.ids.buff_pos_map_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -727,7 +747,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.scrolling_combat_text"),
+                .get_msg("hud-settings-scrolling_combat_text"),
         )
         .top_left_with_margins_on(state.ids.window_r, 5.0, 5.0)
         .font_size(self.fonts.cyri.scale(18))
@@ -752,7 +772,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.scrolling_combat_text"),
+                .get_msg("hud-settings-scrolling_combat_text"),
         )
         .right_from(state.ids.sct_show_radio, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -772,7 +792,7 @@ impl<'a> Widget for Interface<'a> {
             Text::new(
                 &self
                     .localized_strings
-                    .get("hud.settings.damage_accumulation_duration"),
+                    .get_msg("hud-settings-damage_accumulation_duration"),
             )
             .down_from(state.ids.sct_show_radio, 8.0)
             .right_from(state.ids.sct_show_radio, 10.0)
@@ -823,18 +843,22 @@ impl<'a> Widget for Interface<'a> {
                     !self.global_state.settings.interface.sct_inc_dmg,
                 ))
             }
-            Text::new(&self.localized_strings.get("hud.settings.incoming_damage"))
-                .right_from(state.ids.sct_show_inc_dmg_radio, 10.0)
-                .font_size(self.fonts.cyri.scale(14))
-                .font_id(self.fonts.cyri.conrod_id)
-                .graphics_for(state.ids.sct_show_inc_dmg_radio)
-                .color(TEXT_COLOR)
-                .set(state.ids.sct_show_inc_dmg_text, ui);
+            Text::new(
+                &self
+                    .localized_strings
+                    .get_msg("hud-settings-incoming_damage"),
+            )
+            .right_from(state.ids.sct_show_inc_dmg_radio, 10.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.sct_show_inc_dmg_radio)
+            .color(TEXT_COLOR)
+            .set(state.ids.sct_show_inc_dmg_text, ui);
             if self.global_state.settings.interface.sct_inc_dmg {
                 Text::new(
                     &self
                         .localized_strings
-                        .get("hud.settings.incoming_damage_accumulation_duration"),
+                        .get_msg("hud-settings-incoming_damage_accumulation_duration"),
                 )
                 .down_from(state.ids.sct_show_inc_dmg_radio, 8.0)
                 .right_from(state.ids.sct_show_inc_dmg_radio, 10.0)
@@ -895,7 +919,7 @@ impl<'a> Widget for Interface<'a> {
                     !self.global_state.settings.interface.sct_damage_rounding,
                 ))
             }
-            Text::new(&self.localized_strings.get("hud.settings.round_damage"))
+            Text::new(&self.localized_strings.get_msg("hud-settings-round_damage"))
                 .right_from(state.ids.sct_round_dmg_radio, 10.0)
                 .font_size(self.fonts.cyri.scale(14))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -905,7 +929,7 @@ impl<'a> Widget for Interface<'a> {
         }
 
         // Speech bubbles
-        Text::new(&self.localized_strings.get("hud.settings.speech_bubble"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-speech_bubble"))
             .down_from(
                 if self.global_state.settings.interface.sct {
                     state.ids.sct_round_dmg_radio
@@ -938,7 +962,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.speech_bubble_self"),
+                .get_msg("hud-settings-speech_bubble_self"),
         )
         .right_from(state.ids.speech_bubble_self_button, 10.0)
         .font_size(self.fonts.cyri.scale(15))
@@ -963,7 +987,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.speech_bubble_dark_mode"),
+                .get_msg("hud-settings-speech_bubble_dark_mode"),
         )
         .right_from(state.ids.speech_bubble_dark_mode_button, 10.0)
         .font_size(self.fonts.cyri.scale(15))
@@ -987,7 +1011,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.speech_bubble_icon"),
+                .get_msg("hud-settings-speech_bubble_icon"),
         )
         .right_from(state.ids.speech_bubble_icon_button, 10.0)
         .font_size(self.fonts.cyri.scale(15))
@@ -997,12 +1021,16 @@ impl<'a> Widget for Interface<'a> {
 
         // Energybars Numbers
         // Hotbar text
-        Text::new(&self.localized_strings.get("hud.settings.energybar_numbers"))
-            .down_from(state.ids.speech_bubble_icon_button, 20.0)
-            .font_size(self.fonts.cyri.scale(18))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.bar_numbers_title, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-energybar_numbers"),
+        )
+        .down_from(state.ids.speech_bubble_icon_button, 20.0)
+        .font_size(self.fonts.cyri.scale(18))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.bar_numbers_title, ui);
 
         // None
         if Button::image(if let BarNumbers::Off = bar_values {
@@ -1027,7 +1055,7 @@ impl<'a> Widget for Interface<'a> {
         {
             events.push(ToggleBarNumbers(BarNumbers::Off))
         }
-        Text::new(&self.localized_strings.get("hud.settings.none"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-none"))
             .right_from(state.ids.show_bar_numbers_none_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1058,7 +1086,7 @@ impl<'a> Widget for Interface<'a> {
         {
             events.push(ToggleBarNumbers(BarNumbers::Values))
         }
-        Text::new(&self.localized_strings.get("hud.settings.values"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-values"))
             .right_from(state.ids.show_bar_numbers_values_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1089,7 +1117,7 @@ impl<'a> Widget for Interface<'a> {
         {
             events.push(ToggleBarNumbers(BarNumbers::Percent))
         }
-        Text::new(&self.localized_strings.get("hud.settings.percentages"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-percentages"))
             .right_from(state.ids.show_bar_numbers_percentage_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -1113,19 +1141,23 @@ impl<'a> Widget for Interface<'a> {
             events.push(ToggleAlwaysShowBars(always_show_bars));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.always_show_bars"))
-            .right_from(state.ids.always_show_bars_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.always_show_bars_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.always_show_bars_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-always_show_bars"),
+        )
+        .right_from(state.ids.always_show_bars_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.always_show_bars_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.always_show_bars_label, ui);
 
         // Experience Numbers
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.experience_numbers"),
+                .get_msg("hud-settings-experience_numbers"),
         )
         .down_from(state.ids.always_show_bars_button, 20.0)
         .font_size(self.fonts.cyri.scale(18))
@@ -1154,7 +1186,7 @@ impl<'a> Widget for Interface<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.accumulate_experience"),
+                .get_msg("hud-settings-accumulate_experience"),
         )
         .right_from(state.ids.accum_experience_button, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -1169,7 +1201,11 @@ impl<'a> Widget for Interface<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .down_from(state.ids.buff_pos_map_button, 12.0)
-            .label(&self.localized_strings.get("hud.settings.reset_interface"))
+            .label(
+                &self
+                    .localized_strings
+                    .get_msg("hud-settings-reset_interface"),
+            )
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/settings_window/language.rs b/voxygen/src/hud/settings_window/language.rs
index 0bfb16989d..bcde69f66e 100644
--- a/voxygen/src/hud/settings_window/language.rs
+++ b/voxygen/src/hud/settings_window/language.rs
@@ -149,13 +149,17 @@ impl<'a> Widget for Language<'a> {
             events.push(ToggleEnglishFallback(show_english_fallback));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.english_fallback"))
-            .right_from(state.ids.english_fallback_button, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .graphics_for(state.ids.english_fallback_button)
-            .color(TEXT_COLOR)
-            .set(state.ids.english_fallback_button_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-english_fallback"),
+        )
+        .right_from(state.ids.english_fallback_button, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .graphics_for(state.ids.english_fallback_button)
+        .color(TEXT_COLOR)
+        .set(state.ids.english_fallback_button_label, ui);
 
         events
     }
diff --git a/voxygen/src/hud/settings_window/mod.rs b/voxygen/src/hud/settings_window/mod.rs
index 0e4f7d93fe..6b045ef933 100644
--- a/voxygen/src/hud/settings_window/mod.rs
+++ b/voxygen/src/hud/settings_window/mod.rs
@@ -61,27 +61,27 @@ pub enum SettingsTab {
 impl SettingsTab {
     fn name_key(&self) -> &str {
         match self {
-            SettingsTab::Interface => "common.interface",
-            SettingsTab::Chat => "common.chat",
-            SettingsTab::Gameplay => "common.gameplay",
-            SettingsTab::Controls => "common.controls",
-            SettingsTab::Video => "common.video",
-            SettingsTab::Sound => "common.sound",
-            SettingsTab::Lang => "common.languages",
-            SettingsTab::Networking => "common.networking",
+            SettingsTab::Interface => "common-interface",
+            SettingsTab::Chat => "common-chat",
+            SettingsTab::Gameplay => "common-gameplay",
+            SettingsTab::Controls => "common-controls",
+            SettingsTab::Video => "common-video",
+            SettingsTab::Sound => "common-sound",
+            SettingsTab::Lang => "common-languages",
+            SettingsTab::Networking => "common-networking",
         }
     }
 
     fn title_key(&self) -> &str {
         match self {
-            SettingsTab::Interface => "common.interface_settings",
-            SettingsTab::Chat => "common.chat_settings",
-            SettingsTab::Gameplay => "common.gameplay_settings",
-            SettingsTab::Controls => "common.controls_settings",
-            SettingsTab::Video => "common.video_settings",
-            SettingsTab::Sound => "common.sound_settings",
-            SettingsTab::Lang => "common.language_settings",
-            SettingsTab::Networking => "common.networking_settings",
+            SettingsTab::Interface => "common-interface_settings",
+            SettingsTab::Chat => "common-chat_settings",
+            SettingsTab::Gameplay => "common-gameplay_settings",
+            SettingsTab::Controls => "common-controls_settings",
+            SettingsTab::Video => "common-video_settings",
+            SettingsTab::Sound => "common-sound_settings",
+            SettingsTab::Lang => "common-language_settings",
+            SettingsTab::Networking => "common-networking_settings",
         }
     }
 }
@@ -191,7 +191,7 @@ impl<'a> Widget for SettingsWindow<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get(self.show.settings_tab.title_key()),
+                .get_msg(self.show.settings_tab.title_key()),
         )
         .mid_top_with_margin_on(state.ids.frame, 3.0)
         .font_id(self.fonts.cyri.conrod_id)
@@ -220,7 +220,7 @@ impl<'a> Widget for SettingsWindow<'a> {
             });
         }
         for (i, settings_tab) in SettingsTab::iter().enumerate() {
-            let tab_name = self.localized_strings.get(settings_tab.name_key());
+            let tab_name = self.localized_strings.get_msg(settings_tab.name_key());
             let mut button = Button::image(if self.show.settings_tab == settings_tab {
                 self.imgs.selection
             } else {
diff --git a/voxygen/src/hud/settings_window/networking.rs b/voxygen/src/hud/settings_window/networking.rs
index ceb58e9c38..8a7904e55e 100644
--- a/voxygen/src/hud/settings_window/networking.rs
+++ b/voxygen/src/hud/settings_window/networking.rs
@@ -89,7 +89,7 @@ impl<'a> Widget for Networking<'a> {
             .set(state.ids.window_r, ui);
 
         // View Distance
-        Text::new(&self.localized_strings.get("hud.settings.view_distance"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-view_distance"))
             .top_left_with_margins_on(state.ids.window, 10.0, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -127,7 +127,7 @@ impl<'a> Widget for Networking<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.player_physics_behavior"),
+                .get_msg("hud-settings-player_physics_behavior"),
         )
         .down_from(state.ids.vd_slider, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -166,7 +166,7 @@ impl<'a> Widget for Networking<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.lossy_terrain_compression"),
+                .get_msg("hud-settings-lossy_terrain_compression"),
         )
         .font_size(self.fonts.cyri.scale(14))
         .font_id(self.fonts.cyri.conrod_id)
@@ -206,7 +206,7 @@ impl<'a> Widget for Networking<'a> {
             Text::new(
                 &self
                     .localized_strings
-                    .get("hud.settings.third_party_integrations"),
+                    .get_msg("hud-settings-third_party_integrations"),
             )
             .down_from(state.ids.player_physics_behavior_list, 16.0)
             .font_size(self.fonts.cyri.scale(18))
@@ -248,7 +248,7 @@ impl<'a> Widget for Networking<'a> {
             Text::new(
                 &self
                     .localized_strings
-                    .get("hud.settings.enable_discord_integration"),
+                    .get_msg("hud-settings-enable_discord_integration"),
             )
             .right_from(state.ids.enable_discord_integration_button, 10.0)
             .font_size(self.fonts.cyri.scale(14))
diff --git a/voxygen/src/hud/settings_window/sound.rs b/voxygen/src/hud/settings_window/sound.rs
index 0ce9c106bc..a575753b49 100644
--- a/voxygen/src/hud/settings_window/sound.rs
+++ b/voxygen/src/hud/settings_window/sound.rs
@@ -108,7 +108,7 @@ impl<'a> Widget for Sound<'a> {
             .set(state.ids.window_scrollbar, ui);
 
         // Master Volume
-        Text::new(&self.localized_strings.get("hud.settings.master_volume"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-master_volume"))
             .top_left_with_margins_on(state.ids.window, 10.0, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -146,7 +146,7 @@ impl<'a> Widget for Sound<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.inactive_master_volume_perc"),
+                .get_msg("hud-settings-inactive_master_volume_perc"),
         )
         .down_from(state.ids.master_volume_slider, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -182,7 +182,7 @@ impl<'a> Widget for Sound<'a> {
         .set(state.ids.inactive_master_volume_number, ui);
 
         // Music Volume
-        Text::new(&self.localized_strings.get("hud.settings.music_volume"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-music_volume"))
             .down_from(state.ids.inactive_master_volume_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -220,7 +220,7 @@ impl<'a> Widget for Sound<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.sound_effect_volume"),
+                .get_msg("hud-settings-sound_effect_volume"),
         )
         .down_from(state.ids.music_volume_slider, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -255,12 +255,16 @@ impl<'a> Widget for Sound<'a> {
         .color(TEXT_COLOR)
         .set(state.ids.sfx_volume_number, ui);
         // Ambience Volume
-        Text::new(&self.localized_strings.get("hud.settings.ambience_volume"))
-            .down_from(state.ids.sfx_volume_slider, 10.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.ambience_volume_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-ambience_volume"),
+        )
+        .down_from(state.ids.sfx_volume_slider, 10.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.ambience_volume_text, ui);
         // Ambience Volume Slider
         if let Some(new_val) = ImageSlider::continuous(
             self.global_state.settings.audio.ambience_volume,
@@ -290,7 +294,7 @@ impl<'a> Widget for Sound<'a> {
         .set(state.ids.ambience_volume_number, ui);
 
         // Music spacing
-        Text::new(&self.localized_strings.get("hud.settings.music_spacing"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-music_spacing"))
             .down_from(state.ids.ambience_volume_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -357,7 +361,7 @@ impl<'a> Widget for Sound<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .down_from(state.ids.music_spacing_slider, 12.0)
-            .label(&self.localized_strings.get("hud.settings.reset_sound"))
+            .label(&self.localized_strings.get_msg("hud-settings-reset_sound"))
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs
index 037d4eb515..68bfb21062 100644
--- a/voxygen/src/hud/settings_window/video.rs
+++ b/voxygen/src/hud/settings_window/video.rs
@@ -277,7 +277,7 @@ impl<'a> Widget for Video<'a> {
         }
 
         // View Distance
-        Text::new(&self.localized_strings.get("hud.settings.view_distance"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-view_distance"))
             .top_left_with_margins_on(state.ids.window, 10.0, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -312,7 +312,7 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.vd_value, ui);
 
         // LoD Distance
-        Text::new(&self.localized_strings.get("hud.settings.lod_distance"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-lod_distance"))
             .down_from(state.ids.vd_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -347,7 +347,7 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.ld_value, ui);
 
         // Max FPS
-        Text::new(&self.localized_strings.get("hud.settings.maximum_fps"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-maximum_fps"))
             .down_from(state.ids.ld_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -382,13 +382,17 @@ impl<'a> Widget for Video<'a> {
             .set(state.ids.max_fps_value, ui);
 
         // Max Background FPS
-        Text::new(&self.localized_strings.get("hud.settings.background_fps"))
-            .down_from(state.ids.ld_slider, 10.0)
-            .right_from(state.ids.max_fps_value, 30.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.max_background_fps_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-background_fps"),
+        )
+        .down_from(state.ids.ld_slider, 10.0)
+        .right_from(state.ids.max_fps_value, 30.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.max_background_fps_text, ui);
 
         if let Some(which) = ImageSlider::discrete(
             BG_FPS_CHOICES
@@ -430,7 +434,7 @@ impl<'a> Widget for Video<'a> {
         let render_mode = &self.global_state.settings.graphics.render_mode;
 
         // Present Mode
-        Text::new(&self.localized_strings.get("hud.settings.present_mode"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-present_mode"))
             .down_from(state.ids.ld_slider, 10.0)
             .right_from(state.ids.max_background_fps_value, 30.0)
             .font_size(self.fonts.cyri.scale(14))
@@ -444,13 +448,15 @@ impl<'a> Widget for Video<'a> {
             PresentMode::Immediate,
         ];
         let mode_label_list = [
-            &self.localized_strings.get("hud.settings.present_mode.fifo"),
             &self
                 .localized_strings
-                .get("hud.settings.present_mode.mailbox"),
+                .get_msg("hud-settings-present_mode-fifo"),
             &self
                 .localized_strings
-                .get("hud.settings.present_mode.immediate"),
+                .get_msg("hud-settings-present_mode-mailbox"),
+            &self
+                .localized_strings
+                .get_msg("hud-settings-present_mode.immediate"),
         ];
 
         // Get which present mode is currently active
@@ -474,7 +480,7 @@ impl<'a> Widget for Video<'a> {
         }
 
         // FOV
-        Text::new(&self.localized_strings.get("hud.settings.fov"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-fov"))
             .down_from(state.ids.max_fps_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -506,7 +512,7 @@ impl<'a> Widget for Video<'a> {
             .set(state.ids.fov_value, ui);
 
         // LoD detail
-        Text::new(&self.localized_strings.get("hud.settings.lod_detail"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-lod_detail"))
             .down_from(state.ids.fov_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -544,7 +550,7 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.lod_detail_value, ui);
 
         // Gamma
-        Text::new(&self.localized_strings.get("hud.settings.gamma"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-gamma"))
             .down_from(state.ids.lod_detail_slider, 10.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -595,7 +601,7 @@ impl<'a> Widget for Video<'a> {
             events.push(GraphicsChange::ChangeExposure(new_val as f32 / 16.0));
         }
 
-        Text::new(&self.localized_strings.get("hud.settings.exposure"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-exposure"))
             .up_from(state.ids.exposure_slider, 8.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -629,7 +635,7 @@ impl<'a> Widget for Video<'a> {
         {
             events.push(GraphicsChange::ChangeAmbiance(new_val as f32 / 100.0));
         }
-        Text::new(&self.localized_strings.get("hud.settings.ambiance"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-ambiance"))
             .up_from(state.ids.ambiance_slider, 8.0)
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
@@ -665,7 +671,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.sprites_view_distance"),
+                .get_msg("hud-settings-sprites_view_distance"),
         )
         .up_from(state.ids.sprite_dist_slider, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -705,7 +711,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.figures_view_distance"),
+                .get_msg("hud-settings-figures_view_distance"),
         )
         .up_from(state.ids.figure_dist_slider, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -727,12 +733,16 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.figure_dist_value, ui);
 
         // AaMode
-        Text::new(&self.localized_strings.get("hud.settings.antialiasing_mode"))
-            .down_from(state.ids.gamma_slider, 8.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.aa_mode_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-antialiasing_mode"),
+        )
+        .down_from(state.ids.gamma_slider, 8.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.aa_mode_text, ui);
 
         // NOTE: MSAA modes are currently disabled from the UI due to poor
         // interaction with greedy meshing, and may eventually be removed.
@@ -775,7 +785,7 @@ impl<'a> Widget for Video<'a> {
         };
         let max_bloom = 0.3;
 
-        Text::new(&self.localized_strings.get("hud.settings.bloom"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-bloom"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.aa_mode_list, 10.0)
@@ -827,7 +837,7 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.bloom_intensity_value, ui);
 
         // Point Glow
-        Text::new(&self.localized_strings.get("hud.settings.point_glow"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-point_glow"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.aa_mode_list, 10.0)
@@ -866,12 +876,16 @@ impl<'a> Widget for Video<'a> {
         .set(state.ids.point_glow_value, ui);
 
         // Upscaling factor
-        Text::new(&self.localized_strings.get("hud.settings.upscale_factor"))
-            .down_from(state.ids.bloom_intensity_slider, 8.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.upscale_factor_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-upscale_factor"),
+        )
+        .down_from(state.ids.bloom_intensity_slider, 8.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.upscale_factor_text, ui);
 
         let upscale_factors = [
             // Upscaling
@@ -911,7 +925,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.cloud_rendering_mode"),
+                .get_msg("hud-settings-cloud_rendering_mode"),
         )
         .down_from(state.ids.upscale_factor_list, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -928,17 +942,17 @@ impl<'a> Widget for Video<'a> {
             CloudMode::Ultra,
         ];
         let mode_label_list = [
-            self.localized_strings.get("common.none"),
+            self.localized_strings.get_msg("common-none"),
             self.localized_strings
-                .get("hud.settings.cloud_rendering_mode.minimal"),
+                .get_msg("hud-settings-cloud_rendering_mode-minimal"),
             self.localized_strings
-                .get("hud.settings.cloud_rendering_mode.low"),
+                .get_msg("hud-settings-cloud_rendering_mode-low"),
             self.localized_strings
-                .get("hud.settings.cloud_rendering_mode.medium"),
+                .get_msg("hud-settings-cloud_rendering_mode-medium"),
             self.localized_strings
-                .get("hud.settings.cloud_rendering_mode.high"),
+                .get_msg("hud-settings-cloud_rendering_mode-high"),
             self.localized_strings
-                .get("hud.settings.cloud_rendering_mode.ultra"),
+                .get_msg("hud-settings-cloud_rendering_mode-ultra"),
         ];
 
         // Get which cloud rendering mode is currently active
@@ -962,7 +976,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.fluid_rendering_mode"),
+                .get_msg("hud-settings-fluid_rendering_mode"),
         )
         .down_from(state.ids.cloud_mode_list, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -973,9 +987,9 @@ impl<'a> Widget for Video<'a> {
         let mode_list = [FluidMode::Cheap, FluidMode::Shiny];
         let mode_label_list = [
             self.localized_strings
-                .get("hud.settings.fluid_rendering_mode.cheap"),
+                .get_msg("hud-settings-fluid_rendering_mode-cheap"),
             self.localized_strings
-                .get("hud.settings.fluid_rendering_mode.shiny"),
+                .get_msg("hud-settings-fluid_rendering_mode-shiny"),
         ];
 
         // Get which fluid rendering mode is currently active
@@ -999,7 +1013,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.lighting_rendering_mode"),
+                .get_msg("hud-settings-lighting_rendering_mode"),
         )
         .down_from(state.ids.fluid_mode_list, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -1014,11 +1028,11 @@ impl<'a> Widget for Video<'a> {
         ];
         let mode_label_list = [
             self.localized_strings
-                .get("hud.settings.lighting_rendering_mode.ashikhmin"),
+                .get_msg("hud-settings-lighting_rendering_mode-ashikhmin"),
             self.localized_strings
-                .get("hud.settings.lighting_rendering_mode.blinnphong"),
+                .get_msg("hud-settings-lighting_rendering_mode-blinnphong"),
             self.localized_strings
-                .get("hud.settings.lighting_rendering_mode.lambertian"),
+                .get_msg("hud-settings-lighting_rendering_mode-lambertian"),
         ];
 
         // Get which lighting rendering mode is currently active
@@ -1042,7 +1056,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.shadow_rendering_mode"),
+                .get_msg("hud-settings-shadow_rendering_mode"),
         )
         .down_from(state.ids.lighting_mode_list, 8.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -1058,11 +1072,11 @@ impl<'a> Widget for Video<'a> {
         ];
         let mode_label_list = [
             self.localized_strings
-                .get("hud.settings.shadow_rendering_mode.none"),
+                .get_msg("hud-settings-shadow_rendering_mode-none"),
             self.localized_strings
-                .get("hud.settings.shadow_rendering_mode.cheap"),
+                .get_msg("hud-settings-shadow_rendering_mode-cheap"),
             self.localized_strings
-                .get("hud.settings.shadow_rendering_mode.map"),
+                .get_msg("hud-settings-shadow_rendering_mode-map"),
         ];
 
         // Get which shadow rendering mode is currently active
@@ -1087,7 +1101,7 @@ impl<'a> Widget for Video<'a> {
             Text::new(
                 &self
                     .localized_strings
-                    .get("hud.settings.shadow_rendering_mode.map.resolution"),
+                    .get_msg("hud-settings-shadow_rendering_mode-map-resolution"),
             )
             .right_from(state.ids.shadow_mode_list, 10.0)
             .font_size(self.fonts.cyri.scale(14))
@@ -1132,7 +1146,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.rain_occlusion.resolution"),
+                .get_msg("hud-settings-rain_occlusion-resolution"),
         )
         .down_from(state.ids.shadow_mode_list, 10.0)
         .font_size(self.fonts.cyri.scale(14))
@@ -1169,7 +1183,7 @@ impl<'a> Widget for Video<'a> {
             .set(state.ids.rain_map_resolution_value, ui);
 
         // GPU Profiler
-        Text::new(&self.localized_strings.get("hud.settings.gpu_profiler"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-gpu_profiler"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.rain_map_resolution_text, 8.0)
@@ -1195,7 +1209,7 @@ impl<'a> Widget for Video<'a> {
         }
 
         // Particles
-        Text::new(&self.localized_strings.get("hud.settings.particles"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-particles"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.gpu_profiler_label, 8.0)
@@ -1218,7 +1232,7 @@ impl<'a> Widget for Video<'a> {
         }
 
         // Weapon trails
-        Text::new(&self.localized_strings.get("hud.settings.weapon_trails"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-weapon_trails"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .right_from(state.ids.particles_label, 64.0)
@@ -1243,12 +1257,16 @@ impl<'a> Widget for Video<'a> {
         }
 
         // Disable flashing lights
-        Text::new(&self.localized_strings.get("hud.settings.flashing_lights"))
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .down_from(state.ids.particles_label, 25.0)
-            .color(TEXT_COLOR)
-            .set(state.ids.flashing_lights_label, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-flashing_lights"),
+        )
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .down_from(state.ids.particles_label, 25.0)
+        .color(TEXT_COLOR)
+        .set(state.ids.flashing_lights_label, ui);
 
         let flashing_lights_enabled = ToggleButton::new(
             self.global_state
@@ -1268,7 +1286,7 @@ impl<'a> Widget for Video<'a> {
         Text::new(
             &self
                 .localized_strings
-                .get("hud.settings.flashing_lights_info"),
+                .get_msg("hud-settings-flashing_lights_info"),
         )
         .font_size(self.fonts.cyri.scale(14))
         .font_id(self.fonts.cyri.conrod_id)
@@ -1300,7 +1318,7 @@ impl<'a> Widget for Video<'a> {
             .dedup()
             .collect();
 
-        Text::new(&self.localized_strings.get("hud.settings.resolution"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-resolution"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.flashing_lights_label, 25.0)
@@ -1359,7 +1377,7 @@ impl<'a> Widget for Video<'a> {
             .dedup()
             .collect();
 
-        Text::new(&self.localized_strings.get("hud.settings.bit_depth"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-bit_depth"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.flashing_lights_label, 25.0)
@@ -1368,10 +1386,12 @@ impl<'a> Widget for Video<'a> {
             .set(state.ids.bit_depth_label, ui);
 
         if let Some(clicked) = DropDownList::new(
-            once(String::from(self.localized_strings.get("common.automatic")))
-                .chain(bit_depths.iter().map(|depth| format!("{}", depth)))
-                .collect::<Vec<String>>()
-                .as_slice(),
+            once(String::from(
+                self.localized_strings.get_msg("common-automatic"),
+            ))
+            .chain(bit_depths.iter().map(|depth| format!("{}", depth)))
+            .collect::<Vec<String>>()
+            .as_slice(),
             match self.global_state.settings.graphics.fullscreen.bit_depth {
                 Some(bit_depth) => bit_depths
                     .iter()
@@ -1413,7 +1433,7 @@ impl<'a> Widget for Video<'a> {
             .dedup()
             .collect();
 
-        Text::new(&self.localized_strings.get("hud.settings.refresh_rate"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-refresh_rate"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.flashing_lights_label, 25.0)
@@ -1422,10 +1442,12 @@ impl<'a> Widget for Video<'a> {
             .set(state.ids.refresh_rate_label, ui);
 
         if let Some(clicked) = DropDownList::new(
-            once(String::from(self.localized_strings.get("common.automatic")))
-                .chain(refresh_rates.iter().map(|rate| format!("{}", rate)))
-                .collect::<Vec<String>>()
-                .as_slice(),
+            once(String::from(
+                self.localized_strings.get_msg("common-automatic"),
+            ))
+            .chain(refresh_rates.iter().map(|rate| format!("{}", rate)))
+            .collect::<Vec<String>>()
+            .as_slice(),
             match self.global_state.settings.graphics.fullscreen.refresh_rate {
                 Some(refresh_rate) => refresh_rates
                     .iter()
@@ -1453,7 +1475,7 @@ impl<'a> Widget for Video<'a> {
         }
 
         // Fullscreen
-        Text::new(&self.localized_strings.get("hud.settings.fullscreen"))
+        Text::new(&self.localized_strings.get_msg("hud-settings-fullscreen"))
             .font_size(self.fonts.cyri.scale(14))
             .font_id(self.fonts.cyri.conrod_id)
             .down_from(state.ids.resolution, 8.0)
@@ -1479,21 +1501,25 @@ impl<'a> Widget for Video<'a> {
         }
 
         // Fullscreen Mode
-        Text::new(&self.localized_strings.get("hud.settings.fullscreen_mode"))
-            .down_from(state.ids.fullscreen_label, 8.0)
-            .font_size(self.fonts.cyri.scale(14))
-            .font_id(self.fonts.cyri.conrod_id)
-            .color(TEXT_COLOR)
-            .set(state.ids.fullscreen_mode_text, ui);
+        Text::new(
+            &self
+                .localized_strings
+                .get_msg("hud-settings-fullscreen_mode"),
+        )
+        .down_from(state.ids.fullscreen_label, 8.0)
+        .font_size(self.fonts.cyri.scale(14))
+        .font_id(self.fonts.cyri.conrod_id)
+        .color(TEXT_COLOR)
+        .set(state.ids.fullscreen_mode_text, ui);
 
         let mode_list = [FullscreenMode::Exclusive, FullscreenMode::Borderless];
         let mode_label_list = [
             &self
                 .localized_strings
-                .get("hud.settings.fullscreen_mode.exclusive"),
+                .get_msg("hud-settings-fullscreen_mode-exclusive"),
             &self
                 .localized_strings
-                .get("hud.settings.fullscreen_mode.borderless"),
+                .get_msg("hud-settings-fullscreen_mode-borderless"),
         ];
 
         // Get which fullscreen mode is currently active
@@ -1521,7 +1547,11 @@ impl<'a> Widget for Video<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .down_from(state.ids.fullscreen_mode_list, 12.0)
-            .label(&self.localized_strings.get("hud.settings.save_window_size"))
+            .label(
+                &self
+                    .localized_strings
+                    .get_msg("hud-settings-save_window_size"),
+            )
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
@@ -1545,7 +1575,11 @@ impl<'a> Widget for Video<'a> {
             .press_image(self.imgs.button_press)
             .down_from(state.ids.fullscreen_mode_list, 12.0)
             .right_from(state.ids.save_window_size_button, 12.0)
-            .label(&self.localized_strings.get("hud.settings.reset_graphics"))
+            .label(
+                &self
+                    .localized_strings
+                    .get_msg("hud-settings-reset_graphics"),
+            )
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs
index b71577d4dd..d9e0ac459f 100644
--- a/voxygen/src/hud/skillbar.rs
+++ b/voxygen/src/hud/skillbar.rs
@@ -333,7 +333,7 @@ impl<'a> Skillbar<'a> {
             .controls
             .get_binding(GameInput::Respawn)
         {
-            Text::new(&localized_strings.get("hud.you_died"))
+            Text::new(&localized_strings.get_msg("hud-you_died"))
                 .middle_of(ui.window)
                 .font_size(self.fonts.cyri.scale(50))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -349,7 +349,7 @@ impl<'a> Skillbar<'a> {
                 .font_id(self.fonts.cyri.conrod_id)
                 .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
                 .set(state.ids.death_message_2_bg, ui);
-            Text::new(&localized_strings.get("hud.you_died"))
+            Text::new(&localized_strings.get_msg("hud-you_died"))
                 .bottom_left_with_margins_on(state.ids.death_message_1_bg, 2.0, 2.0)
                 .font_size(self.fonts.cyri.scale(50))
                 .font_id(self.fonts.cyri.conrod_id)
@@ -455,8 +455,12 @@ impl<'a> Skillbar<'a> {
         // Bar Text
         let bar_text = if self.health.is_dead {
             Some((
-                self.localized_strings.get("hud.group.dead").into_owned(),
-                self.localized_strings.get("hud.group.dead").into_owned(),
+                self.localized_strings
+                    .get_msg("hud-group-dead")
+                    .into_owned(),
+                self.localized_strings
+                    .get_msg("hud-group-dead")
+                    .into_owned(),
             ))
         } else if let BarNumbers::Values = bar_values {
             Some((
diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs
index 3e55c4905a..3c5a8b6fd8 100644
--- a/voxygen/src/hud/social.rs
+++ b/voxygen/src/hud/social.rs
@@ -159,7 +159,7 @@ impl<'a> Widget for Social<'a> {
         Rectangle::fill_with([212.0, 42.0], color::TRANSPARENT)
             .top_left_with_margins_on(state.ids.frame, 2.0, 44.0)
             .set(state.ids.title_align, ui);
-        Text::new(&self.localized_strings.get("hud.social"))
+        Text::new(&self.localized_strings.get_msg("hud-social"))
             .middle_of(state.ids.title_align)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(20))
@@ -184,7 +184,7 @@ impl<'a> Widget for Social<'a> {
             .set(state.ids.scrollbar, ui);
 
         // Online Text
-        Text::new(&self.localized_strings.get("hud.social.online"))
+        Text::new(&self.localized_strings.get_msg("hud-social-online"))
             .bottom_left_with_margins_on(state.ids.frame, 18.0, 10.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(14))
@@ -255,12 +255,12 @@ impl<'a> Widget for Social<'a> {
                 None => format!(
                     "{} [{}]",
                     alias.clone(),
-                    self.localized_strings.get("hud.group.in_menu")
+                    self.localized_strings.get_msg("hud-group-in_menu")
                 ), // character select or spectating
             };
             let acc_name_txt = format!(
                 "{}: {}",
-                &self.localized_strings.get("hud.social.account"),
+                &self.localized_strings.get_msg("hud-social-account"),
                 alias
             );
             // Player name widget
@@ -347,7 +347,7 @@ impl<'a> Widget for Social<'a> {
             })
             .flatten();
 
-        let invite_text = self.localized_strings.get("hud.group.invite");
+        let invite_text = self.localized_strings.get_msg("hud-group-invite");
         let invite_button = Button::image(self.imgs.button)
             .w_h(106.0, 26.0)
             .bottom_right_with_margins_on(state.ids.frame, 9.0, 7.0)
@@ -381,7 +381,7 @@ impl<'a> Widget for Social<'a> {
                 "{}/{} {}",
                 current_members + current_invites,
                 max_members,
-                &self.localized_strings.get("hud.group.members")
+                &self.localized_strings.get_msg("hud-group-members")
             );
             invite_button
                 .with_tooltip(
diff --git a/voxygen/src/hud/trade.rs b/voxygen/src/hud/trade.rs
index 6a3b299e8b..16b3553082 100644
--- a/voxygen/src/hud/trade.rs
+++ b/voxygen/src/hud/trade.rs
@@ -140,13 +140,13 @@ impl<'a> Trade<'a> {
     }
 
     fn title(&mut self, state: &mut ConrodState<'_, State>, ui: &mut UiCell<'_>) {
-        Text::new(&self.localized_strings.get("hud.trade.trade_window"))
+        Text::new(&self.localized_strings.get_msg("hud-trade-trade_window"))
             .mid_top_with_margin_on(state.ids.bg_frame, 9.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(20))
             .color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
             .set(state.ids.trade_title_bg, ui);
-        Text::new(&self.localized_strings.get("hud.trade.trade_window"))
+        Text::new(&self.localized_strings.get_msg("hud-trade-trade_window"))
             .top_left_with_margins_on(state.ids.trade_title_bg, 2.0, 2.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(20))
@@ -161,9 +161,15 @@ impl<'a> Trade<'a> {
         trade: &'a PendingTrade,
     ) {
         let phase_text = match trade.phase() {
-            TradePhase::Mutate => self.localized_strings.get("hud.trade.phase1_description"),
-            TradePhase::Review => self.localized_strings.get("hud.trade.phase2_description"),
-            TradePhase::Complete => self.localized_strings.get("hud.trade.phase3_description"),
+            TradePhase::Mutate => self
+                .localized_strings
+                .get_msg("hud-trade-phase1_description"),
+            TradePhase::Review => self
+                .localized_strings
+                .get_msg("hud-trade-phase2_description"),
+            TradePhase::Complete => self
+                .localized_strings
+                .get_msg("hud-trade-phase3_description"),
         };
 
         Text::new(&phase_text)
@@ -223,11 +229,11 @@ impl<'a> Trade<'a> {
 
         let offer_header = if ours {
             self.localized_strings
-                .get("hud.trade.your_offer")
+                .get_msg("hud-trade-your_offer")
                 .to_owned()
         } else {
             self.localized_strings
-                .get("hud.trade.their_offer")
+                .get_msg("hud-trade-their_offer")
                 .to_owned()
         };
 
@@ -515,7 +521,7 @@ impl<'a> Trade<'a> {
             .press_image(press_img)
             .image_color(accept_button_luminance)
             .bottom_left_with_margins_on(state.ids.bg, 90.0, 47.0)
-            .label(&self.localized_strings.get("hud.trade.accept"))
+            .label(&self.localized_strings.get_msg("hud-trade-accept"))
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
@@ -531,7 +537,7 @@ impl<'a> Trade<'a> {
             .hover_image(self.imgs.button_hover)
             .press_image(self.imgs.button_press)
             .right_from(state.ids.accept_button, 20.0)
-            .label(&self.localized_strings.get("hud.trade.decline"))
+            .label(&self.localized_strings.get_msg("hud-trade-decline"))
             .label_font_size(self.fonts.cyri.scale(14))
             .label_color(TEXT_COLOR)
             .label_font_id(self.fonts.cyri.conrod_id)
@@ -662,7 +668,7 @@ impl<'a> Trade<'a> {
             }
         } else {
             // placeholder text when no trade slot is selected
-            Text::new(&self.localized_strings.get("hud.trade.amount_input"))
+            Text::new(&self.localized_strings.get_msg("hud-trade-amount_input"))
                 .middle_of(state.ids.amount_bg)
                 .font_id(self.fonts.cyri.conrod_id)
                 .font_size(self.fonts.cyri.scale(14))
diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs
index 2e8d47561c..199859ed0b 100644
--- a/voxygen/src/hud/util.rs
+++ b/voxygen/src/hud/util.rs
@@ -44,15 +44,15 @@ pub fn price_desc(
             let deal_goodness = deal_goodness.log(2.0);
             let buy_string = format!(
                 "{} : {:0.1} {}",
-                i18n.get("hud.trade.buy_price"),
+                i18n.get_msg("hud-trade-buy_price"),
                 buyprice / coinprice,
-                i18n.get("hud.trade.coin"),
+                i18n.get_msg("hud-trade-coin"),
             );
             let sell_string = format!(
                 "{} : {:0.1} {}",
-                i18n.get("hud.trade.sell_price"),
+                i18n.get_msg("hud-trade-sell_price"),
                 sellprice / coinprice,
-                i18n.get("hud.trade.coin"),
+                i18n.get_msg("hud-trade-coin"),
             );
             let deal_goodness = match deal_goodness {
                 x if x < -2.5 => 0.0,
@@ -82,30 +82,30 @@ pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> {
             if let Some(toolkind) = mc.toolkind() {
                 Cow::Owned(format!(
                     "{} {}",
-                    i18n.get(&format!("common.weapons.{}", toolkind.identifier_name())),
-                    i18n.get("common.kind.modular_component_partial")
+                    i18n.get_msg(&format!("common-weapons-{}", toolkind.identifier_name())),
+                    i18n.get_msg("common-kind-modular_component_partial")
                 ))
             } else {
-                i18n.get("common.kind.modular_component")
+                i18n.get_msg("common-kind-modular_component")
             }
         },
-        ItemKind::Glider => i18n.get("common.kind.glider"),
-        ItemKind::Consumable { .. } => i18n.get("common.kind.consumable"),
-        ItemKind::Throwable { .. } => i18n.get("common.kind.throwable"),
-        ItemKind::Utility { .. } => i18n.get("common.kind.utility"),
-        ItemKind::Ingredient { .. } => i18n.get("common.kind.ingredient"),
-        ItemKind::Lantern { .. } => i18n.get("common.kind.lantern"),
+        ItemKind::Glider => i18n.get_msg("common-kind-glider"),
+        ItemKind::Consumable { .. } => i18n.get_msg("common-kind-consumable"),
+        ItemKind::Throwable { .. } => i18n.get_msg("common-kind-throwable"),
+        ItemKind::Utility { .. } => i18n.get_msg("common-kind-utility"),
+        ItemKind::Ingredient { .. } => i18n.get_msg("common-kind-ingredient"),
+        ItemKind::Lantern { .. } => i18n.get_msg("common-kind-lantern"),
         ItemKind::TagExamples { .. } => Cow::Borrowed(""),
     }
 }
 
 pub fn material_kind_text<'a>(kind: &MaterialKind, i18n: &'a Localization) -> Cow<'a, str> {
     match kind {
-        MaterialKind::Metal { .. } => i18n.get("common.material.metal"),
-        MaterialKind::Wood { .. } => i18n.get("common.material.wood"),
-        MaterialKind::Stone { .. } => i18n.get("common.material.stone"),
-        MaterialKind::Cloth { .. } => i18n.get("common.material.cloth"),
-        MaterialKind::Hide { .. } => i18n.get("common.material.hide"),
+        MaterialKind::Metal { .. } => i18n.get_msg("common-material-metal"),
+        MaterialKind::Wood { .. } => i18n.get_msg("common-material-wood"),
+        MaterialKind::Stone { .. } => i18n.get_msg("common-material-stone"),
+        MaterialKind::Cloth { .. } => i18n.get_msg("common-material-cloth"),
+        MaterialKind::Hide { .. } => i18n.get_msg("common-material-hide"),
     }
 }
 
@@ -161,7 +161,7 @@ pub fn consumable_desc(effects: &[Effect], i18n: &Localization) -> Vec<String> {
                         "strength" => format_float(strength),
                     })
                 },
-                BuffKind::Invulnerability => i18n.get("buff.stat.invulnerability"),
+                BuffKind::Invulnerability => i18n.get_msg("buff-stat-invulnerability"),
                 BuffKind::Bleeding
                 | BuffKind::Burning
                 | BuffKind::CampfireHeal
@@ -207,7 +207,7 @@ pub fn consumable_desc(effects: &[Effect], i18n: &Localization) -> Vec<String> {
                     | BuffKind::Hastened => Cow::Borrowed(""),
                 }
             } else if let BuffKind::Saturation | BuffKind::Regeneration = buff.kind {
-                i18n.get("buff.text.every_second")
+                i18n.get_msg("buff-text-every_second")
             } else {
                 Cow::Borrowed("")
             };
@@ -223,18 +223,18 @@ pub fn consumable_desc(effects: &[Effect], i18n: &Localization) -> Vec<String> {
 // Armor
 fn armor_kind<'a>(armor: &Armor, i18n: &'a Localization) -> Cow<'a, str> {
     let kind = match armor.kind {
-        ArmorKind::Shoulder => i18n.get("hud.bag.shoulders"),
-        ArmorKind::Chest => i18n.get("hud.bag.chest"),
-        ArmorKind::Belt => i18n.get("hud.bag.belt"),
-        ArmorKind::Hand => i18n.get("hud.bag.hands"),
-        ArmorKind::Pants => i18n.get("hud.bag.legs"),
-        ArmorKind::Foot => i18n.get("hud.bag.feet"),
-        ArmorKind::Back => i18n.get("hud.bag.back"),
-        ArmorKind::Ring => i18n.get("hud.bag.ring"),
-        ArmorKind::Neck => i18n.get("hud.bag.neck"),
-        ArmorKind::Head => i18n.get("hud.bag.head"),
-        ArmorKind::Tabard => i18n.get("hud.bag.tabard"),
-        ArmorKind::Bag => i18n.get("hud.bag.bag"),
+        ArmorKind::Shoulder => i18n.get_msg("hud-bag-shoulders"),
+        ArmorKind::Chest => i18n.get_msg("hud-bag-chest"),
+        ArmorKind::Belt => i18n.get_msg("hud-bag-belt"),
+        ArmorKind::Hand => i18n.get_msg("hud-bag-hands"),
+        ArmorKind::Pants => i18n.get_msg("hud-bag-legs"),
+        ArmorKind::Foot => i18n.get_msg("hud-bag-feet"),
+        ArmorKind::Back => i18n.get_msg("hud-bag-back"),
+        ArmorKind::Ring => i18n.get_msg("hud-bag-ring"),
+        ArmorKind::Neck => i18n.get_msg("hud-bag-neck"),
+        ArmorKind::Head => i18n.get_msg("hud-bag-head"),
+        ArmorKind::Tabard => i18n.get_msg("hud-bag-tabard"),
+        ArmorKind::Bag => i18n.get_msg("hud-bag-bag"),
     };
     kind
 }
@@ -242,21 +242,21 @@ fn armor_kind<'a>(armor: &Armor, i18n: &'a Localization) -> Cow<'a, str> {
 // Tool
 fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> Cow<'a, str> {
     let kind = match tool.kind {
-        ToolKind::Sword => i18n.get("common.weapons.sword"),
-        ToolKind::Axe => i18n.get("common.weapons.axe"),
-        ToolKind::Hammer => i18n.get("common.weapons.hammer"),
-        ToolKind::Bow => i18n.get("common.weapons.bow"),
-        ToolKind::Dagger => i18n.get("common.weapons.dagger"),
-        ToolKind::Staff => i18n.get("common.weapons.staff"),
-        ToolKind::Sceptre => i18n.get("common.weapons.sceptre"),
-        ToolKind::Shield => i18n.get("common.weapons.shield"),
-        ToolKind::Spear => i18n.get("common.weapons.spear"),
-        ToolKind::Blowgun => i18n.get("common.weapons.blowgun"),
-        ToolKind::Natural => i18n.get("common.weapons.natural"),
-        ToolKind::Debug => i18n.get("common.tool.debug"),
-        ToolKind::Farming => i18n.get("common.tool.farming"),
-        ToolKind::Pick => i18n.get("common.tool.pick"),
-        ToolKind::Empty => i18n.get("common.empty"),
+        ToolKind::Sword => i18n.get_msg("common-weapons-sword"),
+        ToolKind::Axe => i18n.get_msg("common-weapons-axe"),
+        ToolKind::Hammer => i18n.get_msg("common-weapons-hammer"),
+        ToolKind::Bow => i18n.get_msg("common-weapons-bow"),
+        ToolKind::Dagger => i18n.get_msg("common-weapons-dagger"),
+        ToolKind::Staff => i18n.get_msg("common-weapons-staff"),
+        ToolKind::Sceptre => i18n.get_msg("common-weapons-sceptre"),
+        ToolKind::Shield => i18n.get_msg("common-weapons-shield"),
+        ToolKind::Spear => i18n.get_msg("common-weapons-spear"),
+        ToolKind::Blowgun => i18n.get_msg("common-weapons-blowgun"),
+        ToolKind::Natural => i18n.get_msg("common-weapons-natural"),
+        ToolKind::Debug => i18n.get_msg("common-tool-debug"),
+        ToolKind::Farming => i18n.get_msg("common-tool-farming"),
+        ToolKind::Pick => i18n.get_msg("common-tool-pick"),
+        ToolKind::Empty => i18n.get_msg("common-empty"),
     };
     kind
 }
@@ -264,8 +264,8 @@ fn tool_kind<'a>(tool: &Tool, i18n: &'a Localization) -> Cow<'a, str> {
 /// Output the number of hands needed to hold a tool
 pub fn tool_hands<'a>(tool: &Tool, i18n: &'a Localization) -> Cow<'a, str> {
     let hands = match tool.hands {
-        Hands::One => i18n.get("common.hands.one"),
-        Hands::Two => i18n.get("common.hands.two"),
+        Hands::One => i18n.get_msg("common-hands-one"),
+        Hands::Two => i18n.get_msg("common-hands-two"),
     };
     hands
 }
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index 00ec248e99..3fbbf7e212 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -224,7 +224,7 @@ impl PlayState for CharSelectionState {
                             client::Event::Disconnect => {
                                 global_state.info_message = Some(
                                     localized_strings
-                                        .get("main.login.server_shut_down")
+                                        .get_msg("main-login-server_shut_down")
                                         .into_owned(),
                                 );
                                 return PlayStateResult::Pop;
@@ -240,8 +240,11 @@ impl PlayState for CharSelectionState {
                     }
                 },
                 Err(err) => {
-                    global_state.info_message =
-                        Some(localized_strings.get("common.connection_lost").into_owned());
+                    global_state.info_message = Some(
+                        localized_strings
+                            .get_msg("common-connection_lost")
+                            .into_owned(),
+                    );
                     error!(?err, "[char_selection] Failed to tick the client");
                     return PlayStateResult::Pop;
                 },
diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs
index cb05e6ed36..97e1b2a1e6 100644
--- a/voxygen/src/menu/char_selection/ui/mod.rs
+++ b/voxygen/src/menu/char_selection/ui/mod.rs
@@ -444,7 +444,7 @@ impl Controls {
                     // instead of directly showing error message here
                     *info_content = Some(InfoContent::CharacterError(format!(
                         "{}: {}",
-                        i18n.get("common.error"),
+                        i18n.get_msg("common-error"),
                         error
                     )))
                 } else if let Some(InfoContent::CharacterError(_)) = info_content {
@@ -559,7 +559,7 @@ impl Controls {
                                                     .into(),
                                                 Text::new(
                                                     // TODO: Add actual location here
-                                                    i18n.get("char_selection.uncanny_valley"),
+                                                    i18n.get_msg("char_selection-uncanny_valley"),
                                                 )
                                                 .into(),
                                             ]),
@@ -605,7 +605,7 @@ impl Controls {
                             let button = Button::new(
                                 new_character_button,
                                 Container::new(Text::new(
-                                    i18n.get("char_selection.create_new_character"),
+                                    i18n.get_msg("char_selection-create_new_character"),
                                 ))
                                 .width(Length::Fill)
                                 .height(Length::Fill)
@@ -684,7 +684,7 @@ impl Controls {
                 let mut bottom_content = vec![
                     Container::new(neat_button(
                         logout_button,
-                        i18n.get("char_selection.logout").into_owned(),
+                        i18n.get_msg("char_selection-logout").into_owned(),
                         FILL_FRAC_ONE,
                         button_style,
                         Some(Message::Logout),
@@ -698,7 +698,7 @@ impl Controls {
                     bottom_content.push(
                         Container::new(neat_button(
                             spectate_button,
-                            i18n.get("char_selection.spectate").into_owned(),
+                            i18n.get_msg("char_selection-spectate").into_owned(),
                             FILL_FRAC_TWO,
                             button_style,
                             Some(Message::Spectate),
@@ -713,7 +713,7 @@ impl Controls {
                 bottom_content.push(
                     Container::new(neat_button(
                         enter_world_button,
-                        i18n.get("char_selection.enter_world").into_owned(),
+                        i18n.get_msg("char_selection-enter_world").into_owned(),
                         FILL_FRAC_TWO,
                         button_style,
                         selected.map(|_| Message::EnterWorld),
@@ -737,20 +737,20 @@ impl Controls {
                 if let Some(info_content) = info_content {
                     let over_content: Element<_> = match &info_content {
                         InfoContent::Deletion(_) => Column::with_children(vec![
-                            Text::new(i18n.get("char_selection.delete_permanently"))
+                            Text::new(i18n.get_msg("char_selection-delete_permanently"))
                                 .size(fonts.cyri.scale(24))
                                 .into(),
                             Row::with_children(vec![
                                 neat_button(
                                     no_button,
-                                    i18n.get("common.no").into_owned(),
+                                    i18n.get_msg("common-no").into_owned(),
                                     FILL_FRAC_ONE,
                                     button_style,
                                     Some(Message::CancelDeletion),
                                 ),
                                 neat_button(
                                     yes_button,
-                                    i18n.get("common.yes").into_owned(),
+                                    i18n.get_msg("common-yes").into_owned(),
                                     FILL_FRAC_ONE,
                                     button_style,
                                     Some(Message::ConfirmDeletion),
@@ -764,22 +764,22 @@ impl Controls {
                         .spacing(10)
                         .into(),
                         InfoContent::LoadingCharacters => {
-                            Text::new(i18n.get("char_selection.loading_characters"))
+                            Text::new(i18n.get_msg("char_selection-loading_characters"))
                                 .size(fonts.cyri.scale(24))
                                 .into()
                         },
                         InfoContent::CreatingCharacter => {
-                            Text::new(i18n.get("char_selection.creating_character"))
+                            Text::new(i18n.get_msg("char_selection-creating_character"))
                                 .size(fonts.cyri.scale(24))
                                 .into()
                         },
                         InfoContent::EditingCharacter => {
-                            Text::new(i18n.get("char_selection.editing_character"))
+                            Text::new(i18n.get_msg("char_selection-editing_character"))
                                 .size(fonts.cyri.scale(24))
                                 .into()
                         },
                         InfoContent::DeletingCharacter => {
-                            Text::new(i18n.get("char_selection.deleting_character"))
+                            Text::new(i18n.get_msg("char_selection-deleting_character"))
                                 .size(fonts.cyri.scale(24))
                                 .into()
                         },
@@ -787,7 +787,7 @@ impl Controls {
                             Text::new(error).size(fonts.cyri.scale(24)).into(),
                             Row::with_children(vec![neat_button(
                                 no_button,
-                                i18n.get("common.close").into_owned(),
+                                i18n.get_msg("common-close").into_owned(),
                                 FILL_FRAC_ONE,
                                 button_style,
                                 Some(Message::ClearCharacterListError),
@@ -871,7 +871,7 @@ impl Controls {
                     icon_button(button, selected, msg, img).with_tooltip(
                         tooltip_manager,
                         move || {
-                            let tooltip_text = i18n.get(tooltip_i18n_key);
+                            let tooltip_text = i18n.get_msg(tooltip_i18n_key);
                             tooltip::text(&tooltip_text, tooltip_style)
                         },
                     )
@@ -941,7 +941,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Human),
                                 Message::Species(humanoid::Species::Human),
                                 human_icon,
-                                "common.species.human",
+                                "common-species-human",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -949,7 +949,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Orc),
                                 Message::Species(humanoid::Species::Orc),
                                 orc_icon,
-                                "common.species.orc",
+                                "common-species-orc",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -957,7 +957,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Dwarf),
                                 Message::Species(humanoid::Species::Dwarf),
                                 dwarf_icon,
-                                "common.species.dwarf",
+                                "common-species-dwarf",
                             )
                             .into(),
                         ])
@@ -969,7 +969,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Elf),
                                 Message::Species(humanoid::Species::Elf),
                                 elf_icon,
-                                "common.species.elf",
+                                "common-species-elf",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -977,7 +977,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Draugr),
                                 Message::Species(humanoid::Species::Draugr),
                                 draugr_icon,
-                                "common.species.draugr",
+                                "common-species-draugr",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -985,7 +985,7 @@ impl Controls {
                                 matches!(body.species, humanoid::Species::Danari),
                                 Message::Species(humanoid::Species::Danari),
                                 danari_icon,
-                                "common.species.danari",
+                                "common-species-danari",
                             )
                             .into(),
                         ])
@@ -1008,7 +1008,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_SWORD),
                                 Message::Tool((Some(STARTER_SWORD), None)),
                                 imgs.sword,
-                                "common.weapons.greatsword",
+                                "common-weapons-greatsword",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -1016,7 +1016,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_HAMMER),
                                 Message::Tool((Some(STARTER_HAMMER), None)),
                                 imgs.hammer,
-                                "common.weapons.hammer",
+                                "common-weapons-hammer",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -1024,7 +1024,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_AXE),
                                 Message::Tool((Some(STARTER_AXE), None)),
                                 imgs.axe,
-                                "common.weapons.axe",
+                                "common-weapons-axe",
                             )
                             .into(),
                         ])
@@ -1036,7 +1036,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_SWORDS),
                                 Message::Tool((Some(STARTER_SWORDS), Some(STARTER_SWORDS))),
                                 imgs.swords,
-                                "common.weapons.shortswords",
+                                "common-weapons-shortswords",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -1044,7 +1044,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_BOW),
                                 Message::Tool((Some(STARTER_BOW), None)),
                                 imgs.bow,
-                                "common.weapons.bow",
+                                "common-weapons-bow",
                             )
                             .into(),
                             icon_button_tooltip(
@@ -1052,7 +1052,7 @@ impl Controls {
                                 *mainhand == Some(STARTER_STAFF),
                                 Message::Tool((Some(STARTER_STAFF), None)),
                                 imgs.staff,
-                                "common.weapons.staff",
+                                "common-weapons-staff",
                             )
                             .into(),
                         ])
@@ -1137,7 +1137,7 @@ impl Controls {
 
                 let slider_options = Column::with_children(vec![
                     char_slider(
-                        i18n.get("char_selection.hair_style").into_owned(),
+                        i18n.get_msg("char_selection-hair_style").into_owned(),
                         &mut sliders.hair_style,
                         body.species.num_hair_styles(body.body_type) - 1,
                         body.hair_style,
@@ -1145,7 +1145,7 @@ impl Controls {
                         (fonts, imgs),
                     ),
                     char_slider(
-                        i18n.get("char_selection.hair_color").into_owned(),
+                        i18n.get_msg("char_selection-hair_color").into_owned(),
                         &mut sliders.hair_color,
                         body.species.num_hair_colors() - 1,
                         body.hair_color,
@@ -1153,7 +1153,7 @@ impl Controls {
                         (fonts, imgs),
                     ),
                     char_slider(
-                        i18n.get("char_selection.skin").into_owned(),
+                        i18n.get_msg("char_selection-skin").into_owned(),
                         &mut sliders.skin,
                         body.species.num_skin_colors() - 1,
                         body.skin,
@@ -1161,7 +1161,7 @@ impl Controls {
                         (fonts, imgs),
                     ),
                     char_slider(
-                        i18n.get("char_selection.eyeshape").into_owned(),
+                        i18n.get_msg("char_selection-eyeshape").into_owned(),
                         &mut sliders.eyes,
                         body.species.num_eyes(body.body_type) - 1,
                         body.eyes,
@@ -1169,7 +1169,7 @@ impl Controls {
                         (fonts, imgs),
                     ),
                     char_slider(
-                        i18n.get("char_selection.eye_color").into_owned(),
+                        i18n.get_msg("char_selection-eye_color").into_owned(),
                         &mut sliders.eye_color,
                         body.species.num_eye_colors() - 1,
                         body.eye_color,
@@ -1178,7 +1178,7 @@ impl Controls {
                     ),
                     char_slider_greyable(
                         body.species.num_accessories(body.body_type) > 1,
-                        i18n.get("char_selection.accessories").into_owned(),
+                        i18n.get_msg("char_selection-accessories").into_owned(),
                         &mut sliders.accessory,
                         body.species.num_accessories(body.body_type) - 1,
                         body.accessory,
@@ -1187,7 +1187,7 @@ impl Controls {
                     ),
                     char_slider_greyable(
                         body.species.num_beards(body.body_type) > 1,
-                        i18n.get("char_selection.beard").into_owned(),
+                        i18n.get_msg("char_selection-beard").into_owned(),
                         &mut sliders.beard,
                         body.species.num_beards(body.body_type) - 1,
                         body.beard,
@@ -1210,7 +1210,7 @@ impl Controls {
                 )
                 .on_press(Message::RandomizeCharacter)
                 .with_tooltip(tooltip_manager, move || {
-                    let tooltip_text = i18n.get("common.rand_appearance");
+                    let tooltip_text = i18n.get_msg("common-rand_appearance");
                     tooltip::text(&tooltip_text, tooltip_style)
                 });
 
@@ -1270,7 +1270,7 @@ impl Controls {
 
                 let back = neat_button(
                     back_button,
-                    i18n.get("common.back").into_owned(),
+                    i18n.get_msg("common-back").into_owned(),
                     FILL_FRAC_ONE,
                     button_style,
                     Some(Message::Back),
@@ -1288,7 +1288,7 @@ impl Controls {
                 )
                 .on_press(Message::RandomizeName)
                 .with_tooltip(tooltip_manager, move || {
-                    let tooltip_text = i18n.get("common.rand_name");
+                    let tooltip_text = i18n.get_msg("common-rand_name");
                     tooltip::text(&tooltip_text, tooltip_style)
                 });
 
@@ -1304,7 +1304,7 @@ impl Controls {
                         .fix_aspect_ratio(),
                     TextInput::new(
                         name_input,
-                        &i18n.get("character_window.character_name"),
+                        &i18n.get_msg("character_window-character_name"),
                         name,
                         Message::Name,
                     )
@@ -1328,10 +1328,10 @@ impl Controls {
 
                 let create = neat_button(
                     create_button,
-                    i18n.get(if character_id.is_some() {
-                        "common.confirm"
+                    i18n.get_msg(if character_id.is_some() {
+                        "common-confirm"
                     } else {
-                        "common.create"
+                        "common-create"
                     }),
                     FILL_FRAC_ONE,
                     button_style,
@@ -1341,7 +1341,7 @@ impl Controls {
                 let create: Element<Message> = if name.is_empty() {
                     create
                         .with_tooltip(tooltip_manager, move || {
-                            let tooltip_text = i18n.get("char_selection.create_info_name");
+                            let tooltip_text = i18n.get_msg("char_selection-create_info_name");
                             tooltip::text(&tooltip_text, tooltip_style)
                         })
                         .into()
@@ -1379,10 +1379,10 @@ impl Controls {
         if let Some(mismatched_version) = &self.server_mismatched_version {
             let warning = Text::<IcedRenderer>::new(format!(
                 "{}\n{}: {} {}: {}",
-                i18n.get("char_selection.version_mismatch"),
-                i18n.get("main.login.server_version"),
+                i18n.get_msg("char_selection-version_mismatch"),
+                i18n.get_msg("main-login-server_version"),
                 mismatched_version,
-                i18n.get("main.login.client_version"),
+                i18n.get_msg("main-login-client_version"),
                 *common::util::GIT_HASH
             ))
             .size(self.fonts.cyri.scale(18))
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 772631e4a0..88246035b1 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -240,7 +240,7 @@ impl PlayState for MainMenuState {
                             client::Event::Disconnect => {
                                 global_state.info_message = Some(
                                     localized_strings
-                                        .get("main.login.server_shut_down")
+                                        .get_msg("main-login-server_shut_down")
                                         .into_owned(),
                                 );
                                 self.init = InitState::None;
@@ -250,8 +250,11 @@ impl PlayState for MainMenuState {
                     }
                 },
                 Err(err) => {
-                    global_state.info_message =
-                        Some(localized_strings.get("common.connection_lost").into_owned());
+                    global_state.info_message = Some(
+                        localized_strings
+                            .get_msg("common-connection_lost")
+                            .into_owned(),
+                    );
                     error!(?err, "[main menu] Failed to tick the client");
                     self.init = InitState::None;
                 },
@@ -420,18 +423,18 @@ fn get_client_msg_error(
         if let Some(server_info) = mismatched_server_info {
             format!(
                 "{} {}: {} ({}) {}: {} ({})",
-                localization.get("main.login.network_wrong_version"),
-                localization.get("main.login.client_version"),
+                localization.get_msg("main-login-network_wrong_version"),
+                localization.get_msg("main-login-client_version"),
                 &*common::util::GIT_HASH,
                 &*common::util::GIT_DATE,
-                localization.get("main.login.server_version"),
+                localization.get_msg("main-login-server_version"),
                 server_info.git_hash,
                 server_info.git_date,
             )
         } else {
             format!(
                 "{}: {}",
-                localization.get("main.login.network_error"),
+                localization.get_msg("main-login-network_error"),
                 error
             )
         }
@@ -444,30 +447,34 @@ fn get_client_msg_error(
             mismatched_server_info,
         } => match error {
             Error::SpecsErr(e) => {
-                format!("{}: {}", localization.get("main.login.internal_error"), e)
+                format!(
+                    "{}: {}",
+                    localization.get_msg("main-login-internal_error"),
+                    e
+                )
             },
             Error::AuthErr(e) => format!(
                 "{}: {}",
-                localization.get("main.login.authentication_error"),
+                localization.get_msg("main-login-authentication_error"),
                 e
             ),
             Error::Kicked(e) => e,
-            Error::TooManyPlayers => localization.get("main.login.server_full").into(),
-            Error::AuthServerNotTrusted => {
-                localization.get("main.login.untrusted_auth_server").into()
-            },
-            Error::ServerTimeout => localization.get("main.login.timeout").into(),
-            Error::ServerShutdown => localization.get("main.login.server_shut_down").into(),
-            Error::NotOnWhitelist => localization.get("main.login.not_on_whitelist").into(),
+            Error::TooManyPlayers => localization.get_msg("main-login-server_full").into(),
+            Error::AuthServerNotTrusted => localization
+                .get_msg("main-login-untrusted_auth_server")
+                .into(),
+            Error::ServerTimeout => localization.get_msg("main-login-timeout").into(),
+            Error::ServerShutdown => localization.get_msg("main-login-server_shut_down").into(),
+            Error::NotOnWhitelist => localization.get_msg("main-login-not_on_whitelist").into(),
             Error::Banned(reason) => {
-                format!("{}: {}", localization.get("main.login.banned"), reason)
+                format!("{}: {}", localization.get_msg("main-login-banned"), reason)
             },
-            Error::InvalidCharacter => localization.get("main.login.invalid_character").into(),
+            Error::InvalidCharacter => localization.get_msg("main-login-invalid_character").into(),
             Error::NetworkErr(NetworkError::ConnectFailed(NetworkConnectError::Handshake(
                 InitProtocolError::WrongVersion(_),
             ))) => net_error(
                 localization
-                    .get("main.login.network_wrong_version")
+                    .get_msg("main-login-network_wrong_version")
                     .into_owned(),
                 mismatched_server_info,
             ),
@@ -475,38 +482,42 @@ fn get_client_msg_error(
             Error::ParticipantErr(e) => net_error(e.to_string(), mismatched_server_info),
             Error::StreamErr(e) => net_error(e.to_string(), mismatched_server_info),
             Error::HostnameLookupFailed(e) => {
-                format!("{}: {}", localization.get("main.login.server_not_found"), e)
+                format!(
+                    "{}: {}",
+                    localization.get_msg("main-login-server_not_found"),
+                    e
+                )
             },
             Error::Other(e) => {
-                format!("{}: {}", localization.get("common.error"), e)
+                format!("{}: {}", localization.get_msg("common-error"), e)
             },
             Error::AuthClientError(e) => match e {
                 // TODO: remove parentheses
                 client::AuthClientError::RequestError(e) => format!(
                     "{}: {}",
-                    localization.get("main.login.failed_sending_request"),
+                    localization.get_msg("main-login-failed_sending_request"),
                     e
                 ),
                 client::AuthClientError::JsonError(e) => format!(
                     "{}: {}",
-                    localization.get("main.login.failed_sending_request"),
+                    localization.get_msg("main-login-failed_sending_request"),
                     e
                 ),
-                client::AuthClientError::InsecureSchema => {
-                    localization.get("main.login.insecure_auth_scheme").into()
-                },
+                client::AuthClientError::InsecureSchema => localization
+                    .get_msg("main-login-insecure_auth_scheme")
+                    .into(),
                 client::AuthClientError::ServerError(_, e) => String::from_utf8_lossy(&e).into(),
             },
             Error::AuthServerUrlInvalid(e) => {
                 format!(
                     "{}: https://{}",
-                    localization.get("main.login.failed_auth_server_url_invalid"),
+                    localization.get_msg("main-login-failed_auth_server_url_invalid"),
                     e
                 )
             },
         },
-        InitError::ClientCrashed => localization.get("main.login.client_crashed").into(),
-        InitError::ServerNotFound => localization.get("main.login.server_not_found").into(),
+        InitError::ClientCrashed => localization.get_msg("main-login-client_crashed").into(),
+        InitError::ServerNotFound => localization.get_msg("main-login-server_not_found").into(),
     }
 }
 
@@ -525,7 +536,7 @@ fn attempt_login(
             comp::AliasError::ForbiddenCharacters => {
                 *info_message = Some(
                     localization
-                        .get("main.login.username_bad_characters")
+                        .get_msg("main-login-username_bad_characters")
                         .into_owned(),
                 );
             },
diff --git a/voxygen/src/menu/main/ui/connecting.rs b/voxygen/src/menu/main/ui/connecting.rs
index 393dd5cf5b..29cd0caacc 100644
--- a/voxygen/src/menu/main/ui/connecting.rs
+++ b/voxygen/src/menu/main/ui/connecting.rs
@@ -102,7 +102,7 @@ impl Screen {
                 let tip = if show_tip {
                     let key = |code| match controls.keybindings.get(&code) {
                         Some(Some(key_mouse)) => key_mouse.display_string(key_layout),
-                        Some(None) => i18n.get("main.unbound_key_tip").into_owned(),
+                        Some(None) => i18n.get_msg("main-unbound_key_tip").into_owned(),
                         None => ControlSettings::default_binding(code).display_string(key_layout),
                     };
                     let keys = i18n::fluent_args! {
@@ -118,7 +118,7 @@ impl Screen {
                         "gameinput-screenshot" => key(GameInput::Screenshot),
                     };
                     let tip = &i18n.get_variation_ctx("loading-tips", self.tip_number, &keys);
-                    let tip = format!("{} {}", i18n.get("main.tip"), tip);
+                    let tip = format!("{} {}", i18n.get_msg("main-tip"), tip);
 
                     Container::new(Text::new(tip).size(fonts.cyri.scale(25)))
                         .width(Length::Fill)
@@ -132,7 +132,7 @@ impl Screen {
 
                 let cancel = Container::new(neat_button(
                     &mut self.cancel_button,
-                    i18n.get("common.cancel"),
+                    i18n.get_msg("common-cancel"),
                     0.7,
                     button_style,
                     Some(Message::CancelConnect),
@@ -190,14 +190,14 @@ impl Screen {
 
                 let cancel = neat_button(
                     &mut self.cancel_button,
-                    i18n.get("common.cancel"),
+                    i18n.get_msg("common-cancel"),
                     0.7,
                     button_style,
                     Some(Message::TrustPromptCancel),
                 );
                 let add = neat_button(
                     &mut self.add_button,
-                    i18n.get("common.add"),
+                    i18n.get_msg("common-add"),
                     0.7,
                     button_style,
                     Some(Message::TrustPromptAdd),
diff --git a/voxygen/src/menu/main/ui/credits.rs b/voxygen/src/menu/main/ui/credits.rs
index f98009a896..d51afe1378 100644
--- a/voxygen/src/menu/main/ui/credits.rs
+++ b/voxygen/src/menu/main/ui/credits.rs
@@ -40,7 +40,7 @@ impl Screen {
                 write!(
                     &mut text,
                     " {} {}",
-                    i18n.get("main.credits.created_by"),
+                    i18n.get_msg("main-credits-created_by"),
                     author
                 )?;
             }
@@ -79,7 +79,7 @@ impl Screen {
         ) -> Element<'a, Message> {
             Column::with_children(
                 core::iter::once(
-                    iced::Text::new(i18n.get(header_i18n_key))
+                    iced::Text::new(i18n.get_msg(header_i18n_key))
                         .font(fonts.cyri.id)
                         .size(fonts.cyri.scale(30))
                         .color(header_color)
@@ -119,7 +119,7 @@ impl Screen {
         Container::new(
             Container::new(
                 Column::with_children(vec![
-                    iced::Text::new(i18n.get("main.credits"))
+                    iced::Text::new(i18n.get_msg("main-credits"))
                         .font(fonts.alkhemi.id)
                         .size(fonts.alkhemi.scale(35))
                         .width(Length::Fill)
@@ -128,22 +128,22 @@ impl Screen {
                     Space::new(Length::Fill, Length::Units(25)).into(),
                     Scrollable::new(&mut self.scroll)
                         .push(art_section(
-                            "main.credits.music",
+                            "main-credits-music",
                             music_header_color,
                             &credits.music,
                         ))
                         .push(art_section(
-                            "main.credits.fonts",
+                            "main-credits-fonts",
                             fonts_header_color,
                             &credits.fonts,
                         ))
                         .push(art_section(
-                            "main.credits.other_art",
+                            "main-credits-other_art",
                             other_art_header_color,
                             &credits.other_art,
                         ))
                         .push(credit_section(
-                            "main.credits.contributors",
+                            "main-credits-contributors",
                             contributors_header_color,
                             credits.contributors.iter(),
                             format_contributor_credit,
@@ -156,7 +156,7 @@ impl Screen {
                     Container::new(
                         Container::new(neat_button(
                             &mut self.back_button,
-                            i18n.get("common.back"),
+                            i18n.get_msg("common-back"),
                             0.7,
                             button_style,
                             Some(Message::Back),
diff --git a/voxygen/src/menu/main/ui/disclaimer.rs b/voxygen/src/menu/main/ui/disclaimer.rs
index 885b29bc15..7a5e05a540 100644
--- a/voxygen/src/menu/main/ui/disclaimer.rs
+++ b/voxygen/src/menu/main/ui/disclaimer.rs
@@ -31,14 +31,14 @@ impl Screen {
         Container::new(
             Container::new(
                 Column::with_children(vec![
-                    iced::Text::new(i18n.get("common.disclaimer"))
+                    iced::Text::new(i18n.get_msg("common-disclaimer"))
                         .font(fonts.alkhemi.id)
                         .size(fonts.alkhemi.scale(35))
                         .into(),
                     Space::new(Length::Fill, Length::Units(20)).into(),
                     Scrollable::new(&mut self.scroll)
                         .push(
-                            iced::Text::new(i18n.get("main.notice"))
+                            iced::Text::new(i18n.get_msg("main-notice"))
                                 .font(fonts.cyri.id)
                                 .size(fonts.cyri.scale(23)),
                         )
@@ -47,7 +47,7 @@ impl Screen {
                     Container::new(
                         Container::new(neat_button(
                             &mut self.accept_button,
-                            i18n.get("common.accept"),
+                            i18n.get_msg("common-accept"),
                             0.7,
                             button_style,
                             Some(Message::AcceptDisclaimer),
diff --git a/voxygen/src/menu/main/ui/login.rs b/voxygen/src/menu/main/ui/login.rs
index 02d14be554..56ccc16ac8 100644
--- a/voxygen/src/menu/main/ui/login.rs
+++ b/voxygen/src/menu/main/ui/login.rs
@@ -67,35 +67,35 @@ impl Screen {
         let buttons = Column::with_children(vec![
             neat_button(
                 &mut self.servers_button,
-                i18n.get("common.servers"),
+                i18n.get_msg("common-servers"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::ShowServers),
             ),
             // neat_button(
             //     &mut self.settings_button,
-            //     i18n.get("common.settings"),
+            //     i18n.get_msg("common-settings"),
             //     FILL_FRAC_ONE,
             //     button_style,
             //     None,
             // ),
             neat_button(
                 &mut self.language_select_button,
-                i18n.get("common.languages"),
+                i18n.get_msg("common-languages"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::OpenLanguageMenu),
             ),
             neat_button(
                 &mut self.credits_button,
-                i18n.get("main.credits"),
+                i18n.get_msg("main-credits"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::ShowCredits),
             ),
             neat_button(
                 &mut self.quit_button,
-                i18n.get("common.quit"),
+                i18n.get_msg("common-quit"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::Quit),
@@ -110,7 +110,7 @@ impl Screen {
             .height(Length::Fill)
             .align_y(Align::End);
 
-        let intro_text = i18n.get("main.login_process");
+        let intro_text = i18n.get_msg("main-login_process");
 
         let info_window = BackgroundContainer::new(
             CompoundGraphic::from_graphics(vec![
@@ -139,7 +139,7 @@ impl Screen {
                     Container::new(Text::new(error)).height(Length::Fill).into(),
                     Container::new(neat_button(
                         &mut self.error_okay_button,
-                        i18n.get("common.okay"),
+                        i18n.get_msg("common-okay"),
                         FILL_FRAC_ONE,
                         button_style,
                         Some(Message::CloseError),
@@ -238,7 +238,7 @@ impl LanguageSelectBanner {
             self.language_buttons = vec![Default::default(); language_metadatas.len()];
         }
 
-        let title = Text::new(i18n.get("main.login.select_language"))
+        let title = Text::new(i18n.get_msg("main-login-select_language"))
             .size(fonts.cyri.scale(35))
             .horizontal_alignment(iced::HorizontalAlignment::Center);
 
@@ -290,7 +290,7 @@ impl LanguageSelectBanner {
 
         let okay_button = Container::new(neat_button(
             &mut self.okay_button,
-            i18n.get("common.okay"),
+            i18n.get_msg("common-okay"),
             FILL_FRAC_TWO,
             button_style,
             Some(Message::OpenLanguageMenu),
@@ -363,7 +363,7 @@ impl LoginBanner {
                         .fix_aspect_ratio(),
                     TextInput::new(
                         &mut self.username,
-                        &i18n.get("main.username"),
+                        &i18n.get_msg("main-username"),
                         &login_info.username,
                         Message::Username,
                     )
@@ -378,7 +378,7 @@ impl LoginBanner {
                         .fix_aspect_ratio(),
                     TextInput::new(
                         &mut self.password,
-                        &i18n.get("main.password"),
+                        &i18n.get_msg("main-password"),
                         &login_info.password,
                         Message::Password,
                     )
@@ -394,7 +394,7 @@ impl LoginBanner {
                         .fix_aspect_ratio(),
                     TextInput::new(
                         &mut self.server,
-                        &i18n.get("main.server"),
+                        &i18n.get_msg("main-server"),
                         &login_info.server,
                         Message::Server,
                     )
@@ -410,7 +410,7 @@ impl LoginBanner {
             Column::with_children(vec![
                 neat_button(
                     &mut self.multiplayer_button,
-                    i18n.get("common.multiplayer"),
+                    i18n.get_msg("common-multiplayer"),
                     FILL_FRAC_TWO,
                     button_style,
                     Some(Message::Multiplayer),
@@ -418,7 +418,7 @@ impl LoginBanner {
                 #[cfg(feature = "singleplayer")]
                 neat_button(
                     &mut self.singleplayer_button,
-                    i18n.get("common.singleplayer"),
+                    i18n.get_msg("common-singleplayer"),
                     FILL_FRAC_TWO,
                     button_style,
                     Some(Message::Singleplayer),
diff --git a/voxygen/src/menu/main/ui/servers.rs b/voxygen/src/menu/main/ui/servers.rs
index 0f35a18aaa..feeb55a829 100644
--- a/voxygen/src/menu/main/ui/servers.rs
+++ b/voxygen/src/menu/main/ui/servers.rs
@@ -34,7 +34,7 @@ impl Screen {
         i18n: &Localization,
         button_style: style::button::Style,
     ) -> Element<Message> {
-        let title = Text::new(i18n.get("main.servers.select_server"))
+        let title = Text::new(i18n.get_msg("main-servers-select_server"))
             .size(fonts.cyri.scale(35))
             .width(Length::Fill)
             .horizontal_alignment(iced::HorizontalAlignment::Center);
@@ -42,7 +42,7 @@ impl Screen {
         let back_button = Container::new(
             Container::new(neat_button(
                 &mut self.back_button,
-                i18n.get("common.back"),
+                i18n.get_msg("common-back"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::Back),
@@ -55,7 +55,7 @@ impl Screen {
         let delete_button = Container::new(
             Container::new(neat_button(
                 &mut self.delete_button,
-                i18n.get("common.delete_server"),
+                i18n.get_msg("common-delete_server"),
                 FILL_FRAC_ONE,
                 button_style,
                 Some(Message::DeleteServer),
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index c26ad32a1d..f3ab46bdff 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -258,9 +258,9 @@ impl SessionState {
                     self.hud.clear_cursor();
                     let i18n = global_state.i18n.read();
                     let msg = match result {
-                        TradeResult::Completed => i18n.get("hud.trade.result.completed"),
-                        TradeResult::Declined => i18n.get("hud.trade.result.declined"),
-                        TradeResult::NotEnoughSpace => i18n.get("hud.trade.result.nospace"),
+                        TradeResult::Completed => i18n.get_msg("hud-trade-result-completed"),
+                        TradeResult::Declined => i18n.get_msg("hud-trade-result-declined"),
+                        TradeResult::NotEnoughSpace => i18n.get_msg("hud-trade-result-nospace"),
                     };
                     self.hud.new_message(ChatType::Meta.chat_msg(msg));
                 },
@@ -327,7 +327,7 @@ impl SessionState {
                     let i18n = global_state.i18n.read();
 
                     let message = match time {
-                        0 => String::from(i18n.get("hud.chat.goodbye")),
+                        0 => String::from(i18n.get_msg("hud-chat-goodbye")),
                         _ => i18n
                             .get_msg_ctx("hud-chat-connection_lost", &i18n::fluent_args! {
                                 "time" => time
@@ -343,7 +343,7 @@ impl SessionState {
                 client::Event::Kicked(reason) => {
                     global_state.info_message = Some(format!(
                         "{}: {}",
-                        global_state.i18n.read().get("main.login.kicked"),
+                        global_state.i18n.read().get_msg("main-login-kicked"),
                         reason
                     ));
                     return Ok(TickAction::Disconnect);
@@ -1187,7 +1187,7 @@ impl PlayState for SessionState {
                             global_state
                                 .i18n
                                 .read()
-                                .get("common.connection_lost")
+                                .get_msg("common-connection_lost")
                                 .into_owned(),
                         );
                         error!("[session] Failed to tick the scene: {:?}", err);
diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs
index 5be0f77d18..ba86d89af7 100644
--- a/voxygen/src/ui/widgets/item_tooltip.rs
+++ b/voxygen/src/ui/widgets/item_tooltip.rs
@@ -588,7 +588,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 // Power
                 widget::Text::new(&format!(
                     "{} : {:.1}",
-                    i18n.get("common.stats.power"),
+                    i18n.get_msg("common-stats-power"),
                     stats.power * 10.0
                 ))
                 .x_align_to(state.ids.item_frame, conrod_core::position::Align::Start)
@@ -613,7 +613,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:+.0}%",
-                        i18n.get("common.stats.speed"),
+                        i18n.get_msg("common-stats-speed"),
                         (stats.speed - 1.0) * 100.0
                     ),
                     1,
@@ -625,7 +625,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:+.0}%",
-                        i18n.get("common.stats.poise"),
+                        i18n.get_msg("common-stats-poise"),
                         (stats.effect_power - 1.0) * 100.0
                     ),
                     2,
@@ -635,7 +635,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:.1}%",
-                        i18n.get("common.stats.crit_chance"),
+                        i18n.get_msg("common-stats-crit_chance"),
                         stats.crit_chance * 100.0
                     ),
                     3,
@@ -645,7 +645,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:+.0}%",
-                        i18n.get("common.stats.range"),
+                        i18n.get_msg("common-stats-range"),
                         (stats.range - 1.0) * 100.0
                     ),
                     4,
@@ -655,7 +655,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:+.0}%",
-                        i18n.get("common.stats.energy_efficiency"),
+                        i18n.get_msg("common-stats-energy_efficiency"),
                         (stats.energy_efficiency - 1.0) * 100.0
                     ),
                     5,
@@ -665,7 +665,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                 stat_text(
                     format!(
                         "{} : {:+.0}%",
-                        i18n.get("common.stats.buff_strength"),
+                        i18n.get_msg("common-stats-buff_strength"),
                         (stats.buff_strength - 1.0) * 100.0
                     ),
                     6,
@@ -786,7 +786,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {}",
-                            i18n.get("common.stats.armor"),
+                            i18n.get_msg("common-stats-armor"),
                             util::protec2string(
                                 armor_stats.protection.unwrap_or(Protection::Normal(0.0))
                             )
@@ -801,7 +801,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {}",
-                            i18n.get("common.stats.poise_res"),
+                            i18n.get_msg("common-stats-poise_res"),
                             util::protec2string(
                                 armor_stats
                                     .poise_resilience
@@ -818,7 +818,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {:.1}",
-                            i18n.get("common.stats.energy_max"),
+                            i18n.get_msg("common-stats-energy_max"),
                             armor_stats.energy_max.unwrap_or(0.0)
                         ),
                         index,
@@ -831,7 +831,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {:.1}%",
-                            i18n.get("common.stats.energy_reward"),
+                            i18n.get_msg("common-stats-energy_reward"),
                             armor_stats.energy_reward.map_or(0.0, |x| x * 100.0)
                         ),
                         index,
@@ -844,7 +844,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {:.3}",
-                            i18n.get("common.stats.crit_power"),
+                            i18n.get_msg("common-stats-crit_power"),
                             armor_stats.crit_power.unwrap_or(0.0)
                         ),
                         index,
@@ -857,7 +857,7 @@ impl<'a> Widget for ItemTooltip<'a> {
                     stat_text(
                         format!(
                             "{} : {:.3}",
-                            i18n.get("common.stats.stealth"),
+                            i18n.get_msg("common-stats-stealth"),
                             armor_stats.stealth.unwrap_or(0.0)
                         ),
                         index,
@@ -868,7 +868,11 @@ impl<'a> Widget for ItemTooltip<'a> {
                 // Slots
                 if item.num_slots() > 0 {
                     stat_text(
-                        format!("{} : {}", i18n.get("common.stats.slots"), item.num_slots()),
+                        format!(
+                            "{} : {}",
+                            i18n.get_msg("common-stats-slots"),
+                            item.num_slots()
+                        ),
                         index,
                     );
                 }
@@ -1002,11 +1006,15 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let power_text = if is_primary {
                         format!(
                             "{} : {:.1}",
-                            i18n.get("common.stats.power"),
+                            i18n.get_msg("common-stats-power"),
                             stats.power * 10.0
                         )
                     } else {
-                        format!("{} : x{:.2}", i18n.get("common.stats.power"), stats.power)
+                        format!(
+                            "{} : x{:.2}",
+                            i18n.get_msg("common-stats-power"),
+                            stats.power
+                        )
                     };
                     widget::Text::new(&power_text)
                         .x_align_to(state.ids.item_frame, conrod_core::position::Align::Start)
@@ -1021,11 +1029,15 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let speed_text = if is_primary {
                         format!(
                             "{} : {:+.0}%",
-                            i18n.get("common.stats.speed"),
+                            i18n.get_msg("common-stats-speed"),
                             (stats.speed - 1.0) * 100.0
                         )
                     } else {
-                        format!("{} : x{:.2}", i18n.get("common.stats.speed"), stats.speed)
+                        format!(
+                            "{} : x{:.2}",
+                            i18n.get_msg("common-stats-speed"),
+                            stats.speed
+                        )
                     };
                     widget::Text::new(&speed_text)
                         .graphics_for(id)
@@ -1041,13 +1053,13 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let effect_power_text = if is_primary {
                         format!(
                             "{} : {:+.0}%",
-                            i18n.get("common.stats.poise"),
+                            i18n.get_msg("common-stats-poise"),
                             (stats.effect_power - 1.0) * 100.0
                         )
                     } else {
                         format!(
                             "{} : x{:.2}",
-                            i18n.get("common.stats.poise"),
+                            i18n.get_msg("common-stats-poise"),
                             stats.effect_power
                         )
                     };
@@ -1063,13 +1075,13 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let crit_chance_text = if is_primary {
                         format!(
                             "{} : {:.1}%",
-                            i18n.get("common.stats.crit_chance"),
+                            i18n.get_msg("common-stats-crit_chance"),
                             stats.crit_chance * 100.0
                         )
                     } else {
                         format!(
                             "{} : x{:.2}",
-                            i18n.get("common.stats.crit_chance"),
+                            i18n.get_msg("common-stats-crit_chance"),
                             stats.crit_chance
                         )
                     };
@@ -1085,11 +1097,15 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let range_text = if is_primary {
                         format!(
                             "{} : {:.0}%",
-                            i18n.get("common.stats.range"),
+                            i18n.get_msg("common-stats-range"),
                             (stats.range - 1.0) * 100.0
                         )
                     } else {
-                        format!("{} : x{:.2}", i18n.get("common.stats.range"), stats.range)
+                        format!(
+                            "{} : x{:.2}",
+                            i18n.get_msg("common-stats-range"),
+                            stats.range
+                        )
                     };
                     widget::Text::new(&range_text)
                         .graphics_for(id)
@@ -1103,13 +1119,13 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let energy_eff_text = if is_primary {
                         format!(
                             "{} : {:.0}%",
-                            i18n.get("common.stats.energy_efficiency"),
+                            i18n.get_msg("common-stats-energy_efficiency"),
                             (stats.energy_efficiency - 1.0) * 100.0
                         )
                     } else {
                         format!(
                             "{} : x{:.2}",
-                            i18n.get("common.stats.energy_efficiency"),
+                            i18n.get_msg("common-stats-energy_efficiency"),
                             stats.energy_efficiency
                         )
                     };
@@ -1125,13 +1141,13 @@ impl<'a> Widget for ItemTooltip<'a> {
                     let buff_str_text = if is_primary {
                         format!(
                             "{} : {:.0}%",
-                            i18n.get("common.stats.buff_strength"),
+                            i18n.get_msg("common-stats-buff_strength"),
                             (stats.buff_strength - 1.0) * 100.0
                         )
                     } else {
                         format!(
                             "{} : x{:.2}",
-                            i18n.get("common.stats.buff_strength"),
+                            i18n.get_msg("common-stats-buff_strength"),
                             stats.buff_strength
                         )
                     };
@@ -1203,8 +1219,8 @@ impl<'a> Widget for ItemTooltip<'a> {
             //Tooltips for trade mini-tutorial
             widget::Text::new(&format!(
                 "{}\n{}",
-                i18n.get("hud.trade.tooltip_hint_1"),
-                i18n.get("hud.trade.tooltip_hint_2"),
+                i18n.get_msg("hud-trade-tooltip_hint_1"),
+                i18n.get_msg("hud-trade-tooltip_hint_2"),
             ))
             .x_align_to(state.ids.item_frame, conrod_core::position::Align::Start)
             .graphics_for(id)
@@ -1265,8 +1281,8 @@ impl<'a> Widget for ItemTooltip<'a> {
         ) {
             // Get localized tooltip strings (gotten here because these should
             // only show if in a trade- aka if buy/sell prices are present)
-            let tt_hint_1 = self.localized_strings.get("hud.trade.tooltip_hint_1");
-            let tt_hint_2 = self.localized_strings.get("hud.trade.tooltip_hint_2");
+            let tt_hint_1 = self.localized_strings.get_msg("hud-trade-tooltip_hint_1");
+            let tt_hint_2 = self.localized_strings.get_msg("hud-trade-tooltip_hint_2");
 
             widget::Text::new(&format!("{}\n{}\n{}\n{}", buy, sell, tt_hint_1, tt_hint_2))
                 .with_style(self.style.desc)