diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 2795c573..485c0046 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,9 +1,9 @@
 {
-  "recommendations": [
-		"EditorConfig.EditorConfig",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
-    "Gruntfuggly.todo-tree",
-    "lokalise.i18n-ally"
-  ]
+    "recommendations": [
+        "EditorConfig.EditorConfig",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "Gruntfuggly.todo-tree",
+        "lokalise.i18n-ally"
+    ]
 }
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7cf71439..f6f8e083 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,13 @@
+## v.1.4.6
+
+### Bugfixes
+* [#485] Spell Advantage talent not functioning
+* [#521] Unable to add Weapon and Armor Mastery talents to character sheet
+
+### Enhancements
+* [#520] Switch Class HP roll setting to be a free text field so custom dice roll formulas can be used
+* [#522] Added "All Ranged Weapons" and "All Melee Weapons" checkbox to class equipment settings for more granular options
+
 ## v.1.4.5
 
 ### Bugfixes
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 878ef3b8..a94947db 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -120,7 +120,7 @@ SHADOWDARK.class.armor.all.label: All Armor
 SHADOWDARK.class.armor.label: Armor
 SHADOWDARK.class.armor.prompt: Select Armor...
 SHADOWDARK.class.fighter: Fighter
-SHADOWDARK.class.hit_points.label: Hit Points
+SHADOWDARK.class.hit_points.label: HP Die Roll
 SHADOWDARK.class.language_choices.count.label: Choice Count
 SHADOWDARK.class.language_choices.label: Language Choices
 SHADOWDARK.class.language_choices.prompt: Select Language...
@@ -140,6 +140,8 @@ SHADOWDARK.class.titles.levels.from.label: From
 SHADOWDARK.class.titles.levels.label: Levels
 SHADOWDARK.class.titles.levels.to.label: To
 SHADOWDARK.class.weapons.all.label: All Weapons
+SHADOWDARK.class.weapons.all_melee.label: All Melee Weapons
+SHADOWDARK.class.weapons.all_ranged.label: All Ranged Weapons
 SHADOWDARK.class.weapons.label: Weapons
 SHADOWDARK.class.weapons.prompt: Select Weapon...
 SHADOWDARK.class.wizard: Wizard
diff --git a/scss/sheets/items/_item.scss b/scss/sheets/items/_item.scss
index 8529df66..f026ec80 100644
--- a/scss/sheets/items/_item.scss
+++ b/scss/sheets/items/_item.scss
@@ -103,9 +103,10 @@
 	.class-equipment-details {
 		grid-column: span 3;
 		display: grid;
-		grid-template-columns: 1.5fr 1.5fr 1fr;
+		grid-template-columns: 1fr 1fr 1fr;
 		align-items: baseline;
-		grid-column-gap: 4px;
+		grid-column-gap: 8px;
+		grid-row-gap: 8px;
 	}
 
 	.coins {
@@ -225,10 +226,12 @@
 	.magic-item,
 	.treasure {
 		display: grid;
-		grid-template-columns: 2fr 1fr;
-		align-items: center;
-		column-gap: 8px;
+		grid-template-columns: 2fr min-content;
 		background-color: var(--form-background);
+
+		&:hover {
+			background-color: var(--background-highlight)
+		}
 	}
 
 	.item-light {
@@ -243,7 +246,7 @@
 		margin: 4px;
 		display: grid;
 		grid-template-columns: repeat(3, 1fr);
-		column-gap: 4px;
+		column-gap: 8px;
 		row-gap: 8px;
 		align-items: start;
 	}
diff --git a/system/src/documents/__tests__/e2e-documents-item-effect.test.mjs b/system/src/documents/__tests__/e2e-documents-item-effect.test.mjs
index 90cd1dc0..59a965a5 100644
--- a/system/src/documents/__tests__/e2e-documents-item-effect.test.mjs
+++ b/system/src/documents/__tests__/e2e-documents-item-effect.test.mjs
@@ -182,7 +182,6 @@ export default ({ describe, it, before, after, afterEach, expect }) => {
 				"shortsword": "Shortsword",
 				"spear": "Spear",
 				"staff": "Staff",
-				"super-new-base-weapon": "Super New Base Weapon",
 				"warhammer": "Warhammer",
 			};
 			/* eslint-enable quote-props */
@@ -267,7 +266,6 @@ export default ({ describe, it, before, after, afterEach, expect }) => {
 				"shortsword": "Shortsword",
 				"spear": "Spear",
 				"staff": "Staff",
-				"super-new-base-weapon": "Super New Base Weapon",
 				"warhammer": "Warhammer",
 			};
 			/* eslint-enable quote-props */
diff --git a/system/src/sheets/PlayerSheetSD.mjs b/system/src/sheets/PlayerSheetSD.mjs
index f73ba21a..cf8d6a20 100644
--- a/system/src/sheets/PlayerSheetSD.mjs
+++ b/system/src/sheets/PlayerSheetSD.mjs
@@ -293,6 +293,7 @@ export default class PlayerSheetSD extends ActorSheetSD {
 					const effectKey = (key) ? key : c.key.split(".")[2];
 
 					// Ask for user input
+					let linkedName;
 					[c.value, linkedName] = await item._handlePredefinedEffect(effectKey);
 
 					if (c.value) {
@@ -333,7 +334,7 @@ export default class PlayerSheetSD extends ActorSheetSD {
 				// Spell Advantage requires special handling as it uses the `advantage` bons
 				if (e.changes.some(c => c.key === "system.bonuses.advantage")) {
 					// If there is no value with REPLACME, it is another type of advantage talent
-					if (e.changes.some(c => c.value === "REPLACME")) {
+					if (e.changes.some(c => c.value === "REPLACEME")) {
 						const key = "spellAdvantage";
 						item = await this._modifyEffectChangesWithInput(item, e, key);
 					}
diff --git a/system/system.json b/system/system.json
index 3caa72ee..1a6231f3 100644
--- a/system/system.json
+++ b/system/system.json
@@ -2,7 +2,7 @@
 	"id": "shadowdark",
 	"title": "Shadowdark RPG",
 	"desciption": "A system for playing the Shadowdark RPG from Arcane Library",
-	"version": "1.4.5",
+	"version": "1.4.6",
 	"compatibility": {
 		"minimum": "11",
 		"verified": "11"
@@ -12,7 +12,7 @@
 	},
 	"url": "https://github.com/Muttley/foundryvtt-shadowdark",
 	"manifest": "https://raw.githubusercontent.com/Muttley/foundryvtt-shadowdark/master/system/system.json",
-	"download": "https://github.com/Muttley/foundryvtt-shadowdark/releases/download/release-1.4.5/shadowdark-release-1.4.5.zip",
+	"download": "https://github.com/Muttley/foundryvtt-shadowdark/releases/download/release-1.4.6/shadowdark-release-1.4.6.zip",
 	"authors": [
 		{
 			"name": "Paul Maskelyne",
diff --git a/system/template.json b/system/template.json
index 68eb88e5..e2cecadc 100644
--- a/system/template.json
+++ b/system/template.json
@@ -256,6 +256,8 @@
 				"languageChoices"
 			],
 			"allArmor": false,
+			"allMeleeWeapons": false,
+			"allRangedWeapons": false,
 			"allWeapons": false,
 			"armor": [],
 			"classTalentTable": "",
diff --git a/system/templates/items/partials/class.hbs b/system/templates/items/partials/class.hbs
index de84b578..937039f8 100644
--- a/system/templates/items/partials/class.hbs
+++ b/system/templates/items/partials/class.hbs
@@ -2,14 +2,11 @@
 	<div class="class-details">
 		<div class="item-detail">
 			<label>{{localize 'SHADOWDARK.class.hit_points.label'}}</label>
-			<select name="system.hitPoints">
-				<option value="">&mdash;</option>
-				{{selectOptions
-					config.DICE
-					selected=system.hitPoints
-					localize=false
-				}}
-			</select>
+			<input
+				name="system.hitPoints"
+				type="text"
+				value="{{item.system.hitPoints}}"
+			/>
 		</div>
 		<div class="item-detail">
 			<label>{{localize "SHADOWDARK.class.talents_table.label"}}</label>
@@ -78,11 +75,19 @@
 				editable=editable
 			}}
 		</div>
-		<div>
+		<div class="item-detail">
 			<div class="checkbox">
 				<label>{{localize "SHADOWDARK.class.weapons.all.label"}}</label>
 				<input type="checkbox" name="system.allWeapons" {{checked system.allWeapons}}>
 			</div>
+			<div class="checkbox">
+				<label>{{localize "SHADOWDARK.class.weapons.all_melee.label"}}</label>
+				<input type="checkbox" name="system.allMeleeWeapons" {{checked system.allMeleeWeapons}}>
+			</div>
+			<div class="checkbox">
+				<label>{{localize "SHADOWDARK.class.weapons.all_ranged.label"}}</label>
+				<input type="checkbox" name="system.allRangedWeapons" {{checked system.allRangedWeapons}}>
+			</div>
 			<div class="checkbox">
 				<label>{{localize "SHADOWDARK.class.armor.all.label"}}</label>
 				<input type="checkbox" name="system.allArmor" {{checked system.allArmor}}>