diff --git a/langs/en-ca.json b/langs/en-ca.json
index f4e9504..71427b8 100644
--- a/langs/en-ca.json
+++ b/langs/en-ca.json
@@ -91,10 +91,21 @@
 	"dotdungeon.actor.pc.weapon.main-hand": "Main-Hand",
 	"dotdungeon.actor.pc.weapon.off-hand": "Off-Hand",
 	"dotdungeon.actor.pc.weapon.name": "Name",
-	"dotdungeon.actor.pc.weapon.damage-type": "Damage",
+	"dotdungeon.actor.pc.weapon.damage-type.label": "Damage Type",
+	"dotdungeon.actor.pc.weapon.damage-type.slashing": "Slashing",
+	"dotdungeon.actor.pc.weapon.damage-type.piercing": "Piercing",
+	"dotdungeon.actor.pc.weapon.damage-type.smashing": "Smashing",
+	"dotdungeon.actor.pc.weapon.damage-type.gun": "Gun",
+	"dotdungeon.actor.pc.weapon.damage-type.neon": "Neon",
+	"dotdungeon.actor.pc.weapon.damage-type.shadow": "Shadow",
+	"dotdungeon.actor.pc.weapon.damage-type.solar": "Solar",
 	"dotdungeon.actor.pc.weapon.is-ranged": "Ranged",
 	"dotdungeon.actor.pc.weapon.is-scoped": "Scoped",
-	"dotdungeon.actor.pc.weapon.ammo-type": "Ammo",
+	"dotdungeon.actor.pc.weapon.ammo-type.label": "Ammo",
+	"dotdungeon.actor.pc.weapon.ammo-type.ammoless": "No Ammo",
+	"dotdungeon.actor.pc.weapon.ammo-type.quiver": "Quivers",
+	"dotdungeon.actor.pc.weapon.ammo-type.mag": "Mags",
+	"dotdungeon.actor.pc.weapon.ammo-type.cell": "Cells",
 
 
 	"dotdungeon.actor.sync.circle.group": "Group Name",
diff --git a/templates/actors/char-sheet-mvp/sheet.hbs b/templates/actors/char-sheet-mvp/sheet.hbs
index b89a3ab..cb38ad7 100644
--- a/templates/actors/char-sheet-mvp/sheet.hbs
+++ b/templates/actors/char-sheet-mvp/sheet.hbs
@@ -209,38 +209,56 @@
 			<summary data-collapse-id="weapons.main-hand">
 				{{localize "dotdungeon.actor.pc.weapon.main-hand"}}
 			</summary>
