diff --git a/system/scripts/handlebars.js b/system/scripts/handlebars.js
index 50643e3..6dd5874 100644
--- a/system/scripts/handlebars.js
+++ b/system/scripts/handlebars.js
@@ -37,6 +37,14 @@ export const RegisterHandlebars = function () {
         return sanitizeIfFail(game.i18n.localize(isYes ? "Yes" : "No"));
     });
 
+    // Replace "localize (localize" for partial var (broken in v14)
+    Handlebars.registerHelper("localizeEmbedded", function (string, objects) {
+        Object.keys(objects.hash).forEach(key => {
+            string = string.replace("{" + key + "}", objects.hash[key]);
+        });
+        return sanitizeIfFail(game.i18n.localize(string));
+    });
+
     /* ------------------------------------ */
     /* Dice                                 */
     /* ------------------------------------ */
diff --git a/system/templates/actors/actor-export.html b/system/templates/actors/actor-export.html
index 377ad82..037c384 100644
--- a/system/templates/actors/actor-export.html
+++ b/system/templates/actors/actor-export.html
@@ -65,7 +65,7 @@
         <ul>
             {{#each data.splitTechniquesList as |list techName|}}
                 <li>
-                    <strong>{{localize (localize 'l5r5e.techniques.{techName}' techName=techName) }}</strong>
+                    <strong>{{localizeEmbedded 'l5r5e.techniques.{techName}' techName=techName}}</strong>
                     <ul>
                     {{#each list as |technique|}}
                         <li>
@@ -130,7 +130,7 @@
             <li>{{localize 'l5r5e.money.title'}} : {{data.system.money.koku}} {{localize 'l5r5e.money.koku'}} / {{data.system.money.bu}} {{localize 'l5r5e.money.bu'}} / {{data.system.money.zeni}} {{localize 'l5r5e.money.zeni'}}</li>
             {{#each data.splitItemsList as |cat type|}}
                 <li>
-                    <strong>{{localize (localize 'l5r5e.{type}s.title' type=type)}} ({{cat.length}})</strong>
+                    <strong>{{localizeEmbedded 'l5r5e.{type}s.title' type=type}} ({{cat.length}})</strong>
                     <ul>
                     {{#each cat as |item|}}
                         <li>{{> 'systems/l5r5e/templates/items/item/item-text.html' data=item editable=../../options.editable}}</li>
@@ -209,20 +209,20 @@
         {{/ifCond}}
         <h2>{{localize 'l5r5e.twenty_questions.title'}}</h2>
         <ul>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step4.stand_out}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step7.clan_relations}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step8.bushido}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step9.success}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step10.difficulty}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step11.calms}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step12.worries}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step13.most_learn}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step14.first_sight}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step15.stress}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part5.q16{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step16.relations}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step17.parents_pov}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step18.heritage_name}}</li>
