diff --git a/lang/de.json b/lang/de.json
index bd65e5d..327c633 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -326,26 +326,39 @@
 	"midgard5.spell-reagens": "Reagens",
 	"midgard5.spell-material": "Zaubermaterial",
 
-	"midgard5.kampfkunst-type": "Kampfkunst Art",
-	"midgard5.kampfkunst-variante": "Kampfkunst Variante",
+	"midgard5.kampfkunst-type": "Form",
+	"midgard5.kampfkunst-variante": "Variante",
 	"midgard5.kampfkunst-variante-short": "Var",
-	"midgard5.kido-type": "Kido Art",
-	"midgard5.kido-variante": "Kido Variante",
+	"midgard5.kampfkunst-ep": "Erfahrungspunkte",
+	"midgard5.kampfkunst-rank": "Stufe",
+	"midgard5.kampfkunst-weapon": "Waffengruppe",
+	"midgard5.kampfkunst-enemy": "Einschränkungen durch Art der Gegner",
 
-	"midgard5.kampfkunst-type-angriff": "Angriffstechnik",
-	"midgard5.kampfkunst-type-verteidigung": "Verteidigungstechnik",
+	"midgard5.kampfkunst-type-angriff": "Angriff",
+	"midgard5.kampfkunst-type-verteidigung": "Verteidigung",
 	"midgard5.kampfkunst-type-finte": "Finte",
 	"midgard5.kampfkunst-type-geist": "Geistestechnik",
 	"midgard5.kampfkunst-type-schießkunst": "Schießkunst",
-	"midgard5.kampfkunst-type-fechten": "Fechtkunst",
-	"midgard5.kido-type-angriff": "Kido Angriffstechnik",
-	"midgard5.kido-type-verteidigung": "Kido Verteidigungstechnik",
-	"midgard5.kido-type-finte": "Kido Finte",
-	"midgard5.kido-type-leib": "Kido Leibestechnik",
+	"midgard5.kampfkunst-type-fechtkunst": "Fechtkunst",
 
 	"midgard5.kampfkunst-variante-anstuermen": "Anstürmen",
 	"midgard5.kampfkunst-variante-attackieren": "Attackieren",
 	"midgard5.kampfkunst-variante-entwaffnen": "Entwaffnen",
+	"midgard5.kampfkunst-variante-fechten": "Fechten",
+	"midgard5.kampfkunst-variante-schusstechnik": "Schusstechnik",
+	"midgard5.kampfkunst-variante-finten": "Finten",
+	"midgard5.kampfkunst-variante-geistestechnik": "Geistestechnik",
+	"midgard5.kampfkunst-variante-verteidigung": "Verteidigung",
+
+	"midgard5.kido-type": "KiDo Form",
+	"midgard5.kido-variante": "KiDo Variante",
+	"midgard5.kido-color": "Kampfstilfarbe",
+	"midgard5.kido-style": "Art der Technik",
+
+	"midgard5.kido-type-angriff": "Kido Angriff",
+	"midgard5.kido-type-verteidigung": "Kido Verteidigung",
+	"midgard5.kido-type-finte": "Kido Finte",
+	"midgard5.kido-type-leib": "Kido Leibestechnik",
 
 	"midgard5.kido-variante-anspringen": "Anspringen",
 	"midgard5.kido-variante-attackieren": "Attackieren",
diff --git a/source/template.json b/source/template.json
index de65935..ddf875d 100644
--- a/source/template.json
+++ b/source/template.json
@@ -274,7 +274,7 @@
 					"finte": "midgard5.kampfkunst-type-finte",
 					"geist": "midgard5.kampfkunst-type-geist",
 					"schießkunst": "midgard5.kampfkunst-type-schießkunst",