-			<label>
-				{{localize "dotdungeon.actor.pc.weapon.name"}}
-				<input
-					type="text"
-					name=""
-				>
-			</label>
-			<label>
-				{{localize "dotdungeon.actor.pc.weapon.damage-type"}}
-				<select name="system.weapon.mainHand.damage"></select>
-			</label>
-			<label>
-				{{localize "dotdungeon.actor.pc.weapon.is-ranged"}}
-				<input
-					type="checkbox"
-					name="system.weapon.mainHand.ranged"
-					{{checked system.weapon.mainHand.ranged}}
-				>
-			</label>
-			{{#if system.weapon.mainHand.ranged}}
+			<div class="weapon-container">
 				<label>
-					{{localize "dotdungeon.actor.pc.weapon.is-scoped"}}
+					{{localize "dotdungeon.actor.pc.weapon.name"}}
 					<input
-						type="checkbox"
-						name="system.weapon.mainHand.scope"
-						{{checked system.weapon.mainHand.scope}}
+						type="text"
+						name="system.weapon.mainHand.name"
 					>
 				</label>
 				<label>
-					{{localize "dotdungeon.actor.pc.weapon.ammo-type"}}
-					<select name=""></select>
+					{{localize "dotdungeon.actor.pc.weapon.damage-type.label"}}
+				<select name="system.weapon.mainHand.damage">
+					{{#select system.weapon.mainHand.damage}}
+						<option value="">Select...</option>
+						{{#each (dotdungeon-array "slashing" "piercing" "smashing" "gun" "neon" "shadow" "solar")}}
+							<option value="{{this}}">
+								{{localize (concat "dotdungeon.actor.pc.weapon.damage-type." this)}}
+							</option>
+						{{/each}}
+					{{/select}}
+				</select>
 				</label>
+				<label>
+					{{localize "dotdungeon.actor.pc.weapon.is-ranged"}}
+					<input
+						type="checkbox"
+						name="system.weapon.mainHand.ranged"
+						{{checked system.weapon.mainHand.ranged}}
+					>
+				</label>
+				{{#if system.weapon.mainHand.ranged}}
+					<label>
+						{{localize "dotdungeon.actor.pc.weapon.is-scoped"}}
+						<input
+							type="checkbox"
+							name="system.weapon.mainHand.scope"
+							{{checked system.weapon.mainHand.scope}}
+						>
+					</label>
+					<label>
+						{{localize "dotdungeon.actor.pc.weapon.ammo-type.label"}}
+						<select name="system.weapon.mainHand.ammo">
+							{{#select system.weapon.mainHand.ammo}}
+								<option value="">{{localize "dotdungeon.actor.pc.weapon.ammo-type.ammoless"}}</option>
+								<option value="quivers">{{localize "dotdungeon.actor.pc.weapon.ammo-type.quiver"}}</option>
+								<option value="mags">{{localize "dotdungeon.actor.pc.weapon.ammo-type.mag"}}</option>
+								<option value="cells">{{localize "dotdungeon.actor.pc.weapon.ammo-type.cell"}}</option>
+							{{/select}}
+						</select>
+					</label>
+				</div>
 			{{/if}}
 		</details>
 		<details {{dotdungeon-expanded meta.expanded "weapons.off-hand"}}>
@@ -251,12 +269,21 @@
 				{{localize "dotdungeon.actor.pc.weapon.name"}}
 				<input
 					type="text"
-					name=""
+					name="system.weapon.offHand.name"
 				>
 			</label>
 			<label>
-				{{localize "dotdungeon.actor.pc.weapon.damage-type"}}
-				<select name="system.weapon.offHand.damage"></select>
+				{{localize "dotdungeon.actor.pc.weapon.damage-type.label"}}
+				<select name="system.weapon.offHand.damage">
+					{{#select system.weapon.offHand.damage}}
+						<option value="">Select...</option>
+						{{#each (dotdungeon-array "slashing" "piercing" "smashing" "gun" "neon" "shadow" "solar")}}
+							<option value="{{this}}">
+								{{localize (concat "dotdungeon.actor.pc.weapon.damage-type." this)}}
+							</option>
+						{{/each}}
+					{{/select}}
+				</select>
 			</label>
 			<label>
 				{{localize "dotdungeon.actor.pc.weapon.is-ranged"}}
@@ -276,8 +303,15 @@
 					>
 				</label>
 				<label>
-					{{localize "dotdungeon.actor.pc.weapon.ammo-type"}}
-					<select name=""></select>
+					{{localize "dotdungeon.actor.pc.weapon.ammo-type.label"}}
+					<select name="system.weapon.offHand.ammo">
+						{{#select system.weapon.offHand.ammo}}
+							<option value="">{{localize "dotdungeon.actor.pc.weapon.ammo-type.ammoless"}}</option>
+							<option value="quivers">{{localize "dotdungeon.actor.pc.weapon.ammo-type.quiver"}}</option>
+							<option value="mags">{{localize "dotdungeon.actor.pc.weapon.ammo-type.mag"}}</option>
+							<option value="cells">{{localize "dotdungeon.actor.pc.weapon.ammo-type.cell"}}</option>
+						{{/select}}
+					</select>
 				</label>
 			{{/if}}
 		</details>