diff --git a/src/App.jsx b/src/App.jsx
index 32b8c6f..3d80786 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -234,11 +234,11 @@ function App() {
 
 const getPrimaryColor = (catalog) => {
 	switch (catalog) {
-		case "Adeptus Astartes":
+		case "Imperium - Adeptus Astartes":
 			return "#536766";
-		case "Adeptus Custodes":
+		case "Imperium - Adeptus Custodes":
 			return "#536766";
-		case "Adeptus Mechanicus":
+		case "Imperium - Adeptus Mechanicus":
 			return "#536766";
 		case "Imperium - Astra Militarum":
 			return "#375441";
diff --git a/src/Roster.jsx b/src/Roster.jsx
index aff4c43..9b19177 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -73,6 +73,7 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 		psykers,
 		spells,
 		cost,
+		woundTracker,
 	} = unit;
 
 	const meleeWeapons = weapons
@@ -232,6 +233,7 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 								}
 							/>
 						))}
+						<WoundTracker woundTracker={woundTracker} />
 					</div>
 				</div>
 			</div>
@@ -676,6 +678,51 @@ const Psyker = ({ psyker, index }) => {
 	);
 };
 
+const WoundTracker = ({ woundTracker }) => {
+	if (!woundTracker || woundTracker.length === 0) return null;
+
+	return (
+		<div style={{ display: "flex" }}>
+			<div
+				style={{
+					display: "flex",
+					flexDirection: "column",
+					alignItems: "center",
+				}}
+			>
+				<table
+					className="weapons-table"
+					style={{ width: "100%", margin: "4px 2px", marginBottom: -16 }}
+				>
+					<thead>
+						<tr
+							style={{
+								backgroundColor: "var(--primary-color)",
+								color: "#fff",
+							}}
+						>
+							{[...woundTracker[0].table.keys()].map((key) => (
+								<th key={key}>{key}</th>
+							))}
+						</tr>
+					</thead>
+					<tbody>
+						{woundTracker.map((woundTrack, index) => (
+							<tr key={index}>
+								{[...woundTrack.table.values()].map((entry) => (
+									<td key={entry} style={{ borderTop: "none" }}>
+										{entry}
+									</td>
+								))}
+							</tr>
+						))}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	);
+};
+
 const Spells = ({ title, spells }) => {
 	return (
 		<table
diff --git a/src/Weapons.jsx b/src/Weapons.jsx
index 4c8bbad..fc161f8 100644
--- a/src/Weapons.jsx
+++ b/src/Weapons.jsx
@@ -65,6 +65,7 @@ const Weapon = ({ weapon, modelStats, isMelee, className }) => {
 		name = "Krak grenade";
 	}
 	const differentProfiles =
+		selectionName &&
 		selectionName !== name &&
 		!name.includes("(Shooting)") &&
 		!name.includes("(Melee)");
@@ -78,7 +79,6 @@ const Weapon = ({ weapon, modelStats, isMelee, className }) => {
 	if (name.startsWith("Missile launcher, ")) {
 		name = name.replace("Missile launcher, ", "");
 	}
-
 	if (differentProfiles && name.includes(" - ")) {
 		name = name.split(" - ")[1];
 	}
@@ -99,6 +99,7 @@ const Weapon = ({ weapon, modelStats, isMelee, className }) => {
 	}
 	if (abilities?.toLowerCase().includes("turret weapon")) {
 		abilities = abilities
+			.replaceAll("Turret Weapon.", "")
 			.replaceAll("Turret weapon.", "")
 			.replaceAll("Turret Weapon", "")
 			.replaceAll("Turret weapon", "");