-            <li>{{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}} : {{data.system.twenty_questions.step20.death}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part2.q4{suffix}' suffix}} : {{data.system.twenty_questions.step4.stand_out}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q7{suffix}' suffix}} : {{data.system.twenty_questions.step7.clan_relations}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q8{suffix}' suffix}} : {{data.system.twenty_questions.step8.bushido}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q9{suffix}' suffix}} : {{data.system.twenty_questions.step9.success}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q10{suffix}' suffix}} : {{data.system.twenty_questions.step10.difficulty}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q11{suffix}' suffix}} : {{data.system.twenty_questions.step11.calms}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q12{suffix}' suffix}} : {{data.system.twenty_questions.step12.worries}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q13{suffix}' suffix}} : {{data.system.twenty_questions.step13.most_learn}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q14{suffix}' suffix}} : {{data.system.twenty_questions.step14.first_sight}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q15{suffix}' suffix}} : {{data.system.twenty_questions.step15.stress}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q16{suffix}' suffix}} : {{data.system.twenty_questions.step16.relations}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part6.q17{suffix}' suffix}} : {{data.system.twenty_questions.step17.parents_pov}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part6.q18{suffix}' suffix}} : {{data.system.twenty_questions.step18.heritage_name}}</li>
+            <li>{{localizeEmbedded 'l5r5e.twenty_questions.part7.q20{suffix}' suffix}} : {{data.system.twenty_questions.step20.death}}</li>
         </ul>
 
     </section>
diff --git a/system/templates/actors/character/conflict.html b/system/templates/actors/character/conflict.html
index 814855f..f85693a 100644
--- a/system/templates/actors/character/conflict.html
+++ b/system/templates/actors/character/conflict.html
@@ -2,7 +2,7 @@
     <legend class="section-header">
         {{localize 'l5r5e.conflict.initiative.title'}}
         <a class="encounter prepared-control" data-id="{{data.type}}">
-            <i class="fa fas prepared-icon prepared-icon-{{data.system.prepared}} prepared-{{data.type}}" title="{{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=data.system.prepared)}}"></i>
+            <i class="fa fas prepared-icon prepared-icon-{{data.system.prepared}} prepared-{{data.type}}" title="{{localizeEmbedded 'l5r5e.conflict.initiative.prepared_{value}' value=data.system.prepared}}"></i>
         </a>
     </legend>
     <button class="initiative dice-picker" data-initiative="true" data-skill="sentiment">{{localize 'l5r5e.conflict.initiative.intrigue'}}</button>
diff --git a/system/templates/actors/character/techniques.html b/system/templates/actors/character/techniques.html
index 19a843d..7cecfb7 100644
--- a/system/templates/actors/character/techniques.html
+++ b/system/templates/actors/character/techniques.html
@@ -16,7 +16,7 @@
         <fieldset class="section-header flexrow">
             <legend class="technique-controls">
                 <span class="technique-controls toggle-on-click" data-toggle="toggle-technique-category-{{technique}}">
-                    {{localize (localize 'l5r5e.techniques.{technique}' technique=technique)}}
+                    {{localizeEmbedded 'l5r5e.techniques.{technique}' technique=technique}}
                 </span>
                 {{#ifCond ../data.editable_not_soft_locked '&&' (lookup ../data.system.techniques technique)}}
                     <a data-item-type="technique" class="technique-control item-add" data-tech-type="{{technique}}" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
diff --git a/system/templates/actors/npc/conflict.html b/system/templates/actors/npc/conflict.html
index f09e004..961193d 100644
--- a/system/templates/actors/npc/conflict.html
+++ b/system/templates/actors/npc/conflict.html
@@ -2,7 +2,7 @@
     <legend class="section-header">
         {{localize 'l5r5e.conflict.initiative.title'}}
         <a class="encounter prepared-control" data-id="{{data.type}}">
-            <i class="fa fas prepared-icon prepared-icon-{{data.system.prepared}} prepared-{{data.system.type}}" title="{{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=data.system.prepared)}}"></i>
+            <i class="fa fas prepared-icon prepared-icon-{{data.system.prepared}} prepared-{{data.system.type}}" title="{{localizeEmbedded 'l5r5e.conflict.initiative.prepared_{value}' value=data.system.prepared}}"></i>
         </a>
     </legend>
     <button class="initiative dice-picker" data-initiative="true" data-skill="sentiment">{{localize 'l5r5e.conflict.initiative.intrigue'}}</button>
diff --git a/system/templates/actors/npc/techniques.html b/system/templates/actors/npc/techniques.html
index d55ff94..b7c6ea7 100644
--- a/system/templates/actors/npc/techniques.html
+++ b/system/templates/actors/npc/techniques.html
@@ -19,7 +19,7 @@
         <fieldset class="section-header flexrow">
             <legend class="technique-controls">
                 <span class="technique-controls toggle-on-click" data-toggle="toggle-technique-category-{{technique}}">
-                    {{localize (localize 'l5r5e.techniques.{technique}' technique=technique)}}
+                    {{localizeEmbedded 'l5r5e.techniques.{technique}' technique=technique}}
                 </span>
                 {{#ifCond ../data.editable_not_soft_locked '&&' (lookup ../data.system.techniques technique)}}
                     <a data-item-type="technique" class="technique-control item-add" data-tech-type="{{technique}}" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
diff --git a/system/templates/actors/twenty-questions-dialog.html b/system/templates/actors/twenty-questions-dialog.html
index 6888ccb..0701bd8 100644
--- a/system/templates/actors/twenty-questions-dialog.html
+++ b/system/templates/actors/twenty-questions-dialog.html
@@ -27,12 +27,12 @@
                 </label>
                 <br>
                 <br>
-                <i>{{localize (localize 'l5r5e.twenty_questions.part0.section{suffix}' suffix=suffix)}}</i>
+                <i>{{localizeEmbedded 'l5r5e.twenty_questions.part0.section{suffix}' suffix=suffix}}</i>
                 <button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part1" data-group="primary" data-tab="part1">
-                <h2>{{localize (localize 'l5r5e.twenty_questions.part1.title{suffix}' suffix=suffix)}}</h2>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part1.q1{suffix}' suffix=suffix)}}</h3>
+                <h2>{{localizeEmbedded 'l5r5e.twenty_questions.part1.title{suffix}' suffix=suffix}}</h2>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part1.q1{suffix}' suffix=suffix}}</h3>
                 <div>
                     <input type="text" name="step1.clan" value="{{data.step1.clan}}">
                 </div>
@@ -73,7 +73,7 @@
                         </td>
                     </tr>
                 </table>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part1.q2{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part1.q2{suffix}' suffix=suffix}}</h3>
                 <div>
                     <input type="text" name="step2.family" value="{{data.step2.family}}">
                 </div>
@@ -122,7 +122,7 @@
             </article>
             <article class="tab parts part2" data-group="primary" data-tab="part2">
                 <h2>{{localize 'l5r5e.twenty_questions.part2.title'}}</h2>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part2.q3{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part2.q3{suffix}' suffix=suffix}}</h3>
                 <label class="full">
                     {{localize 'l5r5e.twenty_questions.part2.school'}}
                     <input type="text" name="step3.school" value="{{data.step3.school}}">
@@ -214,7 +214,7 @@
                         </td>
                     </tr>
                 </table>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part2.q4{suffix}' suffix=suffix}}</h3>
                 <textarea name="step4.stand_out">{{data.step4.stand_out}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.increase_ring1'}}
@@ -226,8 +226,8 @@
                 <button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part3" data-group="primary" data-tab="part3">
-                <h2>{{localize (localize 'l5r5e.twenty_questions.part3.title{suffix}' suffix=suffix)}}</h2>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part3.q5{suffix}' suffix=suffix)}}</h3>
+                <h2>{{localizeEmbedded 'l5r5e.twenty_questions.part3.title{suffix}' suffix=suffix}}</h2>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q5{suffix}' suffix=suffix}}</h3>
                 <label>
                     {{#ifCond data.template '==' 'core'}}
                         {{localize 'l5r5e.twenty_questions.part3.choose_giri'}}
@@ -236,12 +236,12 @@
                     {{/ifCond}}
                     <textarea name="step5.social_giri">{{data.step5.social_giri}}</textarea>
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part3.q6{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q6{suffix}' suffix=suffix}}</h3>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part3.choose_ninjo'}}
                     <textarea name="step6.social_ninjo">{{data.step6.social_ninjo}}</textarea>
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q7{suffix}' suffix=suffix}}</h3>
                 <textarea name="step7.clan_relations">{{data.step7.clan_relations}}</textarea>
                 <table>
                     <tr>
@@ -265,7 +265,7 @@
                         </td>
                     </tr>
                 </table>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part3.q8{suffix}' suffix=suffix}}</h3>
                 <textarea name="step8.bushido">{{data.step8.bushido}}</textarea>
                 <table>
                     <tr>
@@ -315,31 +315,31 @@
             </article>
             <article class="tab parts part4" data-group="primary" data-tab="part4">
                 <h2>{{localize 'l5r5e.twenty_questions.part4.title'}}</h2>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q9{suffix}' suffix=suffix}}</h3>
                 <textarea name="step9.success">{{data.step9.success}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part4.distinction'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step9.distinction stepName='step9.distinction' itemType='peculiarities' hideDndAt=1}}
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q10{suffix}' suffix=suffix}}</h3>
                 <textarea name="step10.difficulty">{{data.step10.difficulty}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part4.adversity'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step10.adversity stepName='step10.adversity' itemType='peculiarities' hideDndAt=1}}
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q11{suffix}' suffix=suffix}}</h3>
                 <textarea name="step11.calms">{{data.step11.calms}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part4.passion'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step11.passion stepName='step11.passion' itemType='peculiarities' hideDndAt=1}}
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q12{suffix}' suffix=suffix}}</h3>
                 <textarea name="step12.worries">{{data.step12.worries}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part4.anxiety'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step12.anxiety stepName='step12.anxiety' itemType='peculiarities' hideDndAt=1}}
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part4.q13{suffix}' suffix=suffix}}</h3>
                 <textarea name="step13.most_learn">{{data.step13.most_learn}}</textarea>
                 <table>
                     <tr>
@@ -376,13 +376,13 @@
             </article>
             <article class="tab parts part5" data-group="primary" data-tab="part5">
                 <h2>{{localize 'l5r5e.twenty_questions.part5.title'}}</h2>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix}}</h3>
                 <textarea name="step14.first_sight">{{data.step14.first_sight}}</textarea>
                 <label>
                     {{localize 'l5r5e.twenty_questions.part5.accoutrement'}}
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step14.special_features stepName='step14.special_features' itemType='items' hideDndAt=1}}
                 </label>
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix}}</h3>
                 <textarea name="step15.stress">{{data.step15.stress}}</textarea>
                 {{#ifCond data.template '==' 'core'}}
                     <h3>{{localize 'l5r5e.twenty_questions.part5.q16'}}</h3>
@@ -395,16 +395,16 @@
                 <button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
             <article class="tab parts part6" data-group="primary" data-tab="part6">
-                <h2>{{localize (localize 'l5r5e.twenty_questions.part6.title{suffix}' suffix=suffix)}}</h2>
+                <h2>{{localizeEmbedded 'l5r5e.twenty_questions.part6.title{suffix}' suffix=suffix}}</h2>
                 {{#ifCond data.template '==' 'pow'}}
-                    <h3>{{localize (localize 'l5r5e.twenty_questions.part5.q16_pow' suffix=suffix)}}</h3>
+                    <h3>{{localize 'l5r5e.twenty_questions.part5.q16_pow'}}</h3>
                     <textarea name="step16.relations">{{data.step16.relations}}</textarea>
                     <label>
                         {{localize 'l5r5e.twenty_questions.part5.object'}}
                         {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step16.item stepName='step16.item' itemType='items' hideDndAt=1}}
                     </label>
                 {{/ifCond}}
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part6.q17{suffix}' suffix=suffix}}</h3>
                 <textarea name="step17.parents_pov">{{data.step17.parents_pov}}</textarea>
                 {{#ifCond data.template '==' 'core'}}
                     <label>
@@ -424,7 +424,7 @@
                         {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step17.bond stepName='step17.bond' itemType='bonds' hideDndAt=1}}
                     </label>
                 {{/ifCond}}
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part6.q18{suffix}' suffix=suffix}}</h3>
                 <textarea name="step18.heritage_name">{{data.step18.heritage_name}}</textarea>
                 {{#ifCond data.template '==' 'core'}}
                     <table>
@@ -491,7 +491,7 @@
                         </select>
                     </label>
                 {{/ifCond}}
-                <h3>{{localize (localize 'l5r5e.twenty_questions.part6.q19{suffix}' suffix=suffix)}}</h3>
+                <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part6.q19{suffix}' suffix=suffix}}</h3>
                 <textarea name="step19.firstname">{{data.step19.firstname}}</textarea>
                 <button class="next" name="next" type="button">{{localize 'l5r5e.twenty_questions.bt_next'}} <i class='fas fa-arrow-right'></i></button>
             </article>
@@ -499,7 +499,7 @@
                 <h2>{{localize 'l5r5e.twenty_questions.part7.title'}}</h2>
                 <div>
                     <label>
-                        <h3>{{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}}</h3>
+                        <h3>{{localizeEmbedded 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix}}</h3>
                         <textarea name="step20.death">{{data.step20.death}}</textarea>
                     </label>
                 </div>
diff --git a/system/templates/gm/combat-tracker-bar.html b/system/templates/gm/combat-tracker-bar.html
index fbc9935..07178f3 100644
--- a/system/templates/gm/combat-tracker-bar.html
+++ b/system/templates/gm/combat-tracker-bar.html
@@ -2,14 +2,14 @@
     <ul class="encounter">
         {{#each encounterTypeList}}
             <li class="encounter encounter-control" data-id="{{this}}">
-                <i class="fa fas encounter-icon-{{this}}{{#ifCond this '==' ../encounterType}} active{{/ifCond}}" title="{{localize (localize 'l5r5e.conflict.initiative.{id}' id=this)}}"></i>
+                <i class="fa fas encounter-icon-{{this}}{{#ifCond this '==' ../encounterType}} active{{/ifCond}}" title="{{localizeEmbedded 'l5r5e.conflict.initiative.{id}' id=this}}"></i>
             </li>
         {{/each}}
     </ul>
     <ul class="prepared">
         {{#each prepared as |prepared charType|}}
             <li class="encounter prepared-control" data-id="{{charType}}">
-                <i class="fa fas prepared-icon-{{prepared}} prepared-{{charType}}" title="{{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=prepared)}} ({{localize (localize 'l5r5e.character_types.{type}' type=charType)}})"></i>
+                <i class="fa fas prepared-icon-{{prepared}} prepared-{{charType}}" title="{{localizeEmbedded 'l5r5e.conflict.initiative.prepared_{value}' value=prepared}} ({{localizeEmbedded 'l5r5e.character_types.{type}' type=charType}})"></i>
             </li>
         {{/each}}
     </ul>
diff --git a/system/templates/gm/gm-monitor.html b/system/templates/gm/gm-monitor.html
index 5f9e94f..7dcb6d2 100644
--- a/system/templates/gm/gm-monitor.html
+++ b/system/templates/gm/gm-monitor.html
@@ -32,7 +32,7 @@
             </td>
             <td>
                 <a data-actor-uuid="{{actor.uuid}}" data-type="prepared" class="actor-modify-control">
-                    <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared)}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i>
+                    <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localizeEmbedded 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i>
                 </a>
             </td>
             <td>{{#if actor.haveWeaponEquipped}}<i data-type="weapons" data-actor-uuid="{{actor.uuid}}" class="fas fa-fan actor-infos-control {{#if actor.haveWeaponReadied}}badvalue{{/if}}"></i>{{/if}}</td>
diff --git a/system/templates/gm/monitor/character-view.html b/system/templates/gm/monitor/character-view.html
index d113d85..233c80c 100644
--- a/system/templates/gm/monitor/character-view.html
+++ b/system/templates/gm/monitor/character-view.html
@@ -31,7 +31,7 @@
              </td>
              <td>
                  <a data-actor-uuid="{{actor.uuid}}" class="actor-modify-control" data-action="toggle_prepared">
-                     <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared)}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i>
+                     <i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localizeEmbedded 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i>
                  </a>
              </td>
              <td>{{#if actor.haveWeaponEquipped}}<i data-type="weapons" data-actor-uuid="{{actor.uuid}}" class="fas fa-fan actor-infos-control {{#if actor.haveWeaponReadied}}badvalue{{/if}}"></i>{{/if}}</td>
diff --git a/system/templates/gm/monitor/tooltips/global.html b/system/templates/gm/monitor/tooltips/global.html
index 3024937..2e85431 100644
--- a/system/templates/gm/monitor/tooltips/global.html
+++ b/system/templates/gm/monitor/tooltips/global.html
@@ -20,9 +20,9 @@
     {{#ifCond actor_type "==" "character"}}
     {{!-- 20Q --}}
     <ul>
-        <li><b>{{localize (localize 'l5r5e.twenty_questions.part5.q14{suffix}' suffix=suffix)}}</b> : {{actorData.system.twenty_questions.step14.first_sight}}</li>
-        <li><b>{{localize (localize 'l5r5e.twenty_questions.part5.q15{suffix}' suffix=suffix)}}</b> : {{actorData.system.twenty_questions.step15.stress}}</li>
-        <li><b>{{localize (localize 'l5r5e.twenty_questions.part7.q20{suffix}' suffix=suffix)}}</b> : {{actorData.system.twenty_questions.step20.death}}</li>
+        <li><b>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q14' suffix}}</b> : {{actorData.system.twenty_questions.step14.first_sight}}</li>
+        <li><b>{{localizeEmbedded 'l5r5e.twenty_questions.part5.q15' suffix}}</b> : {{actorData.system.twenty_questions.step15.stress}}</li>
+        <li><b>{{localizeEmbedded 'l5r5e.twenty_questions.part7.q20' suffix}}</b> : {{actorData.system.twenty_questions.step20.death}}</li>
     </ul>
     {{/ifCond}}
     <p>{{{actorData.enrichedHtml.description}}}</p>
diff --git a/system/templates/items/item/items.html b/system/templates/items/item/items.html
index 15ad4c3..05e6b9b 100644
--- a/system/templates/items/item/items.html
+++ b/system/templates/items/item/items.html
@@ -1,6 +1,6 @@
 {{#each data.splitItemsList as |cat type|}}
     <h3 class="toggle-on-click" data-toggle="inventory-item-list-{{type}}">
-        {{localize (localize 'l5r5e.{type}s.title' type=type)}} ({{cat.length}})
+        {{localizeEmbedded 'l5r5e.{type}s.title' type=type}} ({{cat.length}})
         {{#if ../data.editable_not_soft_locked}}
             <a data-item-type="{{type}}" class="item-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
         {{/if}}
diff --git a/system/templates/items/peculiarity/peculiarity-text.html b/system/templates/items/peculiarity/peculiarity-text.html
index 0cabed4..6da3374 100644
--- a/system/templates/items/peculiarity/peculiarity-text.html
+++ b/system/templates/items/peculiarity/peculiarity-text.html
@@ -8,7 +8,7 @@
                 <strong>{{localize 'l5r5e.rings.label'}}</strong> : {{localizeRing data.system.ring}}
             </li>
             <li>
-                <strong>{{localize 'l5r5e.sheets.types'}}</strong> : {{localize (localize 'l5r5e.peculiarities.types.{type}' type=data.system.peculiarity_type)}}
+                <strong>{{localize 'l5r5e.sheets.types'}}</strong> : {{localizeEmbedded 'l5r5e.peculiarities.types.{type}' type=data.system.peculiarity_type}}
             </li>
             <li>
                 <strong>{{localize 'l5r5e.advancements.curriculum'}}</strong> : {{localizeYesNo data.system.in_curriculum}}
@@ -26,7 +26,7 @@
                 <strong>{{localize 'l5r5e.sheets.types'}}</strong> : {{data.system.types}}
             </li>
         </ul>
-        
+
         {{> 'systems/l5r5e/templates/items/item/item-text-partial-reference.html'}}
     </section>
 </div>