diff --git a/src/ActorSheet.hbs b/src/ActorSheet.hbs
index 9f1dbf5..05432c7 100644
--- a/src/ActorSheet.hbs
+++ b/src/ActorSheet.hbs
@@ -17,11 +17,11 @@
 
 <div class="actor-sheet ActorSheet" data-tooltip-class="DSA41">
     <div class="grid5 gap">
-        {{>editable-input type="text"   name="name"                value=actor.name                placeholder=(localize "DSA41.name")}}
-        {{>editable-input type="text"   name="system.race"         value=actor.system.race         placeholder=(localize "DSA41.race")}}
-        {{>editable-input type="text"   name="system.culture"      value=actor.system.culture      placeholder=(localize "DSA41.culture")}}
-        {{>editable-input type="text"   name="system.profession"   value=actor.system.profession   placeholder=(localize "DSA41.profession")}}
-        {{>editable-input type="number" name="system.sozialstatus" value=actor.system.sozialstatus placeholder=(localize "DSA41.sozialstatus")}}
+        {{DSA41_input "name"                subtitle="DSA41.name"}}
+        {{DSA41_input "system.race"         subtitle="DSA41.race"}}
+        {{DSA41_input "system.culture"      subtitle="DSA41.culture"}}
+        {{DSA41_input "system.profession"   subtitle="DSA41.profession"}}
+        {{DSA41_input "system.sozialstatus" subtitle="DSA41.sozialstatus"}}
     </div>
 
     <div class="row">
@@ -34,13 +34,13 @@
             </div>
             <div class="grid3">
                 <div class="bar hp" style="--bar-percentage: {{actor.system.computed.lebenspunkte.prozent}}%;">
-                    {{>editable-input type="number" name="system.lebenspunkte.aktuell" value=actor.system.lebenspunkte.aktuell}} / <span>{{actor.system.computed.lebenspunkte.max}}</span>
+                    {{DSA41_input "system.lebenspunkte.aktuell"}} / <span>{{actor.system.computed.lebenspunkte.max}}</span>
                 </div>
                 <div class="bar ausdauer" style="--bar-percentage: {{actor.system.computed.ausdauer.prozent}}%;">
-                    {{>editable-input type="number" name="system.ausdauer.aktuell" value=actor.system.ausdauer.aktuell}} / <span>{{actor.system.computed.ausdauer.max}}</span>
+                    {{DSA41_input "system.ausdauer.aktuell"}} / <span>{{actor.system.computed.ausdauer.max}}</span>
                 </div>
                 <div class="bar astralenergie" style="--bar-percentage: {{actor.system.computed.astralenergie.prozent}}%;">
-                    {{>editable-input type="number" name="system.astralenergie.aktuell" value=actor.system.astralenergie.aktuell}} / <span>{{actor.system.computed.astralenergie.max}}</span>
+                    {{DSA41_input "system.astralenergie.aktuell"}} / <span>{{actor.system.computed.astralenergie.max}}</span>
                 </div>
             </div>
         </div>
@@ -65,9 +65,7 @@
     <div class="tab {{#if (eq tabGroups.primary 'tab1')}}active{{/if}}" data-group="primary" data-tab="tab1">
         <div class="Abenteuerpunkte">
             <span>{{localize "DSA41.abenteuerpunkte"}}:</span>
-            {{>editable-input type="number" name="system.abenteuerpunkte.ausgegeben" value=actor.system.abenteuerpunkte.ausgegeben}}
-            /
-            {{>editable-input type="number" name="system.abenteuerpunkte.gesamt"     value=actor.system.abenteuerpunkte.gesamt}}
+            {{DSA41_input "system.abenteuerpunkte.ausgegeben"}} / {{DSA41_input "system.abenteuerpunkte.gesamt"}}
             <span>({{actor.system.computed.abenteuerpunkte.uebrig}})</span>
         </div>
 
