diff --git a/lang/de.json b/lang/de.json
index c1eab7d..35175bc 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -358,12 +358,13 @@
 		"spell-agens": "Agens",
 		"spell-reagens": "Reagens",
 		"spell-material": "Zaubermaterial",
+		"spell-rank": "Stufe",
 
 		"kampfkunst-type": "Form",
 		"kampfkunst-variante": "Variante",
 		"kampfkunst-variante-short": "Var",
 		"kampfkunst-ep": "Erfahrungspunkte",
-		"kampfkunst-rank": "Stufe",
+		"kampfkunst-rank": "Stufe der Technik",
 		"kampfkunst-weapon": "Waffengruppe",
 		"kampfkunst-enemy": "Einschränkungen durch Art der Gegner",
 
@@ -387,6 +388,9 @@
 		"kido-variante": "KiDo Variante",
 		"kido-color": "Kampfstilfarbe",
 		"kido-style": "Art der Technik",
+		"kido-rank": "Stufe der Technik",
+		"kido-grade": "Ausbildungsgrad",
+		"kido-enemy": "Einschränkungen durch Art der Gegner",
 
 		"kido-type-angriff": "Kido Angriff",
 		"kido-type-verteidigung": "Kido Verteidigung",
@@ -446,9 +450,9 @@
 			"reroll": "Neuwürfeln",
 
 			"options": {
-				"modifier": "Modifikator",
-				"difficulty": "Schwellenwert",
-				"rollMode": "Würfel Modus"
+				"modifier": "Wurfmodifikator",
+				"difficulty": "Erfolgswert",
+				"rollMode": "Würfelmodus"
 			}
 		}
 	}
diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts
index e534b2a..5f42cdc 100644
--- a/source/module/actors/M5Character.ts
+++ b/source/module/actors/M5Character.ts
@@ -280,6 +280,7 @@ export class M5Character extends Actor {
 
 					if (!!item.system.containerId) {
 						ret.gear.containers[item.system.containerId].weight += parseFloat((item.system.weight * item.system.quantity).toPrecision(4));
+						ret.gear.containers[item.system.containerId].value += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3));
 						if (ret.gear.containers[item.system.containerId].equipped) {
 							ret.stats.encumbrance += item.system.weight * item.system.quantity;
 						}
diff --git a/source/template.json b/source/template.json
index 70984db..7b1d979 100644
--- a/source/template.json
+++ b/source/template.json
@@ -439,6 +439,7 @@
 			"agens": "",
 			"reagens": "",
 			"material": "",
+			"rank": 0,
 			"rolls": {
 				"formulas": {
 					"0": {
@@ -460,10 +461,11 @@
 			"ap": "",
 			"weapon": "",
 			"ep": "",
-			"rank": "",
+			"rank": 0,
 			"enemy": "",
 			"color": "",
 			"style": "",
+			"grade": "",
 			"rolls": {
 				"formulas": {
 					"0": {
diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs
index c36ef5f..faf4de1 100644
--- a/templates/sheets/character/gear.hbs
+++ b/templates/sheets/character/gear.hbs
@@ -251,13 +251,13 @@
 								{{/unless}}
 							</td>
 							<td style="text-align: start">
-								{{#unless (or (eq item.weight "") (eq item.equipped?))}}
-								<span class="spell-process">{{item.weight}} kg</span>
+								{{#unless (or (eq item.weight 0) (eq item.equipped?))}}
+								<span class="spell-process">{{item.weight}}kg</span>
 								{{/unless}}
 							</td>
 							<td style="text-align: start">
-								{{#unless (eq item.capacity "")}}
-								<span class="spell-process">{{item.capacity}} kg</span>
+								{{#unless (eq item.capacity 0)}}
+								<span class="spell-process"{{#if (gt item.weight item.capacity) }}style="background:#FF6666"{{/if}}>{{item.capacity}}kg</span>
 								{{/unless}}
 							</td>
 							<td class="change-equipped">
diff --git a/templates/sheets/item/container.hbs b/templates/sheets/item/container.hbs
index 9bd762e..78c1458 100644
--- a/templates/sheets/item/container.hbs
+++ b/templates/sheets/item/container.hbs
@@ -35,7 +35,7 @@
 				<td>
 					<div class="flexrow">
 						<span>{{localize "midgard5.capacity"}}</span>
-						<input id="data.capacity" type="number" name="data.capacity" value="{{data.capacity}}kg">
+						<input id="data.capacity" type="number" name="data.capacity" value="{{data.capacity}}">
 					</div>
 				</td>
 			</tr>
@@ -57,7 +57,7 @@
 				<td>
 					<div class="flexrow">
 						<span>{{localize "midgard5.item-weight"}}</span>
-						<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}kg">
+						<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
 					</div>
 				</td>
 			</tr>
diff --git a/templates/sheets/item/item.hbs b/templates/sheets/item/item.hbs
index 6b34d6f..e64b2db 100644
--- a/templates/sheets/item/item.hbs
+++ b/templates/sheets/item/item.hbs
@@ -54,7 +54,7 @@
 				<td>
 					<div class="flexrow">
 						<span>{{localize "midgard5.item-weight"}}</span>
-							<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}kg">
+							<input id="data.weight" type="number" name="data.weight" value="{{data.weight}}">
 					</div>
 				</td>
 				<td>