diff --git a/system/scripts/actors/base-character-sheet.js b/system/scripts/actors/base-character-sheet.js
index 897f67b..eee548e 100644
--- a/system/scripts/actors/base-character-sheet.js
+++ b/system/scripts/actors/base-character-sheet.js
@@ -31,6 +31,9 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {
         // Split Items by types
         sheetData.data.splitItemsList = this._splitItems(sheetData);
 
+        // Shortcut for some tests
+        sheetData.data.editable_not_soft_locked = sheetData.editable && !sheetData.data.data.soft_locked;
+
         return sheetData;
     }
 
diff --git a/system/template.json b/system/template.json
index 5be8476..1601767 100644
--- a/system/template.json
+++ b/system/template.json
@@ -2,6 +2,9 @@
     "Actor": {
         "types": ["character", "npc", "army"],
         "templates": {
+            "softlock": {
+                "soft_locked": false
+            },
             "identity": {
                 "identity": {
                     "clan": "",
@@ -115,7 +118,7 @@
             }
         },
         "character": {
-            "templates": ["identity", "rings", "social", "skills", "techniques", "conflict", "advancement"],
+            "templates": ["softlock", "identity", "rings", "social", "skills", "techniques", "conflict", "advancement"],
             "template": "core",
             "twenty_questions": {},
             "zeni": 0
diff --git a/system/templates/actors/character-sheet.html b/system/templates/actors/character-sheet.html
index 53ae5eb..09ca450 100644
--- a/system/templates/actors/character-sheet.html
+++ b/system/templates/actors/character-sheet.html
@@ -3,7 +3,7 @@
     <header class="sheet-header">
         <img class="profile-img dragndrop-actor-id pointer" src="{{data.img}}" data-edit="img" data-actor-id="{{actor.id}}" draggable="true" title="{{data.name}}"/>
         <div class="header-fields identity-wrapper">
-            <h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
+            <h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if data.editable_not_soft_locked}}disabled{{/if}}/></h1>
             {{> 'systems/l5r5e/templates/actors/character/identity.html'}}
         </div>
         <div class="header-fields">
@@ -29,7 +29,7 @@
         <article class="tab skills" data-group="primary" data-tab="skills">
             <ul class="skills-wrapper">
                 {{#each data.data.skills as |category id|}}
-                    {{> 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id}}
+                    {{> 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id data=../data}}
                 {{/each}}
             </ul>
             {{> 'systems/l5r5e/templates/actors/character/techniques.html'}}
diff --git a/system/templates/actors/character/category.html b/system/templates/actors/character/category.html
index 249c4e0..599ec82 100644
--- a/system/templates/actors/character/category.html
+++ b/system/templates/actors/character/category.html
@@ -2,7 +2,7 @@
     <h4 class="section-header">{{localizeSkill categoryId 'title'}}</h4>
     <ul class="skill-category-skills-list">
         {{#each category as |skill id|}}
-            {{> 'systems/l5r5e/templates/actors/character/skill.html' categoryId=../categoryId skill=skill skillId=id}}
+            {{> 'systems/l5r5e/templates/actors/character/skill.html' categoryId=../categoryId skill=skill skillId=id data=../data}}
         {{/each}}
     </ul>
     <ul class="skill-category-ring-actions">
diff --git a/system/templates/actors/character/identity.html b/system/templates/actors/character/identity.html
index 4c340fa..c8029a5 100644
--- a/system/templates/actors/character/identity.html
+++ b/system/templates/actors/character/identity.html
@@ -6,7 +6,7 @@
             {{else}}
                 {{localize 'l5r5e.clan'}}
             {{/ifCond}}
-            <input type="text" name="data.identity.clan" value="{{data.data.identity.clan}}"/>
+            <input type="text" name="data.identity.clan" value="{{data.data.identity.clan}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
@@ -16,25 +16,25 @@
             {{else}}
                 {{localize 'l5r5e.family'}}
             {{/ifCond}}
-            <input type="text" name="data.identity.family" value="{{data.data.identity.family}}"/>
+            <input type="text" name="data.identity.family" value="{{data.data.identity.family}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label">
             {{localize 'l5r5e.schoolrank'}}
-            <input type="number" name="data.identity.school_rank" value="{{data.data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="1"/>
+            <input type="number" name="data.identity.school_rank" value="{{data.data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="1" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label">
             {{localize 'l5r5e.school'}}
-            <input type="text" name="data.identity.school" value="{{data.data.identity.school}}"/>
+            <input type="text" name="data.identity.school" value="{{data.data.identity.school}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label">
             {{localize 'l5r5e.roles'}}
-            <input type="text" name="data.identity.roles" value="{{data.data.identity.roles}}"/>
+            <input type="text" name="data.identity.roles" value="{{data.data.identity.roles}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
 </ul>
\ No newline at end of file
diff --git a/system/templates/actors/character/inventory.html b/system/templates/actors/character/inventory.html
index 2801e26..b007242 100644
--- a/system/templates/actors/character/inventory.html
+++ b/system/templates/actors/character/inventory.html
@@ -2,7 +2,7 @@
     <legend class="section-header">{{localize 'l5r5e.money.title'}}</legend>
     <label>
         {{localize 'l5r5e.money.koku'}}
-        <input name="data.money.koku" type="number" value="{{data.data.money.koku}}" data-dtype="Number" min="0" placeholder="0"/>
+        <input name="data.money.koku" type="number" value="{{data.data.money.koku}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="koku" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="koku" data-value="-1"></i>
@@ -10,7 +10,7 @@
     </label>
     <label>
         {{localize 'l5r5e.money.bu'}}
-        <input name="data.money.bu" type="number" value="{{data.data.money.bu}}" data-dtype="Number" min="0" placeholder="0"/>
+        <input name="data.money.bu" type="number" value="{{data.data.money.bu}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="bu" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="bu" data-value="-1"></i>
@@ -18,7 +18,7 @@
     </label>
     <label>
         {{localize 'l5r5e.money.zeni'}}
-        <input name="data.money.zeni" type="number" value="{{data.data.money.zeni}}" data-dtype="Number" min="0" placeholder="0"/>
+        <input name="data.money.zeni" type="number" value="{{data.data.money.zeni}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="zeni" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="zeni" data-value="-1"></i>
@@ -34,14 +34,14 @@
 <fieldset>
     <legend class="text-block-header">
         {{localize 'l5r5e.advancements.item_pattern'}}
-        {{#if options.editable}}
+        {{#if data.editable_not_soft_locked}}
             <a data-item-type="item_pattern" class="item-pattern-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
         {{/if}}
     </legend>
     <ul class="item-list">
         {{#each actor.items as |pattern id|}}
             {{#ifCond pattern.data.type '==' 'item_pattern'}}
-                {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}}
+                {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../data.editable_not_soft_locked}}
             {{/ifCond}}
         {{/each}}
     </ul>
diff --git a/system/templates/actors/character/narrative.html b/system/templates/actors/character/narrative.html
index 49844d6..2e20915 100644
--- a/system/templates/actors/character/narrative.html
+++ b/system/templates/actors/character/narrative.html
@@ -20,11 +20,11 @@
         <legend class="text-block-header">{{localize 'l5r5e.social.bushido_tenets.title'}}</legend>
         <label class="attribute-label">
             {{localize 'l5r5e.social.bushido_tenets.paramount'}}
-            <textarea type="text" name="data.social.bushido_tenets.paramount">{{data.data.social.bushido_tenets.paramount}}</textarea>
+            <textarea type="text" name="data.social.bushido_tenets.paramount" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.data.social.bushido_tenets.paramount}}</textarea>
         </label>
         <label class="attribute-label">
             {{localize 'l5r5e.social.bushido_tenets.less_significant'}}
-            <textarea type="text" name="data.social.bushido_tenets.less_significant">{{data.data.social.bushido_tenets.less_significant}}</textarea>
+            <textarea type="text" name="data.social.bushido_tenets.less_significant" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.data.social.bushido_tenets.less_significant}}</textarea>
         </label>
     </fieldset>
 </div>
@@ -33,14 +33,14 @@
     <fieldset>
         <legend class="text-block-header">
             {{localize 'l5r5e.social.advantages'}}
-            {{#if options.editable}}
+            {{#if data.editable_not_soft_locked}}
             <a data-item-type="peculiarity" class="peculiarity-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
             {{/if}}
         </legend>
         <ul class="item-list">
             {{#each actor.items as |item id|}}
                 {{#ifCond '["distinction","passion"]' 'includes' item.data.data.peculiarity_type}}
-                    {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../options.editable}}
+                    {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../data.editable_not_soft_locked}}
                 {{/ifCond}}
             {{/each}}
         </ul>
@@ -49,14 +49,14 @@
     <fieldset>
         <legend class="text-block-header">
             {{localize 'l5r5e.social.disadvantages'}}
-            {{#if options.editable}}
+            {{#if data.editable_not_soft_locked}}
             <a data-item-type="peculiarity" class="peculiarity-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
             {{/if}}
         </legend>
         <ul class="item-list">
             {{#each actor.items as |item id|}}
             {{#ifCond '["adversity","anxiety"]' 'includes' item.data.data.peculiarity_type}}
-                    {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../options.editable}}
+                    {{> 'systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html' peculiarity=item id=id editable=../data.editable_not_soft_locked}}
                 {{/ifCond}}
             {{/each}}
         </ul>
@@ -65,14 +65,14 @@
     <fieldset>
         <legend class="text-block-header">
             {{localize 'l5r5e.social.bonds' }}
-            {{#if options.editable}}
+            {{#if data.editable_not_soft_locked}}
                 <a data-item-type="bond" class="bond-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
             {{/if}}
         </legend>
         <ul class="item-list">
             {{#each actor.items as |bond id|}}
                 {{#ifCond bond.data.type '==' 'bond'}}
-                    {{> 'systems/l5r5e/templates/items/bond/bond-entry.html' bond=bond id=id editable=../options.editable}}
+                    {{> 'systems/l5r5e/templates/items/bond/bond-entry.html' bond=bond id=id editable=../data.editable_not_soft_locked}}
                 {{/ifCond}}
             {{/each}}
         </ul>
diff --git a/system/templates/actors/character/rings.html b/system/templates/actors/character/rings.html
index d4556a0..aa74a24 100644
--- a/system/templates/actors/character/rings.html
+++ b/system/templates/actors/character/rings.html
@@ -3,35 +3,35 @@
         <label class="earth">
             <i class="i_earth dice-picker rollable" data-ring="earth"></i>
             <strong>{{localizeRing 'earth'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.rings.earth" value="{{data.data.rings.earth}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.rings.earth" value="{{data.data.rings.earth}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="air">
         <label class="air">
             <i class="i_air dice-picker rollable" data-ring="air"></i>
             <strong>{{localizeRing 'air'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.rings.air" value="{{data.data.rings.air}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.rings.air" value="{{data.data.rings.air}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li  id="water">
         <label class="water">
             <i class="i_water dice-picker rollable" data-ring="water"></i>
             <strong>{{localizeRing 'water'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.rings.water" value="{{data.data.rings.water}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.rings.water" value="{{data.data.rings.water}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="fire">
         <label class="fire">
             <i class="i_fire dice-picker rollable" data-ring="fire"></i>
             <strong>{{localizeRing 'fire'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.rings.fire" value="{{data.data.rings.fire}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.rings.fire" value="{{data.data.rings.fire}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="void">
         <label class="void">
             <i class="i_void dice-picker rollable" data-ring="void"></i>
             <strong>{{localizeRing 'void'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.rings.void" value="{{data.data.rings.void}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.rings.void" value="{{data.data.rings.void}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
 </ul>
\ No newline at end of file
diff --git a/system/templates/actors/character/skill.html b/system/templates/actors/character/skill.html
index 5fdcde3..1c276f1 100644
--- a/system/templates/actors/character/skill.html
+++ b/system/templates/actors/character/skill.html
@@ -10,6 +10,7 @@
             min="0"
             max="9"
             placeholder="0"
+            {{^if data.editable_not_soft_locked}}disabled{{/if}}
         />
     </label>
 </li>
diff --git a/system/templates/actors/character/social.html b/system/templates/actors/character/social.html
index ddf35cc..eb6050a 100644
--- a/system/templates/actors/character/social.html
+++ b/system/templates/actors/character/social.html
@@ -2,19 +2,19 @@
     <li>
         <label class="attribute-label centered-input">
             <strong>{{localize 'l5r5e.social.honor'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.social.honor" value="{{data.data.social.honor}}" data-dtype="Number" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.social.honor" value="{{data.data.social.honor}}" data-dtype="Number" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label centered-input">
             <strong>{{localize 'l5r5e.social.glory'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.social.glory" value="{{data.data.social.glory}}" data-dtype="Number" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.social.glory" value="{{data.data.social.glory}}" data-dtype="Number" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label centered-input">
             <strong>{{localize 'l5r5e.social.status'}}</strong>
-            <input class="centered-input select-on-focus" type="number" name="data.social.status" value="{{data.data.social.status}}" data-dtype="Number" placeholder="0"/>
+            <input class="centered-input select-on-focus" type="number" name="data.social.status" value="{{data.data.social.status}}" data-dtype="Number" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
 </ul>
\ No newline at end of file
diff --git a/system/templates/actors/character/techniques.html b/system/templates/actors/character/techniques.html
index a246039..40ed7e6 100644
--- a/system/templates/actors/character/techniques.html
+++ b/system/templates/actors/character/techniques.html
@@ -4,7 +4,7 @@
         <i>{{localize 'l5r5e.techniques.type'}}</i>
         {{#each data.techniquesList as |technique|}}
             <label>
-                <input type="checkbox" name="data.techniques.{{technique.id}}" {{checked (lookup ../data.data.techniques technique.id)}} />
+                <input type="checkbox" name="data.techniques.{{technique.id}}" {{checked (lookup ../data.data.techniques technique.id)}} {{^if ../data.editable_not_soft_locked}}disabled{{/if}} />
                 {{technique.label}}
             </label>
         {{/each}}
@@ -13,14 +13,14 @@
     {{#each data.splitTechniquesList as |list technique|}}
         <fieldset class="section-header flexrow">
             <legend class="technique-controls">
-                {{localize (localize 'l5r5e.techniques.{technique}' technique=technique) }}
-                {{#ifCond ../options.editable '&&' (lookup ../data.data.techniques technique)}}
+                {{localize (localize 'l5r5e.techniques.{technique}' technique=technique)}}
+                {{#ifCond ../data.editable_not_soft_locked '&&' (lookup ../data.data.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>
                 {{/ifCond}}
             </legend>
             <ul class="item-list">
                 {{#each list as |item id|}}
-                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../../options.editable}}
+                    {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../../data.editable_not_soft_locked}}
                 {{/each}}
             </ul>
         </fieldset>
@@ -29,14 +29,14 @@
     <fieldset class="section-header flexrow">
         <legend class="text-block-header">
             {{localize 'l5r5e.advancements.signature_scroll' }}
-            {{#if options.editable}}
+            {{#if data.editable_not_soft_locked}}
                 <a data-item-type="signature_scroll" class="signature-scroll-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
             {{/if}}
         </legend>
         <ul class="item-list">
             {{#each actor.items as |scroll id|}}
                 {{#ifCond scroll.data.type '==' 'signature_scroll'}}
-                    {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}}
+                    {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../data.editable_not_soft_locked}}
                 {{/ifCond}}
             {{/each}}
         </ul>
diff --git a/system/templates/items/armor/armors.html b/system/templates/items/armor/armors.html
index 068611a..7b61431 100644
--- a/system/templates/items/armor/armors.html
+++ b/system/templates/items/armor/armors.html
@@ -1,14 +1,14 @@
 <fieldset class="armors-content">
     <legend class="section-header">
         {{localize 'l5r5e.armors.title'}}
-        {{#if options.editable}}
+        {{#if data.editable_not_soft_locked}}
         <a data-item-type="armor" data-item-equipped="true" class="armor-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
         {{/if}}
     </legend>
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond (ifCond item.type '==' 'armor') '&&' (ifCond item.data.data.equipped '==' true)}}
-                {{> 'systems/l5r5e/templates/items/armor/armor-entry.html' armor=item id=id editable=../options.editable }}
+                {{> 'systems/l5r5e/templates/items/armor/armor-entry.html' armor=item id=id editable=../data.editable_not_soft_locked }}
             {{/ifCond}}
         {{/each}}
     </ul>
diff --git a/system/templates/items/item/item-entry.html b/system/templates/items/item/item-entry.html
index 713b0f3..3af5b6c 100644
--- a/system/templates/items/item/item-entry.html
+++ b/system/templates/items/item/item-entry.html
@@ -4,8 +4,10 @@
         <li class="item-name l5r5e-tooltip" data-item-id="{{item._id}}">{{item.name}} <sub>x{{item.data.quantity}}</sub></li>
         {{#if editable}}
             <li data-item-id="{{item._id}}" data-type="equipped" class="item-equip equip-readied-control" title="{{localize 'l5r5e.armors.equipped'}}"><i class="fas {{#if item.data.equipped}}fa-tshirt{{else}}fa-weight-hanging{{/if}}"></i></li>
+            {{^if soft_locked}}
             <li data-item-id="{{item._id}}" class="item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
             <li data-item-id="{{item._id}}" class="item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
+            {{/if}}
         {{/if}}
     </ul>
     <ul class="item-properties">
diff --git a/system/templates/items/item/items.html b/system/templates/items/item/items.html
index 99c10d0..910f187 100644
--- a/system/templates/items/item/items.html
+++ b/system/templates/items/item/items.html
@@ -1,13 +1,13 @@
 {{#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}})
-        {{#if ../options.editable}}
+        {{#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}}
     </h3>
     <ul class="item-list inventory-item-list-{{type}}">
         {{#each cat as |item id|}}
-            {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id editable=../../options.editable}}
+            {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id editable=../../options.editable soft_locked=../../data.data.soft_locked}}
         {{/each}}
     </ul>
 {{/each}}
\ No newline at end of file
diff --git a/system/templates/items/weapon/weapons.html b/system/templates/items/weapon/weapons.html
index f352256..99c71e5 100644
--- a/system/templates/items/weapon/weapons.html
+++ b/system/templates/items/weapon/weapons.html
@@ -1,14 +1,14 @@
 <fieldset class="weapons-content">
     <legend class="section-header">
         {{localize 'l5r5e.weapons.title'}}
-        {{#if options.editable}}
+        {{#if data.editable_not_soft_locked}}
         <a data-item-type="weapon" data-item-equipped="true" class="weapon-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
         {{/if}}
     </legend>
     <ul class="item-list">
         {{#each actor.items as |item id|}}
             {{#ifCond (ifCond item.type '==' 'weapon') '&&' (ifCond item.data.data.equipped '==' true)}}
-                {{> 'systems/l5r5e/templates/items/weapon/weapon-entry.html' weapon=item id=id editable=../options.editable}}
+                {{> 'systems/l5r5e/templates/items/weapon/weapon-entry.html' weapon=item id=id editable=../data.editable_not_soft_locked}}
             {{/ifCond}}
         {{/each}}
     </ul>