diff --git a/src/scss/components/_basic_property.scss b/src/scss/components/_basic_property.scss
index 813bf9b7..c253964e 100644
--- a/src/scss/components/_basic_property.scss
+++ b/src/scss/components/_basic_property.scss
@@ -4,12 +4,10 @@
         display: grid;
         align-content: end;
 
-        .basic-property-label,
         & > label {
             font-weight: bold;
         }
 
-        .basic-property-select,
         & > select {
             display: block;
             width: 100%;
diff --git a/src/templates/item/armor-sheet.hbs b/src/templates/item/armor-sheet.hbs
index a0a671dc..b7887131 100644
--- a/src/templates/item/armor-sheet.hbs
+++ b/src/templates/item/armor-sheet.hbs
@@ -6,8 +6,8 @@
             <h2 class="item-type">{{localize (lookup config.itemTypes item.type)}}</h2>
             <div class="grid grid-3col basic-properties">
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.ArmorType"}}</label>
-                    <select class="basic-property-select" name="data.armorType" data-type="String">
+                    <label>{{localize "DS4.ArmorType"}}</label>
+                    <select name="data.armorType" data-type="String">
                         {{#select data.armorType}}
                         {{#each config.armorTypes as |value key|}}
                         <option value="{{key}}">{{value}}</option>
@@ -16,8 +16,8 @@
                     </select>
                 </div>
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.ArmorMaterialType"}}</label>
-                    <select class="basic-property-select" name="data.armorMaterialType" data-type="String">
+                    <label>{{localize "DS4.ArmorMaterialType"}}</label>
+                    <select name="data.armorMaterialType" data-type="String">
                         {{#select data.armorMaterialType}}
                         {{#each config.armorMaterialTypes as |value key|}}
                         <option value="{{key}}">{{value}}</option>
@@ -26,8 +26,8 @@
                     </select>
                 </div>
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.ArmorValue"}}</label>
-                    <input class="basic-property-input" type="text" name="data.armorValue" value="{{data.armorValue}}"
+                    <label>{{localize "DS4.ArmorValue"}}</label>
+                    <input type="text" name="data.armorValue" value="{{data.armorValue}}"
                         placeholder="0" data-dtype="Number" />
                 </div>
             </div>
diff --git a/src/templates/item/shield-sheet.hbs b/src/templates/item/shield-sheet.hbs
index 1e893d2a..ede89655 100644
--- a/src/templates/item/shield-sheet.hbs
+++ b/src/templates/item/shield-sheet.hbs
@@ -6,8 +6,8 @@
             <h2 class="item-type">{{localize (lookup config.itemTypes item.type)}}</h2>
             <div class="grid grid-1col basic-properties">
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.ArmorValue"}}</label>
-                    <input class="basic-property-input" type="text" name="data.armorValue" value="{{data.armorValue}}"
+                    <label>{{localize "DS4.ArmorValue"}}</label>
+                    <input type="text" name="data.armorValue" value="{{data.armorValue}}"
                         placeholder="0" data-dtype="Number" />
                 </div>
             </div>
diff --git a/src/templates/item/talent-sheet.hbs b/src/templates/item/talent-sheet.hbs
index d68f66c2..69c24137 100644
--- a/src/templates/item/talent-sheet.hbs
+++ b/src/templates/item/talent-sheet.hbs
@@ -5,7 +5,7 @@
 
 {{#*inline "talentRankBasicProperty" }}
 <div class="basic-property">
-    <label class="basic-property-label" for="data.rank.{{property}}">{{localize localizeString}}</label>
+    <label for="data.rank.{{property}}">{{localize localizeString}}</label>
     <input type="number" min="0" step="1" data-dtype="Number" {{disabled}}
         {{#if (eq property 'base') }}max="{{data.rank.max}}"{{/if}}
         name="data.rank.{{property}}" value="{{lookup data.rank property}}" />
diff --git a/src/templates/item/weapon-sheet.hbs b/src/templates/item/weapon-sheet.hbs
index 7a7efcfd..24a5f2d7 100644
--- a/src/templates/item/weapon-sheet.hbs
+++ b/src/templates/item/weapon-sheet.hbs
@@ -6,8 +6,8 @@
             <h2 class="item-type">{{localize (lookup config.itemTypes item.type)}}</h2>
             <div class="grid grid-3col basic-properties">
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.AttackType"}}</label>
-                    <select class="basic-property-select" name="data.attackType" data-type="String">
+                    <label>{{localize "DS4.AttackType"}}</label>
+                    <select name="data.attackType" data-type="String">
                         {{#select data.attackType}}
                         {{#each config.attackTypes as |value key|}}
                         <option value="{{key}}">{{value}}</option>
@@ -16,13 +16,13 @@
                     </select>
                 </div>
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.WeaponBonus"}}</label>
-                    <input class="basic-property-input" type="number" name="data.weaponBonus" value="{{data.weaponBonus}}"
+                    <label>{{localize "DS4.WeaponBonus"}}</label>
+                    <input type="number" name="data.weaponBonus" value="{{data.weaponBonus}}"
                         placeholder="0" data-dtype="Number" />
                 </div>
                 <div class="basic-property">
-                    <label class="basic-property-label">{{localize "DS4.OpponentDefense"}}</label>
-                    <input class="basic-property-input" type="number" name="data.opponentDefense"
+                    <label>{{localize "DS4.OpponentDefense"}}</label>
+                    <input type="number" name="data.opponentDefense"
                         value="{{data.opponentDefense}}" placeholder="0" data-dtype="Number" />
                 </div>
             </div>