diff --git a/templates/items/equipment.html b/templates/items/equipment.html
index 9a9740f4..42415b85 100644
--- a/templates/items/equipment.html
+++ b/templates/items/equipment.html
@@ -76,32 +76,15 @@
             </div>
             {{/unless}}
 
-            {{#unless isWeapon }}
-            {{!-- ArmorProperties Formula --}}
-            <div class="form-group stacked weapon-properties">
-            <h4 class="armorproperties-header">
-                {{#unless isWeapon }}{{ localize "SW5E.ArmorProperties" }}{{ else }}{{ localize "SW5E.ItemWeaponProperties" }}{{/unless}}
-                <a class="armorproperties-control add-armorproperties"><i class="fas fa-plus"></i></a>
-            </h4>
-            <ol class="armorproperties-parts form-group">
-                {{#each data.armorproperties.parts as |part i| }}
-                <li class="armorproperties-part flexrow" data-armorproperties-part="{{i}}">
-                    
-                    <select name="data.armorproperties.parts.{{i}}.1">
-                        {{#select (lookup this "1") }}
-                        <option value="">{{ localize "SW5E.None" }}</option>
-                        {{#each ../config.armorpropertiesTypes as |name type|}}
-                        <option value="{{type}}">{{name}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                    <input type="text" name="data.armorproperties.parts.{{i}}.0" value="{{lookup this "0"}}"/>
-                    <a class="armorproperties-control delete-armorproperties"><i class="fas fa-minus"></i></a>
-                </li>
+            {{!-- Armor Properties --}}
+            <div class="form-group stacked armor-properties">
+                <label>{{ localize "SW5E.ArmorProperties" }}</label>
+                {{#each config.armorPropertiesTypes as |name prop|}}
+                <label class="checkbox">
+                    <input type="checkbox" name="data.properties.{{prop}}" {{checked (lookup ../data.properties prop)}}/> {{ name }}
+                </label>
                 {{/each}}
-            </ol>
             </div>
-            {{/unless}}
 
             {{!-- Armor Class --}}
             <div class="form-group">
diff --git a/templates/items/weapon.html b/templates/items/weapon.html
index 34d7376f..060e0979 100644
--- a/templates/items/weapon.html
+++ b/templates/items/weapon.html
@@ -77,7 +77,6 @@
             </div>
             {{/unless}}
 
-			{{#if sss}}
             {{!-- Weapon Properties --}}
             <div class="form-group stacked weapon-properties">
                 <label>{{ localize "SW5E.ItemWeaponProperties" }}</label>
@@ -87,34 +86,6 @@
                 </label>
                 {{/each}}
             </div>
-			{{/if}}
-
-            {{#if isWeapon }}			
-            <div class="form-group stacked weapon-properties">			
-            {{!-- weaponproperties Formula --}}
-            <h4 class="weaponproperties-header">
-                {{#unless isWeapon }}{{ localize "SW5E.ArmorProperties" }}{{ else }}{{ localize "SW5E.ItemWeaponProperties" }}{{/unless}}
-                <a class="weaponproperties-control add-weaponproperties"><i class="fas fa-plus"></i></a>
-            </h4>
-            <ol class="weaponproperties-parts form-group">
-                {{#each data.weaponproperties.parts as |part i| }}
-                <li class="weaponproperties-part flexrow" data-weaponproperties-part="{{i}}">
-                    
-                    <select name="data.weaponproperties.parts.{{i}}.1">
-                        {{#select (lookup this "1") }}
-                        <option value="">{{ localize "SW5E.None" }}</option>
-                        {{#each ../config.weaponProperties as |name type|}}
-                        <option value="{{type}}">{{name}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                    <input type="text" name="data.weaponproperties.parts.{{i}}.0" value="{{lookup this "0"}}"/>
-                    <a class="weaponproperties-control delete-weaponproperties"><i class="fas fa-minus"></i></a>
-                </li>
-                {{/each}}
-            </ol>
-            </div>
-            {{/if}}
 
             {{#if isMountable}}
             <div class="form-group">