@@ -82,9 +80,9 @@
             {{#each actor.system.attributes}}
                 <div class="list-item">
                     <span>{{localize (concat "DSA41.attributes.long." @key)}}</span>
-                    {{>editable-input type="number" name=(concat "system.attributes." @key ".initial")     value=(lookup this "initial")}}
-                    {{>editable-input type="number" name=(concat "system.attributes." @key ".advancement") value=(lookup this "advancement")}}
-                    {{>editable-input type="number" name=(concat "system.attributes." @key ".modifier")    value=(lookup this "modifier")}}
+                    {{DSA41_input (concat "system.attributes." @key ".initial")}}
+                    {{DSA41_input (concat "system.attributes." @key ".advancement")}}
+                    {{DSA41_input (concat "system.attributes." @key ".modifier")}}
                 </div>
             {{/each}}
         </div>
@@ -102,33 +100,33 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.lebenspunkte"}}</span>
                 <span>{{actor.system.computed.lebenspunkte.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.lebenspunkte.modifikator" value=actor.system.lebenspunkte.modifikator}}</span>
-                <span>{{>editable-input type="number" name="system.lebenspunkte.zukauf"      value=actor.system.lebenspunkte.zukauf}}</span>
-                <span>{{>editable-input type="number" name="system.lebenspunkte.verlust"     value=actor.system.lebenspunkte.verlust}}</span>
+                <span>{{DSA41_input "system.lebenspunkte.modifikator"}}</span>
+                <span>{{DSA41_input "system.lebenspunkte.zukauf"}}</span>
+                <span>{{DSA41_input "system.lebenspunkte.verlust"}}</span>
                 <span>{{actor.system.computed.lebenspunkte.max}}</span>
             </div>
 
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.ausdauer"}}</span>
                 <span>{{actor.system.computed.ausdauer.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.ausdauer.modifikator" value=actor.system.ausdauer.modifikator}}</span>
-                <span>{{>editable-input type="number" name="system.ausdauer.zukauf"      value=actor.system.ausdauer.zukauf}}</span>
-                <span>{{>editable-input type="number" name="system.ausdauer.verlust"     value=actor.system.ausdauer.verlust}}</span>
+                <span>{{DSA41_input "system.ausdauer.modifikator"}}</span>
+                <span>{{DSA41_input "system.ausdauer.zukauf"}}</span>
+                <span>{{DSA41_input "system.ausdauer.verlust"}}</span>
                 <span>{{actor.system.computed.ausdauer.max}}</span>
             </div>
 
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.astralenergie"}}</span>
                 <span>{{actor.system.computed.astralenergie.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.astralenergie.modifikator" value=actor.system.astralenergie.modifikator}}</span>
-                <span>{{>editable-input type="number" name="system.astralenergie.zukauf"      value=actor.system.astralenergie.zukauf}}</span>
-                <span>{{>editable-input type="number" name="system.astralenergie.verlust"     value=actor.system.astralenergie.verlust}}</span>
+                <span>{{DSA41_input "system.astralenergie.modifikator"}}</span>
+                <span>{{DSA41_input "system.astralenergie.zukauf"}}</span>
+                <span>{{DSA41_input "system.astralenergie.verlust"}}</span>
                 <span>{{actor.system.computed.astralenergie.max}}</span>
             </div>
 
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.karmalenergie"}}</span>
-                <span>{{>editable-input type="number" name="system.karmalenergie" value=actor.system.karmalenergie}}</span>
+                <span>{{DSA41_input "system.karmalenergie"}}</span>
                 <span></span>
                 <span></span>
                 <span></span>
@@ -138,8 +136,8 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.magieresistenz"}}</span>
                 <span>{{actor.system.computed.magieresistenz.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.magieresistenz.modifikator" value=actor.system.magieresistenz.modifikator}}</span>
-                <span>{{>editable-input type="number" name="system.magieresistenz.zukauf"      value=actor.system.magieresistenz.zukauf}}</span>
+                <span>{{DSA41_input "system.magieresistenz.modifikator"}}</span>
+                <span>{{DSA41_input "system.magieresistenz.zukauf"}}</span>
                 <span></span>
                 <span>{{actor.system.computed.magieresistenz.max}}</span>
             </div>
@@ -147,7 +145,7 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.initiative"}}</span>
                 <span>{{actor.system.computed.initiative.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.modifikator_initiative" value=actor.system.modifikator_initiative}}</span>
+                <span>{{DSA41_input "system.modifikator_initiative"}}</span>
                 <span></span>
                 <span></span>
                 <span>{{actor.system.computed.initiative.wert}}</span>
@@ -156,7 +154,7 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.attacke"}}</span>
                 <span>{{actor.system.computed.attacke.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.modifikator_attacke" value=actor.system.modifikator_attacke}}</span>
+                <span>{{DSA41_input "system.modifikator_attacke"}}</span>
                 <span></span>
                 <span></span>
                 <span>{{actor.system.computed.attacke.wert}}</span>
@@ -165,7 +163,7 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.parade"}}</span>
                 <span>{{actor.system.computed.parade.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.modifikator_parade" value=actor.system.modifikator_parade}}</span>
+                <span>{{DSA41_input "system.modifikator_parade"}}</span>
                 <span></span>
                 <span></span>
                 <span>{{actor.system.computed.parade.wert}}</span>
@@ -174,7 +172,7 @@
             <div class="list-item">
                 <span>{{localize "DSA41.basiswerte.fernkampf"}}</span>
                 <span>{{actor.system.computed.fernkampf.basiswert}}</span>
-                <span>{{>editable-input type="number" name="system.modifikator_fernkampf" value=actor.system.modifikator_fernkampf}}</span>
+                <span>{{DSA41_input "system.modifikator_fernkampf"}}</span>
                 <span></span>
                 <span></span>
                 <span>{{actor.system.computed.fernkampf.wert}}</span>
@@ -267,7 +265,7 @@
                             {{>die-type type=system.attribute2}}
                             {{>die-type type=system.attribute3}}
                         </div>
-                        <div>{{>editable-input name=(concat name "system.talentwert") type="number" data-name="system.talentwert" value=system.talentwert}}</div>
+                        <div>{{>editable-input type="number" data-name="system.talentwert" value=system.talentwert}}</div>
                         <div class="center fas fa-trash" data-action="item-delete"></div>
                     </div>
                 {{/each}}
@@ -299,13 +297,13 @@
 
     <div class="tab {{#if (eq tabGroups.primary 'tab3')}}active{{/if}}" data-group="primary" data-tab="tab3">
         <div class="currency">
-            {{>editable-input type="number" name="system.currency.dukaten"     value=actor.system.currency.dukaten}}
+            {{DSA41_input "system.currency.dukaten"}}
             <svg viewbox="80 0 40 40"  data-tooltip="{{localize "DSA41.currency.dukaten"}}">    <use href="/systems/dsa-4th-edition/src/Assets/coins.svg#Gold">   </use></svg>
-            {{>editable-input type="number" name="system.currency.silbertaler" value=actor.system.currency.silbertaler}}
+            {{DSA41_input "system.currency.silbertaler"}}
             <svg viewbox="120 0 40 40" data-tooltip="{{localize "DSA41.currency.silbertaler"}}"><use href="/systems/dsa-4th-edition/src/Assets/coins.svg#Diamond"></use></svg>
-            {{>editable-input type="number" name="system.currency.heller"      value=actor.system.currency.heller}}
+            {{DSA41_input "system.currency.heller"}}
             <svg viewbox="0 0 40 40"   data-tooltip="{{localize "DSA41.currency.heller"}}">     <use href="/systems/dsa-4th-edition/src/Assets/coins.svg#Copper"> </use></svg>
-            {{>editable-input type="number" name="system.currency.kreuzer"     value=actor.system.currency.kreuzer}}
+            {{DSA41_input "system.currency.kreuzer"}}
             <svg viewbox="40 0 40 40"  data-tooltip="{{localize "DSA41.currency.kreuzer"}}">    <use href="/systems/dsa-4th-edition/src/Assets/coins.svg#Silver"> </use></svg>
         </div>
 
diff --git a/src/Dialogs/Attacke.hbs b/src/Dialogs/Attacke.hbs
index 34e54b1..db3a854 100644
--- a/src/Dialogs/Attacke.hbs
+++ b/src/Dialogs/Attacke.hbs
@@ -1,6 +1,6 @@
-<div class="parade_dialog">
+<div>
     <span class="colspan2">{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" class="colspan2" value=(lookup formData "modifikator") }}
+    <input class="colspan2" type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <div class="dsa41-calculation colspan4 center">
         <ruby>{{options.item.basis_attacke}}<rt>{{localize "DSA41.bewaffnung.nahkampfwaffe.basis"}}</rt></ruby>
diff --git a/src/Dialogs/Attribute.hbs b/src/Dialogs/Attribute.hbs
index cbd9fc9..c2050e7 100644
--- a/src/Dialogs/Attribute.hbs
+++ b/src/Dialogs/Attribute.hbs
@@ -1,6 +1,6 @@
-<div class="parade_dialog">
+<div>
     <span class="colspan2">{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" class="colspan2" value=(lookup formData "modifikator") }}
+    <input class="colspan2" type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <div class="dsa41-calculation colspan4 center">
         <ruby>{{options.attribute.initial}}<rt>{{localize "DSA41.attributes.initial"}}</rt></ruby>
diff --git a/src/Dialogs/FernkampfAttacke.hbs b/src/Dialogs/FernkampfAttacke.hbs
index 6702876..24a86b7 100644
--- a/src/Dialogs/FernkampfAttacke.hbs
+++ b/src/Dialogs/FernkampfAttacke.hbs
@@ -1,4 +1,4 @@
-<div class="fernkampf_angriff_dialog">
+<div>
     <span>{{localize "DSA41.kampf.zielgroesse.label"}}</span>
     <select name="ziel_groesse">
         <option value="-2" {{#if (eq formData.ziel_groesse -2)}}selected{{/if}}>{{localize "DSA41.kampf.zielgroesse.sehr_gross"}}</option>
@@ -42,7 +42,7 @@
     </select>
 
     <span>{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" value=(lookup formData "modifikator")}}
+    <input type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <div class="dsa41-calculation colspan4 center">
         max(-2,
diff --git a/src/Dialogs/FernkampfTrefferpunkte.hbs b/src/Dialogs/FernkampfTrefferpunkte.hbs
index bc1dff5..642539c 100644
--- a/src/Dialogs/FernkampfTrefferpunkte.hbs
+++ b/src/Dialogs/FernkampfTrefferpunkte.hbs
@@ -1,4 +1,4 @@
-<div class="fernkampf_trefferpunkte_dialog">
+<div>
     <span>{{localize "DSA41.kampf.entfernung.label"}}</span>
     <select name="entfernung">
         <option value="modifikator1" {{#if (eq formData.entfernung "modifikator1")}}selected{{/if}}>{{localize "DSA41.kampf.entfernung.sehr_nah"}}   </option>
@@ -9,10 +9,10 @@
     </select>
 
     <span>{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" value=(lookup formData "modifikator") }}
+    <input type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <span>{{localize "DSA41.kampf.crit"}}</span>
-    {{>editable-input type="checkbox" name="crit" class="center" value=(lookup formData "crit")}}
+    <input class="center" type="checkbox" name="crit" {{checked (lookup formData "crit")}}>
 
     <div class="dsa41-calculation colspan4 center">
         {{#if formData.crit}}<ruby>2 * <rt>{{localize "DSA41.kampf.crit"}}</rt></ruby>({{/if}}
diff --git a/src/Dialogs/Parade.hbs b/src/Dialogs/Parade.hbs
index e597f80..ccde324 100644
--- a/src/Dialogs/Parade.hbs
+++ b/src/Dialogs/Parade.hbs
@@ -1,9 +1,9 @@
-<div class="parade_dialog">
+<div>
     <span>{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" value=(lookup formData "modifikator") }}
+    <input type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <span>{{localize "DSA41.kampf.crit"}}</span>
-    {{>editable-input type="checkbox" name="crit" class="center" value=(lookup formData "crit")}}
+    <input class="center" type="checkbox" name="crit" {{checked (lookup formData "crit")}}>
 
     <div class="dsa41-calculation colspan4 center">
         {{#if formData.crit}}({{/if}}
diff --git a/src/Dialogs/Talent.hbs b/src/Dialogs/Talent.hbs
index 1cc5294..604c2f6 100644
--- a/src/Dialogs/Talent.hbs
+++ b/src/Dialogs/Talent.hbs
@@ -1,4 +1,4 @@
-<div class="talent_dialog">
+<div>
     <span class="colspan2">{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input class="colspan2" type="number" name="modifikator" value=(lookup formData "modifikator") }}
+    <input class="colspan2" type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 </div>
diff --git a/src/Dialogs/Trefferpunkte.hbs b/src/Dialogs/Trefferpunkte.hbs
index 5560bff..a3540e6 100644
--- a/src/Dialogs/Trefferpunkte.hbs
+++ b/src/Dialogs/Trefferpunkte.hbs
@@ -1,9 +1,9 @@
-<div class="trefferpunkte_dialog">
+<div>
     <span>{{localize "DSA41.kampf.modifikator"}}</span>
-    {{>editable-input type="number" name="modifikator" value=(lookup formData "modifikator") }}
+    <input type="number" name="modifikator" value="{{lookup formData "modifikator"}}">
 
     <span>{{localize "DSA41.kampf.crit"}}</span>
-    {{>editable-input type="checkbox" name="crit" class="center" value=(lookup formData "crit")}}
+    <input class="center" type="checkbox" name="crit" {{checked (lookup formData "crit")}}>
 
     <div class="dsa41-calculation colspan4 center">
         {{#if formData.crit}}<ruby>2 * <rt>{{localize "DSA41.kampf.crit"}}</rt></ruby>({{/if}}
diff --git a/src/Dialogs/Trefferzone.hbs b/src/Dialogs/Trefferzone.hbs
index 93cf43d..88544e0 100644
--- a/src/Dialogs/Trefferzone.hbs
+++ b/src/Dialogs/Trefferzone.hbs
@@ -1,4 +1,4 @@
-<div class="trefferzone_dialog">
+<div>
     <select name="trefferzone" class="colspan4">
         <option value="kopf"         {{#if (eq formData.trefferzone "kopf")        }}selected{{/if}}>{{localize "DSA41.ruestungen.kopf"}}        </option>
         <option value="brust"        {{#if (eq formData.trefferzone "brust")       }}selected{{/if}}>{{localize "DSA41.ruestungen.brust"}}       </option>
diff --git a/src/ItemSheets/Bewaffnung.hbs b/src/ItemSheets/Bewaffnung.hbs
index e194357..63f2023 100644
--- a/src/ItemSheets/Bewaffnung.hbs
+++ b/src/ItemSheets/Bewaffnung.hbs
@@ -2,81 +2,81 @@
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
-            {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
-            <div class="row gap">
-                {{>editable-input type="number" name="system.gewicht" value=item.system.gewicht placeholder=(localize "DSA41.weight")}}
-                {{>editable-input type="number" name="system.preis"   value=item.system.preis   placeholder=(localize "DSA41.price")}}
+            {{DSA41_input "name" subtitle="DSA41.name"}}
+            <div class="grid2 gap">
+                {{DSA41_input "system.gewicht" subtitle="DSA41.weight"}}
+                {{DSA41_input "system.preis"   subtitle="DSA41.price"}}
             </div>
         </div>
     </div>
     <nav class="tabs">
         <div class="row noflex {{#if (eq tabGroups.primary 'tab1')}}active{{/if}}" data-group="primary" data-tab="tab1">
             <a data-group="primary" data-tab="tab1" data-action="tab">{{localize "DSA41.bewaffnung.nahkampfwaffe.label"}}</a>
-            {{>editable-input type="checkbox" name="system.nahkampfwaffe.aktiv" value=item.system.nahkampfwaffe.aktiv}}
+            {{DSA41_input "system.nahkampfwaffe.aktiv"}}
         </div>
         <div class="row noflex {{#if (eq tabGroups.primary 'tab2')}}active{{/if}}" data-group="primary" data-tab="tab2">
             <a data-group="primary" data-tab="tab2" data-action="tab">{{localize "DSA41.bewaffnung.parierwaffe.label"}}</a>
-            {{>editable-input type="checkbox" name="system.parierwaffe.aktiv" value=item.system.parierwaffe.aktiv}}
+            {{DSA41_input "system.parierwaffe.aktiv"}}
         </div>
         <div class="row noflex {{#if (eq tabGroups.primary 'tab3')}}active{{/if}}" data-group="primary" data-tab="tab3">
             <a data-group="primary" data-tab="tab3" data-action="tab">{{localize "DSA41.bewaffnung.schild.label"}}</a>
-            {{>editable-input type="checkbox" name="system.schild.aktiv" value=item.system.schild.aktiv}}
+            {{DSA41_input "system.schild.aktiv"}}
         </div>
         <div class="row noflex {{#if (eq tabGroups.primary 'tab4')}}active{{/if}}" data-group="primary" data-tab="tab4">
             <a data-group="primary" data-tab="tab4" data-action="tab">{{localize "DSA41.bewaffnung.fernkampfwaffe.label"}}</a>
-            {{>editable-input type="checkbox" name="system.fernkampfwaffe.aktiv" value=item.system.fernkampfwaffe.aktiv}}
+            {{DSA41_input "system.fernkampfwaffe.aktiv"}}
         </div>
     </nav>
     
     <div class="tab {{#if (eq tabGroups.primary 'tab1')}}active{{/if}}" data-group="primary" data-tab="tab1">
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.trefferpunkte"}}</span>
         <div class="grid3 center">
-            {{>editable-input type="text"   name="system.nahkampfwaffe.basis"            value=item.system.nahkampfwaffe.basis            placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.basis")}}
-            {{>editable-input type="number" name="system.nahkampfwaffe.schwellenwert"    value=item.system.nahkampfwaffe.schwellenwert    placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schwellenwert")}}
-            {{>editable-input type="number" name="system.nahkampfwaffe.schadensschritte" value=item.system.nahkampfwaffe.schadensschritte placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schadensschritte")}}
+            {{DSA41_input "system.nahkampfwaffe.basis"            subtitle="DSA41.bewaffnung.nahkampfwaffe.basis"}}
+            {{DSA41_input "system.nahkampfwaffe.schwellenwert"    subtitle="DSA41.bewaffnung.nahkampfwaffe.schwellenwert"}}
+            {{DSA41_input "system.nahkampfwaffe.schadensschritte" subtitle="DSA41.bewaffnung.nahkampfwaffe.schadensschritte"}}
         </div>
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.modifikator"}}</span>
         <div class="grid2">
-            {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_attacke" value=item.system.nahkampfwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.attacke")}}
-            {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_parade"  value=item.system.nahkampfwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.parade")}}
+            {{DSA41_input "system.nahkampfwaffe.modifikator_attacke" subtitle="DSA41.bewaffnung.nahkampfwaffe.attacke"}}
+            {{DSA41_input "system.nahkampfwaffe.modifikator_parade"  subtitle="DSA41.bewaffnung.nahkampfwaffe.parade"}}
         </div>
 
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.initiative"}}</span>
-        <div>{{>editable-input type="number" name="system.nahkampfwaffe.initiative" value=item.system.nahkampfwaffe.initiative}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.initiative"}}</div>
         <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
-        <div>{{>editable-input type="number" name="system.nahkampfwaffe.bruchfaktor" value=item.system.nahkampfwaffe.bruchfaktor}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.bruchfaktor"}}</div>
 
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.distanzklasse"}}</span>
-        <div>{{>editable-input type="text" name="system.nahkampfwaffe.distanzklasse" value=item.system.nahkampfwaffe.distanzklasse}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.distanzklasse"}}</div>
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.kampftalente"}}</span>
-        <div>{{>editable-input type="text" name="system.nahkampfwaffe.kampftalente" value=item.system.nahkampfwaffe.kampftalente}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.kampftalente"}}</div>
 
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.laenge"}}</span>
-        <div>{{>editable-input type="number" name="system.nahkampfwaffe.laenge" value=item.system.nahkampfwaffe.laenge}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.laenge"}}</div>
         <div class="colspan2"></div>
 
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.zweihaendig"}}</span>
-        <div>{{>editable-input type="checkbox" name="system.nahkampfwaffe.zweihaendig" value=item.system.nahkampfwaffe.zweihaendig}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.zweihaendig"}}</div>
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.werfbar"}}</span>
-        <div>{{>editable-input type="checkbox" name="system.nahkampfwaffe.werfbar" value=item.system.nahkampfwaffe.werfbar}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.werfbar"}}</div>
 
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.improvisiert"}}</span>
-        <div>{{>editable-input type="checkbox" name="system.nahkampfwaffe.improvisiert" value=item.system.nahkampfwaffe.improvisiert}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.improvisiert"}}</div>
         <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.priviligiert"}}</span>
-        <div>{{>editable-input type="checkbox" name="system.nahkampfwaffe.priviligiert" value=item.system.nahkampfwaffe.priviligiert}}</div>
+        <div>{{DSA41_input "system.nahkampfwaffe.priviligiert"}}</div>
     </div>
 
     <div class="tab {{#if (eq tabGroups.primary 'tab2')}}active{{/if}}" data-group="primary" data-tab="tab2">
         <span>{{localize "DSA41.bewaffnung.parierwaffe.initiative"}}</span>
-        <div>{{>editable-input type="number" name="system.parierwaffe.initiative" value=item.system.parierwaffe.initiative}}</div>
+        <div>{{DSA41_input "system.parierwaffe.initiative"}}</div>
         <span>{{localize "DSA41.bewaffnung.parierwaffe.modifikator"}}</span>
         <div class="grid2">
-            {{>editable-input type="number" name="system.parierwaffe.modifikator_attacke" value=item.system.parierwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.parierwaffe.attacke")}}
-            {{>editable-input type="number" name="system.parierwaffe.modifikator_parade"  value=item.system.parierwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.parierwaffe.parade")}}
+            {{DSA41_input "system.parierwaffe.modifikator_attacke" subtitle="DSA41.bewaffnung.parierwaffe.attacke"}}
+            {{DSA41_input "system.parierwaffe.modifikator_parade"  subtitle="DSA41.bewaffnung.parierwaffe.parade"}}
         </div>
         
         <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
-        <div>{{>editable-input type="number" name="system.parierwaffe.bruchfaktor" value=item.system.parierwaffe.bruchfaktor}}</div>
+        <div>{{DSA41_input "system.parierwaffe.bruchfaktor"}}</div>
     </div>
 
     <div class="tab {{#if (eq tabGroups.primary 'tab3')}}active{{/if}}" data-group="primary" data-tab="tab3">
@@ -84,43 +84,43 @@
         {{DSA41_input "system.schild.groesse"}}
         <span>{{localize "DSA41.bewaffnung.schild.modifikator"}}</span>
         <div class="grid2">
-            {{>editable-input type="number" name="system.schild.modifikator_attacke" value=item.system.schild.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.schild.attacke")}}
-            {{>editable-input type="number" name="system.schild.modifikator_parade"  value=item.system.schild.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.schild.parade")}}
+            {{DSA41_input "system.schild.modifikator_attacke" subtitle="DSA41.bewaffnung.schild.attacke"}}
+            {{DSA41_input "system.schild.modifikator_parade"  subtitle="DSA41.bewaffnung.schild.parade"}}
         </div>
         
         <span>{{localize "DSA41.bewaffnung.schild.initiative"}}</span>
-        <div>{{>editable-input type="number" name="system.schild.initiative" value=item.system.schild.initiative}}</div>
+        <div>{{DSA41_input "system.schild.initiative"}}</div>
         <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
-        <div>{{>editable-input type="number" name="system.schild.bruchfaktor" value=item.system.schild.bruchfaktor}}</div>
+        <div>{{DSA41_input "system.schild.bruchfaktor"}}</div>
     </div>
 
     <div class="tab {{#if (eq tabGroups.primary 'tab4')}}active{{/if}}" data-group="primary" data-tab="tab4">
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.trefferpunkte"}}</span>
-        <div class="center">{{>editable-input type="text" name="system.fernkampfwaffe.basis" value=item.system.fernkampfwaffe.basis}}</div>
+        <div class="center">{{DSA41_input "system.fernkampfwaffe.basis"}}</div>
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.laden"}}</span>
-        <div>{{>editable-input type="number" name="system.fernkampfwaffe.laden" value=item.system.fernkampfwaffe.laden}}</div>
+        <div>{{DSA41_input "system.fernkampfwaffe.laden"}}</div>
 
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionskosten"}}</span>
-        <div>{{>editable-input type="number" name="system.fernkampfwaffe.munitionskosten" value=item.system.fernkampfwaffe.munitionskosten}}</div>
+        <div>{{DSA41_input "system.fernkampfwaffe.munitionskosten"}}</div>
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionsgewicht"}}</span>
-        <div>{{>editable-input type="number" name="system.fernkampfwaffe.munitionsgewicht" value=item.system.fernkampfwaffe.munitionsgewicht}}</div>
+        <div>{{DSA41_input "system.fernkampfwaffe.munitionsgewicht"}}</div>
 
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.reichweiten"}}</span>
         <div class="colspan3 grid5">
-            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite1" value=item.system.fernkampfwaffe.reichweite1}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite2" value=item.system.fernkampfwaffe.reichweite2}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite3" value=item.system.fernkampfwaffe.reichweite3}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite4" value=item.system.fernkampfwaffe.reichweite4}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite5" value=item.system.fernkampfwaffe.reichweite5}}
+            {{DSA41_input "system.fernkampfwaffe.reichweite1"}}
+            {{DSA41_input "system.fernkampfwaffe.reichweite2"}}
+            {{DSA41_input "system.fernkampfwaffe.reichweite3"}}
+            {{DSA41_input "system.fernkampfwaffe.reichweite4"}}
+            {{DSA41_input "system.fernkampfwaffe.reichweite5"}}
         </div>
 
         <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.modifikator"}}</span>
         <div class="row colspan3 grid5">
-            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator1" value=item.system.fernkampfwaffe.modifikator1}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator2" value=item.system.fernkampfwaffe.modifikator2}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator3" value=item.system.fernkampfwaffe.modifikator3}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator4" value=item.system.fernkampfwaffe.modifikator4}}
-            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator5" value=item.system.fernkampfwaffe.modifikator5}}
+            {{DSA41_input "system.fernkampfwaffe.modifikator1"}}
+            {{DSA41_input "system.fernkampfwaffe.modifikator2"}}
+            {{DSA41_input "system.fernkampfwaffe.modifikator3"}}
+            {{DSA41_input "system.fernkampfwaffe.modifikator4"}}
+            {{DSA41_input "system.fernkampfwaffe.modifikator5"}}
         </div>
     </div>
 </div>
diff --git a/src/ItemSheets/Gegenstand.hbs b/src/ItemSheets/Gegenstand.hbs
index fb2b4ff..6c7174e 100644
--- a/src/ItemSheets/Gegenstand.hbs
+++ b/src/ItemSheets/Gegenstand.hbs
@@ -2,10 +2,10 @@
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
-            {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
-            <div class="row gap">
-                {{>editable-input type="number" name="system.gewicht" value=item.system.gewicht placeholder=(localize "DSA41.weight")}}
-                {{>editable-input type="number" name="system.preis"   value=item.system.preis   placeholder=(localize "DSA41.price")}}
+            {{DSA41_input "name" subtitle="DSA41.name"}}
+            <div class="grid2 gap">
+                {{DSA41_input "system.gewicht" subtitle="DSA41.weight"}}
+                {{DSA41_input "system.preis"   subtitle="DSA41.price"}}
             </div>
         </div>
     </div>
diff --git a/src/ItemSheets/Kampftalent.hbs b/src/ItemSheets/Kampftalent.hbs
index e96494b..e1b12b8 100644
--- a/src/ItemSheets/Kampftalent.hbs
+++ b/src/ItemSheets/Kampftalent.hbs
@@ -3,12 +3,12 @@
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
             <div class="grid3 gap">
-                {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
+                {{DSA41_input "name" subtitle="DSA41.name"}}
                 <div>
                     {{DSA41_input "system.steigern"}}
                     <div class="placeholder">{{localize "DSA41.kampftalent.label_steigern"}}</div>
                 </div>
-                {{>editable-input type="text" name="system.behinderung" value=item.system.behinderung placeholder=(localize "DSA41.talente.label_behinderung")}}
+                {{DSA41_input "system.behinderung" subtitle="DSA41.talente.label_behinderung"}}
             </div>
             <div class="grid gap">
                 <div>
diff --git a/src/ItemSheets/Ruestung.hbs b/src/ItemSheets/Ruestung.hbs
index 21259c4..b58d20c 100644
--- a/src/ItemSheets/Ruestung.hbs
+++ b/src/ItemSheets/Ruestung.hbs
@@ -2,38 +2,38 @@
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
-            {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
-            <div class="row gap">
-                {{>editable-input type="number" name="system.gewicht" value=item.system.gewicht placeholder=(localize "DSA41.weight")}}
-                {{>editable-input type="number" name="system.preis"   value=item.system.preis   placeholder=(localize "DSA41.price")}}
+            {{DSA41_input "name" subtitle="DSA41.name"}}
+            <div class="grid2 gap">
+                {{DSA41_input "system.gewicht" subtitle="DSA41.weight"}}
+                {{DSA41_input "system.preis"   subtitle="DSA41.price"}}
             </div>
         </div>
     </div>
 
     <div class="tab active">
         <span>{{localize "DSA41.ruestungen.kopf"}}</span>
-        <div>{{>editable-input type="number" name="system.kopf" value=item.system.kopf}}</div>
+        <div>{{DSA41_input "system.kopf"}}</div>
         <span>{{localize "DSA41.ruestungen.brust"}}</span>
-        <div>{{>editable-input type="number" name="system.brust" value=item.system.brust}}</div>
+        <div>{{DSA41_input "system.brust"}}</div>
         
         <span>{{localize "DSA41.ruestungen.ruecken"}}</span>
-        <div>{{>editable-input type="number" name="system.ruecken" value=item.system.ruecken}}</div>
+        <div>{{DSA41_input "system.ruecken"}}</div>
         <span>{{localize "DSA41.ruestungen.bauch"}}</span>
-        <div>{{>editable-input type="number" name="system.bauch" value=item.system.bauch}}</div>
+        <div>{{DSA41_input "system.bauch"}}</div>
         
         <span>{{localize "DSA41.ruestungen.linker_arm"}}</span>
-        <div>{{>editable-input type="number" name="system.linker_arm" value=item.system.linker_arm}}</div>
+        <div>{{DSA41_input "system.linker_arm"}}</div>
         <span>{{localize "DSA41.ruestungen.rechter_arm"}}</span>
-        <div>{{>editable-input type="number" name="system.rechter_arm" value=item.system.rechter_arm}}</div>
+        <div>{{DSA41_input "system.rechter_arm"}}</div>
         
         <span>{{localize "DSA41.ruestungen.linkes_bein"}}</span>
-        <div>{{>editable-input type="number" name="system.linkes_bein" value=item.system.linkes_bein}}</div>
+        <div>{{DSA41_input "system.linkes_bein"}}</div>
         <span>{{localize "DSA41.ruestungen.rechtes_bein"}}</span>
-        <div>{{>editable-input type="number" name="system.rechtes_bein" value=item.system.rechtes_bein}}</div>
+        <div>{{DSA41_input "system.rechtes_bein"}}</div>
         
         <span>{{localize "DSA41.ruestungen.gesamt_ruestungsschutz"}}</span>
-        <div>{{>editable-input type="number" name="system.gesamt_ruestungsschutz" value=item.system.gesamt_ruestungsschutz}}</div>
+        <div>{{DSA41_input "system.gesamt_ruestungsschutz"}}</div>
         <span>{{localize "DSA41.ruestungen.gesamt_behinderung"}}</span>
-        <div>{{>editable-input type="number" name="system.gesamt_behinderung" value=item.system.gesamt_behinderung}}</div>
+        <div>{{DSA41_input "system.gesamt_behinderung"}}</div>
     </div>
 </div>
diff --git a/src/ItemSheets/Sonderfertigkeit.hbs b/src/ItemSheets/Sonderfertigkeit.hbs
index 8f23b79..905a169 100644
--- a/src/ItemSheets/Sonderfertigkeit.hbs
+++ b/src/ItemSheets/Sonderfertigkeit.hbs
@@ -3,15 +3,15 @@
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
             <div class="grid2 gap">
-                {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
+                {{DSA41_input "name" subtitle="DSA41.name"}}
                 <div>
                     {{DSA41_input "system.kategorie"}}
                     <div class="placeholder">{{localize "DSA41.sonderfertigkeiten.kategorie.label"}}</div>
                 </div>
             </div>
             <div class="grid2 gap">
-                {{>editable-input type="number" name="system.kosten"      value=item.system.kosten      placeholder=(localize "DSA41.sonderfertigkeiten.kosten")}}
-                {{>editable-input type="number" name="system.verbreitung" value=item.system.verbreitung placeholder=(localize "DSA41.sonderfertigkeiten.verbreitung")}}
+                {{DSA41_input "system.kosten"      subtitle="DSA41.sonderfertigkeiten.kosten"}}
+                {{DSA41_input "system.verbreitung" subtitle="DSA41.sonderfertigkeiten.verbreitung"}}
             </div>
         </div>
     </div>
diff --git a/src/ItemSheets/Talent.hbs b/src/ItemSheets/Talent.hbs
index f2e8bee..9a2c189 100644
--- a/src/ItemSheets/Talent.hbs
+++ b/src/ItemSheets/Talent.hbs
@@ -3,12 +3,12 @@
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
             <div class="grid3 gap">
-                {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
+                {{DSA41_input "name" subtitle="DSA41.name"}}
                 <div>
                     {{DSA41_input "system.kategorie"}}
                     <div class="placeholder">{{localize "DSA41.talente.label_kategorie"}}</div>
                 </div>
-                {{>editable-input type="text" name="system.behinderung" value=item.system.behinderung placeholder=(localize "DSA41.talente.label_behinderung")}}
+                {{DSA41_input "system.behinderung" subtitle="DSA41.talente.label_behinderung"}}
             </div>
             <div class="grid3 gap">
                 {{DSA41_input "system.attribute1"}}
diff --git a/src/ItemSheets/VorNachteil.hbs b/src/ItemSheets/VorNachteil.hbs
index f0792c9..dc8e6ba 100644
--- a/src/ItemSheets/VorNachteil.hbs
+++ b/src/ItemSheets/VorNachteil.hbs
@@ -3,8 +3,8 @@
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" data-action="editImage" data-edit="img">
         <div class="col">
             <div class="grid2 gap">
-                {{>editable-input type="text" name="name" value=item.name placeholder=(localize "DSA41.name")}}
-                {{>editable-input type="number" name="system.kosten" value=item.system.kosten placeholder=(localize "DSA41.vornachteil.kosten")}}
+                {{DSA41_input "name"          subtitle="DSA41.name"}}
+                {{DSA41_input "system.kosten" subtitle="DSA41.vornachteil.kosten"}}
             </div>
             <div>
                 {{DSA41_input "system.kategorie"}}
diff --git a/src/main.css b/src/main.css
index f25fdd0..df61e5c 100644
--- a/src/main.css
+++ b/src/main.css
@@ -114,15 +114,11 @@ html {
     & .rowspan9    { grid-row: span 9; }
     & .rowspan-all { grid-row: 1 / -1; }
 
-    & .editable-input {
-        flex: 1;
+    & input {
+        border: none;
+        text-align: inherit;
 
-        & input {
-            border: none;
-            text-align: inherit;
-        }
-
-        &.editable-number {
+        &[type="number"] {
             text-align: center;
         }
     }
@@ -254,14 +250,11 @@ html {
             background: linear-gradient(90deg, var(--bar-color-left) 0%, var(--bar-color-right) 100%);
         }
 
-        & .editable-input, & span {
+        & input, & span {
             display: inline-block;
+            background: transparent;
+            padding: 0;
             width:   4ch;
-
-            & input {
-                background: transparent;
-                padding: 0;
-            }
         }
 
         &.hp {
@@ -288,14 +281,12 @@ html {
         display: grid;
         grid-template-columns: repeat(8, 1fr);
 
-        & .editable-input {
-            display: inline-block;
+        & input {
+            display:    inline-block;
+            background: transparent;
+
+            padding: 0;
             width:   7ch;
-            
-            & input {
-                background: transparent;
-                padding: 0;
-            }
         }
 
         & svg {
@@ -312,14 +303,12 @@ html {
         display: flex;
         gap: 1em;
 
-        & .editable-input {
-            display: inline-block;
-            width:   5ch;
+        & input {
+            display:    inline-block;
+            background: transparent;
 
-            & input {
-                background: transparent;
-                padding: 0;
-            }
+            padding: 0;
+            width:   5ch;
         }
     }