-					"fechten": "midgard5.kampfkunst-type-fechten"
+					"fechtkunst": "midgard5.kampfkunst-type-fechtkunst"
 				},
 				"kidoTypeSelection": {
 					"angriff": "midgard5.kido-type-angriff",
@@ -285,7 +285,12 @@
 				"kampfkunstVarianteSelection": {
 					"anstuermen": "midgard5.kampfkunst-variante-anstuermen",
 					"attackieren": "midgard5.kampfkunst-variante-attackieren",
-					"entwaffnen": "midgard5.kampfkunst-variante-entwaffnen"
+					"entwaffnen": "midgard5.kampfkunst-variante-entwaffnen",
+					"fechten": "midgard5.kampfkunst-variante-fechten",
+					"schusstechnik": "midgard5.kampfkunst-variante-schusstechnik",
+					"finten": "midgard5.kampfkunst-variante-finten",
+                	"geistestechnik": "midgard5.kampfkunst-variante-geistestechnik",
+					"verteidigung": "midgard5.kampfkunst-variante-verteidigung"
 				},
 				"kidoVarianteSelection": {
 					"none": "midgard5.spell-process-none",
@@ -437,6 +442,12 @@
 			"variante": "",
 			"isKido": false,
 			"ap": "",
+			"weapon": "",
+			"ep": "",
+			"rank": "",
+			"enemy": "",
+			"color": "",
+			"style": "",
 			"rolls": {
 				"formulas": {
 					"0": {
diff --git a/templates/chat/roll-m5.hbs b/templates/chat/roll-m5.hbs
index 8e06f8e..1613af5 100644
--- a/templates/chat/roll-m5.hbs
+++ b/templates/chat/roll-m5.hbs
@@ -64,21 +64,43 @@
 							<td>{{localize "midgard5.actor-ap"}}</td>
 							<td class="roll-spell-details">{{i.ap}}</td>
 						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-ep"}}</td>
+							<td class="roll-spell-details">{{i.ep}}</td>
+						</tr>
 						<tr>
 							<td>{{localize "midgard5.kampfkunst-type"}}</td>
 							<td class="roll-spell-details">{{localize (m5concat "midgard5.kampfkunst-type-" i.type)}}</td>
 						</tr>
-						{{#if (eq i.type "angriff")}}
-							<tr>
-								<td>{{localize "midgard5.kampfkunst-variante"}}</td>
-								<td class="roll-spell-details">{{localize (m5concat "midgard5.kampfkunst-variante-" i.variante)}}</td>
-							</tr>
-						{{/if}}
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-variante"}}</td>
+							<td class="roll-spell-details">{{localize (m5concat "midgard5.kampfkunst-variante-" i.variante)}}</td>
+						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-enemy"}}</td>
+							<td class="roll-spell-details">{{i.enemy}}</td>
+						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-weapon"}}</td>
+							<td class="roll-spell-details">{{i.weapon}}</td>
+						</tr>
 					{{else}}
 						<tr>
 							<td>{{localize "midgard5.actor-ap"}}</td>
 							<td class="roll-spell-details">{{i.ap}}</td>
 						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-ep"}}</td>
+							<td class="roll-spell-details">{{i.ep}}</td>
+						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-color"}}</td>
+							<td class="roll-spell-details">{{i.color}}</td>
+						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-style"}}</td>
+							<td class="roll-spell-details">{{i.style}}</td>
+						</tr>
 						<tr>
 							<td>{{localize "midgard5.kido-type"}}</td>
 							<td class="roll-spell-details">{{localize (m5concat "midgard5.kido-type-" i.type)}}</td>
@@ -88,6 +110,14 @@
 								<td>{{localize "midgard5.kido-variante"}}</td>
 								<td class="roll-spell-details">{{localize (m5concat "midgard5.kido-variante-" i.variante)}}</td>
 							</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-enemy"}}</td>
+							<td class="roll-spell-details">{{i.enemy}}</td>
+						</tr>
+						<tr>
+							<td>{{localize "midgard5.kampfkunst-weapon"}}</td>
+							<td class="roll-spell-details">{{i.weapon}}</td>
+						</tr>
 						{{/if}}
 					{{/unless}}
 				{{/if}}
diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs
index 44abf11..d2a38f2 100644
--- a/templates/sheets/character/combat.hbs
+++ b/templates/sheets/character/combat.hbs
@@ -112,9 +112,7 @@
 									{{/unless}}
 								{{else}}
 									<span class="spell-process">{{localize (m5concat "midgard5.kampfkunst-type-" item.type)}}</span>
-									{{#if (eq item.type "angriff")}}
-										<span class="spell-process">({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}})</span>
-									{{/if}}
+									<span class="spell-process">({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}})</span>
 								{{/if}}
 							</td>
 							<td class="fixed-value">{{item.calc.ew}}</td>
diff --git a/templates/sheets/item/kampfkunst.hbs b/templates/sheets/item/kampfkunst.hbs
index d97e4ba..962dd93 100644
--- a/templates/sheets/item/kampfkunst.hbs
+++ b/templates/sheets/item/kampfkunst.hbs
@@ -22,6 +22,18 @@
 					<td>{{localize "midgard5.actor-ap"}}</td>
 					<td><input name="data.ap" type="text" value="{{data.ap}}" data-dtype="String" /></td>
 				</tr>
+				<tr>
+					<td>{{localize "midgard5.kampfkunst-ep"}}</td>
+					<td><input name="data.ep" type="text" value="{{data.ep}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.kampfkunst-rank"}}</td>
+					<td><input name="data.rank" type="text" value="{{data.rank}}" data-dtype="String" /></td>
+				</tr>
+				<tr>
+					<td>{{localize "midgard5.kampfkunst-weapon"}}</td>
+					<td><input name="data.weapon" type="text" value="{{data.weapon}}" data-dtype="String" /></td>
+					<td>{{localize "midgard5.kampfkunst-enemy"}}</td>
+					<td><input name="data.enemy" type="text" value="{{data.enemy}}" data-dtype="String" /></td>
+				</tr>
 				<tr>
 					{{#unless item.system.isKido}}
 					<td>{{localize "midgard5.kampfkunst-type"}}</td>
@@ -47,7 +59,6 @@
 					</td>
 					{{/unless}}
 					{{#unless item.system.isKido}}
-						{{#if (eq item.system.type "angriff")}}
 						<td>{{localize "midgard5.kampfkunst-variante"}}</td>
 						<td>
 							<select class="select-variante" name="data.variante" data-type="String">
@@ -58,7 +69,6 @@
 								{{/select}}
 							</select>
 						</td>
-						{{/if}}
 					{{else}}
 						{{#unless (eq item.system.type "finte")}}
 						<td>{{localize "midgard5.kido-variante"}}</td>