diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.css b/HeroSystem6eHeroic/HeroSystem6eHeroic.css
index 4478663efeb..ff87f79af33 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.css
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.css
@@ -1409,7 +1409,7 @@ select:focus + .focus {
 	width: 450px;
 	margin: 0px;
 	margin-left: 110px;
-	margin-bottom: 150px;
+	margin-bottom: 80px;
 	background-color: #f7f1a0;
 	border: solid 2px #f0c566;
 	border-radius: 3px;
@@ -1873,7 +1873,6 @@ select:focus + .focus {
 .container-checkbox {
 	display: inline-block;
 	position: relative;
-	/* padding-left: 25px; */
 	padding-top: 2px;
 	cursor: pointer;
 	font-size: 12px;
@@ -1908,7 +1907,7 @@ select:focus + .focus {
 	background-color: #f2cf7f;
 }
 
-/* On mouse-over, add a grey background color */
+/* On mouse-over, add background color */
 .container-checkbox:hover input ~ .checkmark,
 .container-checkbox-small:hover input ~ .checkmark-small,
 .container-checkbox-tiny:hover input ~ .checkmark-tiny {
@@ -2000,6 +1999,7 @@ select:focus + .focus {
 .container-checkbox-tiny-light {
 	display: block;
 	position: relative;
+	cursor: pointer;
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
@@ -2011,7 +2011,6 @@ select:focus + .focus {
 .container-checkbox-small-dark {
 	padding-left: 20px;
 	padding-top: 0px;
-	cursor: pointer;
 	max-height: 15px;
 	max-width: 15px;
 }
@@ -2022,7 +2021,6 @@ select:focus + .focus {
 	margin: 0px;
 	max-height: 11px;
 	max-width: 11px;
-	cursor: pointer;
 }
 
 /* Create a custom checkbox */
@@ -2032,8 +2030,8 @@ select:focus + .focus {
 .checkmark-tiny,
 .checkmark-tiny-light {
 	position: absolute;
-	top: 0;
-	left: 0;
+	top: 0px;
+	left: 0px;
 }
 
 .checkmark-small,
@@ -2131,6 +2129,11 @@ select:focus + .focus {
 	margin-top: -5px;
 }
 
+.subitem-tab-gear-flex-container-shield-heading .container-checkbox-tiny {
+	top: 0px;
+	left: 0px;
+}
+
 .subitem-tab-gear-flex-container-weapon-row .container-checkbox-small {
 	padding-left: 10px;
 	padding-right: 6px;
@@ -2156,6 +2159,7 @@ select:focus + .focus {
 	padding-right: 0px;
 }
 
+
 /* --------------------------------------------------- */
 /* Custom Checkboxes used for turn segment indicators  */
 /* Modification of custom checkbox above               */
@@ -2521,6 +2525,198 @@ select:focus + .focus {
 	display: block;
 }
 
+
+/* Custom checkboxes or xbox for deletion actions. */
+
+.container-xbox,
+.container-xbox-tiny {
+	display: inline-block;
+	position: relative;
+	cursor: pointer;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	max-height: 1px;
+	max-width: 1px;
+}
+
+.container-xbox input,
+.container-xbox-tiny input {
+	position: absolute;
+	opacity: 0;
+	cursor: pointer;
+	height: 0px;
+	width: 0px;
+}
+
+/* Create a custom checkbox */
+.container-xbox .checkmark {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	height: 20px;
+	width: 20px;
+	background-color: #f2cf7f;
+}
+
+.container-xbox-tiny .checkmark {
+	position: absolute;
+	margin: 0px;
+	padding: 0px;
+	left: 0px;
+	height: 11px;
+	width: 11px;
+	background-color: white;
+}
+
+.subitem-tab-gear-flex-container-armor .container-xbox-tiny .checkmark {
+	top: 0px;
+}
+
+.subitem-tab-gear-flex-container-weapon-row .container-xbox-tiny .checkmark {
+	top: -1px;
+}
+
+.subitem-tab-gear-flex-container-equipment .container-xbox-tiny .checkmark {
+	top: 4px;
+}
+
+
+/* On mouse-over, add warning background color */
+.container-xbox:hover input ~ .checkmark,
+.container-xbox-tiny:hover input ~ .checkmark {
+	background-color: #fb3422;
+}
+
+/* When the checkbox is checked, add alarming background color */
+.container-xbox input:checked ~ .checkmark,
+.container-xbox-tiny input:checked ~ .checkmark {
+	background-color: #fb3422;
+}
+
+/* Create the checkmark/indicator (hidden when not checked) */
+.container-xbox .checkmark:after,
+.container-xbox-tiny .checkmark:after {
+	content: "";
+	position: absolute;
+	display: none;
+}
+
+/* Show the checkmark when checked */
+.container-xbox input:checked ~ .checkmark:after,
+.container-xbox-tiny input:checked ~ .checkmark:after {
+	display: block;
+}
+
+/* Style the checkmark cross indicator */
+.container-xbox .checkmark:after {
+	left: 2px;
+	top: 2px;
+	width: 16px;
+	height: 16px;
+	border: transparent;
+	background: linear-gradient(
+		to bottom,
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	), linear-gradient(
+		to right, 
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+.container-xbox-tiny .checkmark:after {
+	left: 1px;
+	top: 1px;
+	width: 9px;
+	height: 9px;
+	border: transparent;
+	background: linear-gradient(
+		to bottom,
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	), linear-gradient(
+		to right, 
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+/* Dummy xbox for heading indicator */
+
+.tiny-xbox-dummy-container,
+.tiny-xbox-empty-container {
+	left: 0px;
+	max-height: 11px;
+	min-height: 11px;
+	max-width: 1px;
+	min-width: 1px;
+	display: inline-block;
+	position: relative;
+}
+
+.tiny-xbox-dummy-container {
+	background-color: #fb3422;
+}
+
+.subitem-tab-gear-flex-container-armor-heading .tiny-xbox-dummy-container {
+	top: 6px;
+}
+
+.subitem-tab-gear-flex-container-shield-checks .tiny-xbox-dummy-container {
+	top: 5px;
+}
+
+.subitem-tab-gear-flex-container-weapon-heading .tiny-xbox-dummy-container {
+	top: 6px;
+}
+
+.subitem-tab-gear-flex-container-equipment-heading .tiny-xbox-dummy-container {
+	top: 3px;
+}
+
+.tiny-xbox-dummy {
+	position: absolute;
+	margin: 0px;
+	padding: 0px;
+	top: 0px;
+	left: 0px;
+	height: 11px;
+	width: 11px;
+	background: linear-gradient(
+		to bottom,
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	), linear-gradient(
+		to right, 
+		transparent 35%, 
+		white 35%, 
+		white 65%,  
+		transparent 65%
+	);
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
 /* --------------------------------------------------- */
 /* Talents, Perks, and Complications                   */
 /* --------------------------------------------------- */
@@ -4384,7 +4580,8 @@ select:focus + .focus {
 	margin-bottom: 2px;
 }
 
-.item-tab-gear-flex-container-encumbrance input[type=number]{
+.item-tab-gear-flex-container-encumbrance input[type=number],
+.item-tab-gear-flex-container-encumbrance input[readonly] {
 	text-align: center;
 	max-width: 65px;
 	background-color: #F0E442;
@@ -4408,8 +4605,6 @@ select:focus + .focus {
 	margin-left: 0px;
 }
 
-/* Experimental */
-
 .subitem-tab-gear-flex-container-cv-status {
 	display:flex;
 	flex-direction: column;
@@ -4453,19 +4648,11 @@ select:focus + .focus {
 	font-size: 13px;
 	font-weight: bold;
 	padding: 0px;
-	/* background-color: #F0E442;
-	border: solid 1px #ebb232; */
-	/* background: #c6d2f6;
-	border: solid 1px #8da5ed; */
-	/* background-color: #d2e9ff;
-	border: solid 2px #78bcff; */
 	background-color: #d2e9ff;
 	border: solid 2px #8da5ed;
 	color: black;
 }
 
-/* Experimental */
-
 .subitem-tab-gear-plus-minus-enclosure {
 	display: flex;
 	flex-direction: row;
@@ -4569,7 +4756,7 @@ select:focus + .focus {
 	padding-left: 3px;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(2) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(3) {
 	min-width: 44px;
 	text-align: left;
 	padding-left: 3px;
@@ -4584,34 +4771,34 @@ select:focus + .focus {
 	margin-right: 44px;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(4),
 .subitem-tab-gear-flex-container-armor-heading h1:nth-child(5),
 .subitem-tab-gear-flex-container-armor-heading h1:nth-child(6),
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(7) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(7),
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(8) {
 	min-width: 34px;
 	text-align: center;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(8) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(9) {
 	min-width: 44px;
 	text-align: left;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(9) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(10) {
 	min-width: 34px;
 	text-align: left;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(10) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(11) {
 	min-width: 32px;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(11) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(12) {
 	text-align: center;
 	min-width: 98px;
 }
 
-.subitem-tab-gear-flex-container-armor-heading h1:nth-child(12) {
+.subitem-tab-gear-flex-container-armor-heading h1:nth-child(13) {
 	text-align: center;
 	min-width: 46px;
 }
@@ -4641,25 +4828,25 @@ select:focus + .focus {
 	margin-left: 0px;
 }
 
-.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(3),
-.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(11) {
+.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(4),
+.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(12) {
 	padding-left: 2px;
 	padding-right: 1px;
 	margin-right: 0px;
 }
 
-.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(3) {
+.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(4) {
 	text-align: left;
 	max-width: 120px;
 	margin-right: 2px;
 }
 
-.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(11) {
+.subitem-tab-gear-flex-container-armor-row input[type=text]:nth-child(12) {
 	text-align: center;
 	max-width: 100px;
 }
 
-.subitem-tab-gear-flex-container-armor-row input[type=number]:nth-child(12) {
+.subitem-tab-gear-flex-container-armor-row input[type=number]:nth-child(13) {
 	text-align: right;
 	min-width: 48px;
 }
@@ -4686,6 +4873,7 @@ select:focus + .focus {
 	justify-content: space-between;
 	align-items: center;
 	min-height: 38px;
+	max-height: 38px;
 	margin-bottom: 3px;
 	margin-top: 2px;
 }
@@ -4729,10 +4917,26 @@ select:focus + .focus {
 	width: 660px;
 }
 
-.subitem-tab-gear-flex-container-shield-heading:nth-child(1) {
+.subitem-tab-gear-flex-container-shield-checks {
+	min-width: 14px;
+	min-height: 36px;
+	max-height: 36px;
+	padding: 0px;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-left: 2px;
+}
+
+.subitem-tab-gear-flex-container-shield-heading:nth-child(3) {
 	align-items: start;
 }
 
+.subitem-tab-gear-flex-container-shield-heading:nth-child(3) h1 {
+	padding-left: 0px;
+}
+
 .subitem-tab-gear-flex-container-weapon-heading,
 .subitem-tab-gear-flex-container-weapon-row {
 	display: flex;
@@ -4751,7 +4955,7 @@ select:focus + .focus {
 	justify-content: space-between;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(2) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(3) {
 	min-width: 61px;
 	max-width: 61px;
 	text-align: left;
@@ -4767,52 +4971,52 @@ select:focus + .focus {
 	margin-right: 25px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:not(:nth-child(2)) {
+.subitem-tab-gear-flex-container-weapon-heading h1:not(:nth-child(3)) {
 	text-align: center;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(4) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(5) {
 	min-width: 67px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(5) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(6) {
 	min-width: 42px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(6) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(7) {
 	min-width: 36px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(7) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(8) {
 	min-width: 37px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(8) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(9) {
 	min-width: 41px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(9) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(10) {
 	min-width: 29px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(10) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(11) {
 	min-width: 42px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(11) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(12) {
 	min-width: 48px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(12) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(13) {
 	min-width: 41px;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(13) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(14) {
 	min-width: 33px;
 	text-align: left;
 }
 
-.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(14) {
+.subitem-tab-gear-flex-container-weapon-heading h1:nth-child(15) {
 	min-width: 40px;
 }
 
@@ -4853,8 +5057,20 @@ select:focus + .focus {
 	outline: none;
 }
 
-.subitem-tab-gear-flex-container-shield .subitem-tab-gear-flex-container-shield-heading:nth-child(1) input[type=text],
-.subitem-tab-gear-flex-container-weapon-row input[type=text]:nth-child(3) {
+.subitem-tab-gear-flex-container-weapon-row .weapon-mover-plus-minus-enclosure:nth-child(1) {
+	margin-right: 1px;
+}
+
+.subitem-tab-gear-flex-container-weapon-row .container-checkbox-tiny:nth-child(2) {
+	margin-right: 1px;
+}
+
+.subitem-tab-gear-flex-container-weapon-row .container-xbox-tiny:nth-child(3) {
+	margin-right: 8px;
+}
+
+.subitem-tab-gear-flex-container-shield .subitem-tab-gear-flex-container-shield-heading:nth-child(3) input[type=text],
+.subitem-tab-gear-flex-container-weapon-row input[type=text]:nth-child(4) {
 	text-align: left;
 	padding-left: 0px;
 	padding-right: 2px;
@@ -4869,32 +5085,32 @@ select:focus + .focus {
 }
 
 .subitem-tab-gear-flex-container-shield-heading input[type=number],
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(5),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(7),
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(6),
 .subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(8),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(11) {
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(9),
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(12) {
 	text-align: right;
 	padding-left: 3px;
 	max-width: 38px;
 	padding-right: 0px;
 }
 
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(5),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(7),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(11) {
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(6),
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(8),
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(12) {
 	margin-right: 3px;
 	margin-left: 3px;
 }
 
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(8) {
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(9) {
 	margin: 0px;
 }
 
-.subitem-tab-gear-flex-container-shield-heading:nth-child(11) input[type=number],
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(10),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(12),
+.subitem-tab-gear-flex-container-shield-heading:nth-child(13) input[type=number],
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(11),
 .subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(13),
-.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(14) {
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(14),
+.subitem-tab-gear-flex-container-weapon-row input[type=number]:nth-child(15) {
 	text-align: right;
 	padding-left: 3px;
 	max-width: 46px;
@@ -4903,8 +5119,8 @@ select:focus + .focus {
 	margin-left: 0px;
 }
 
-.subitem-tab-gear-flex-container-shield .subitem-tab-gear-flex-container-shield-heading:nth-child(8) input[readonly],
-.subitem-tab-gear-flex-container-weapon-row input[readonly]:nth-child(9) {
+.subitem-tab-gear-flex-container-shield .subitem-tab-gear-flex-container-shield-heading:nth-child(10) input[readonly],
+.subitem-tab-gear-flex-container-weapon-row input[readonly]:nth-child(10) {
 	background-color: inherit;
 	text-align: center;
 	padding-left: 0px;
@@ -4916,7 +5132,7 @@ select:focus + .focus {
 	margin-bottom: 2px;
 }
 
-.subitem-tab-gear-flex-container-weapon-row input[readonly]:nth-child(9) {
+.subitem-tab-gear-flex-container-weapon-row input[readonly]:nth-child(10) {
 	padding-left: 7px;
 }
 
@@ -5441,22 +5657,75 @@ select:focus + .focus {
 /* Show or hide armor carried checkmarks */
 
 .subitem-tab-gear-flex-container-armor-row .container-checkbox-tiny,
-.subitem-tab-gear-flex-container-armor-row .armor-mover-plus-minus-enclosure {
+.subitem-tab-gear-flex-container-armor-row .armor-mover-plus-minus-enclosure,
+.subitem-tab-gear-flex-container-armor-row .container-xbox-tiny,
+.subitem-tab-gear-flex-container-armor-heading .tiny-xbox-dummy-container {
 	display: none;
 }
 
-.armor-checks[value="true"] ~ div.subitem-tab-gear-flex-container-armor-row .container-checkbox-tiny {
+.subitem-tab-gear-flex-container-armor-heading .container-checkbox-tiny {
+	display: block;
+	position: relative;
+}
+
+.armor-checks[value="carry"] ~ div.subitem-tab-gear-flex-container-armor-row .container-checkbox-tiny {
 	display: block;
 	position: relative;
 }
 
-.armor-checks[value="false"] ~ div.subitem-tab-gear-flex-container-armor-row .armor-mover-plus-minus-enclosure {
+.armor-checks[value="move"] ~ div.subitem-tab-gear-flex-container-armor-row .armor-mover-plus-minus-enclosure {
+	display: block;
+	position: relative;
+}
+
+.armor-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-armor-row .container-xbox-tiny,
+.armor-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-armor-heading .tiny-xbox-dummy-container {
+	display: block;
+	position: relative;
+}
+
+.armor-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-armor-heading .container-checkbox-tiny {
+	display: none;
+}
+
+.armor-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-armor-heading .set-AtoB-button button {
+	background-color: #d0d0d0;
+	color: white;
+	cursor: default;
+	
+	:hover {
+		color: white;
+		background-color: #d0d0d0;
+	}
+	
+	:focus {
+		color: white;
+		background-color: #d0d0d0;
+	}
+}
+
+/* Show or hide shield ready or delete checkmarks */
+
+.subitem-tab-gear-flex-container-shield-checks .tiny-xbox-dummy-container,
+.subitem-tab-gear-flex-container-shield-checks .tiny-xbox-empty-container,
+.subitem-tab-gear-flex-container-shield-checks .container-checkbox-tiny,
+.subitem-tab-gear-flex-container-shield-checks .container-xbox-tiny {
+	display: none;
+}
+
+.shield-checks[value="carry"] ~ div.subitem-tab-gear-flex-container-shield-checks .tiny-xbox-empty-container,
+.shield-checks[value="carry"] ~ div.subitem-tab-gear-flex-container-shield-checks .container-checkbox-tiny {
 	display: block;
 	position: relative;
 }
 
+.shield-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-shield-checks .tiny-xbox-dummy-container,
+.shield-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-shield-checks .container-xbox-tiny {
+	display: block;
+	position: relative;
+}
 
-/* Show or hide weapons readied checkmarks */
+/* Show or hide weapons readied or deletion checkmarks */
 
 .subitem-tab-gear-flex-container-weapon-heading .container-checkbox-tiny {
 	max-width: 10px;
@@ -5464,40 +5733,90 @@ select:focus + .focus {
 }
 
 .subitem-tab-gear-flex-container-weapon-row .container-checkbox-tiny:nth-child(2),
-.subitem-tab-gear-flex-container-weapon-row .weapon-mover-plus-minus-enclosure {
+.subitem-tab-gear-flex-container-weapon-row .weapon-mover-plus-minus-enclosure,
+.subitem-tab-gear-flex-container-weapon-row .container-xbox-tiny,
+.subitem-tab-gear-flex-container-weapon-heading .tiny-xbox-dummy-container {
 	display: none;
 }
 
-.weapon-checks[value="true"] ~ div.subitem-tab-gear-flex-container-weapon-row .container-checkbox-tiny:nth-child(2) {
+.subitem-tab-gear-flex-container-weapon-heading .container-checkbox-tiny {
+	display: block;
+	position: relative;
+}
+
+.weapon-checks[value="carry"] ~ div.subitem-tab-gear-flex-container-weapon-row .container-checkbox-tiny:nth-child(2) {
 	display: block;
 	position: relative;
 	max-width: 11px;
 	padding-bottom: 4px;
 }
 
-.weapon-checks[value="false"] ~ div.subitem-tab-gear-flex-container-weapon-row .weapon-mover-plus-minus-enclosure {
+.weapon-checks[value="move"] ~ div.subitem-tab-gear-flex-container-weapon-row .weapon-mover-plus-minus-enclosure {
+	display: block;
+	position: relative;
+}
+
+.weapon-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-weapon-row .container-xbox-tiny,
+.weapon-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-weapon-heading .tiny-xbox-dummy-container {
 	display: block;
 	position: relative;
 }
 
+.weapon-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-weapon-heading .container-checkbox-tiny {
+	display: none;
+}
+
+.weapon-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-weapon-heading .set-AtoB-button button {
+	background-color: #d0d0d0;
+	color: white;
+	cursor: default;
+	
+	:hover {
+		color: white;
+		background-color: #d0d0d0;
+	}
+	
+	:focus {
+		color: white;
+		background-color: #d0d0d0;
+	}
+}
+
 
 /* Show or hide equipment carried checkmarks */
 
 .subitem-tab-gear-flex-container-equipment .container-checkbox-tiny-light,
-.subitem-tab-gear-flex-container-equipment .gear-mover-plus-minus-enclosure {
+.subitem-tab-gear-flex-container-equipment .gear-mover-plus-minus-enclosure,
+.subitem-tab-gear-flex-container-equipment .container-xbox-tiny,
+.subitem-tab-gear-flex-container-equipment-heading .tiny-xbox-dummy-container {
 	display: none;
 }
 
-.equipment-checks[value="true"] ~ div.subitem-tab-gear-flex-container-equipment .container-checkbox-tiny-light {
+.subitem-tab-gear-flex-container-equipment-heading .container-checkbox-tiny-light {
+	display: block;
+	position: relative;
+}
+
+.equipment-checks[value="carry"] ~ div.subitem-tab-gear-flex-container-equipment .container-checkbox-tiny-light {
+	display: block;
+	position: relative;
+}
+
+.equipment-checks[value="move"] ~ div.subitem-tab-gear-flex-container-equipment .gear-mover-plus-minus-enclosure {
 	display: block;
 	position: relative;
 }
 
-.equipment-checks[value="false"] ~ div.subitem-tab-gear-flex-container-equipment .gear-mover-plus-minus-enclosure {
+.equipment-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-equipment .container-xbox-tiny,
+.equipment-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-equipment-heading .tiny-xbox-dummy-container {
 	display: block;
 	position: relative;
 }
 
+.equipment-checks[value="delete"] ~ div.subitem-tab-gear-flex-container-equipment-heading .container-checkbox-tiny-light {
+	display: none;
+}
+
 /* ----------------------------------------------------------- */
 /* Item: Attacks and Maneuvers or treasures text box slideshow */
 /* ----------------------------------------------------------- */
@@ -5923,7 +6242,6 @@ select:focus + .focus {
 	height: 30px;
 	padding-bottom: 5px;
 	background-color: #8fc8ff;
-	/* background-color: yellowgreen; */
 }
 
 .item-martial-maneuver-button-line {
@@ -5937,14 +6255,6 @@ select:focus + .focus {
 	background-color: #8fc8ff;
 }
 
-/* .item-maneuver-button-line {
-	display: flex;
-	flex-direction: row;
-	justify-content: center;
-	width: 260px;
-	height: 22px;
-} */
-
 .item-maneuver-line-flex {
 	display: flex;
 	flex-direction: row;
@@ -5961,18 +6271,6 @@ select:focus + .focus {
 	margin-left: 3px;
 }
 
-/* .item-maneuver-block-source {
-	height: 16px;
-	background-color: #8fc8ff;
-	padding: 4px;
-}
-
-.item-maneuver-block-source p {
-	line-height: normal;
-	text-align: right;
-	color: #d2e9ff;
-} */
-
 /* Maneuver type-specific variables */
 
 .item-maneuver-block-stats-attack01,
diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index 3242fa0b77a..7e6bd62325a 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -467,20 +467,21 @@ <h1>Perception</h1>
 <div class="sheet-gear">
 	<div class="grid-container-tab-gear">
 		<div class="item-tab-gear-flex-container-encumbrance">
+			
 			<div class="subitem-tab-gear-flex-container-encumbrance">
 				<h1>Lift</h1>
 				<h1>Weight</h1>
-				<input type="number" name="attr_liftWeight" title="@{liftWeight}" value="100" readonly tabindex="-1"/>
+				<input type="text" name="attr_liftWeightDisplay" title="@{liftWeight}" value="100" readonly tabindex="-1"/>
 			</div>
 			<div class="subitem-tab-gear-flex-container-encumbrance">
 				<h1>Free</h1>
 				<h1>Carry</h1>
-				<input type="number" name="attr_encumbranceFreeCarry" title="@{encumbranceFreeCarry}" value="10" readonly tabindex="-1"/>
+				<input type="text" name="attr_freeCarryDisplay" title="@{freeCarry}" value="10" readonly tabindex="-1"/>
 			</div>
 			<div class="subitem-tab-gear-flex-container-encumbrance">
 				<h1>Carried</h1>
 				<h1>Load</h1>
-				<input type="number" name="attr_carriedWeight" title="@{carriedWeight}" value="0" readonly tabindex="-1"/>
+				<input type="text" name="attr_carriedWeightDisplay" title="@{carriedWeight}" value="0" readonly tabindex="-1"/>
 			</div>
 			<div class="subitem-tab-gear-flex-container-encumbrance">
 				<h1>END</h1>
@@ -530,13 +531,17 @@ <h1>DCV*</h1>
 
 		<div class="item-tab-gear-grid-container-armor">
 			<div class="subitem-tab-gear-flex-container-armor">
-				<input type="hidden" class="armor-checks" name="attr_armorChecks"  value="false"/>
+				<input type="hidden" class="armor-checks" name="attr_armorChecks"  value="move"/>
 				
 				<div class="subitem-tab-gear-flex-container-armor-heading">
 					<label class="container-checkbox-tiny">
 						<input type="checkbox" name="attr_checkArmored">
 						<span class="checkmark-tiny" title="@{checkArmored}"></span>
 					</label>
+					<label class="tiny-xbox-dummy-container">
+						<div class="tiny-xbox-dummy">
+						</div>
+					</label>
 					
 					<h1>Armor</h1>
 					<div class="set-AtoB-button">
@@ -569,6 +574,10 @@ <h1>Mass</h1>
 						<input type="checkbox" checked="checked" name="attr_armorCarried01">
 						<span class="checkmark-tiny" title="@{armorCarried01}"></span>
 					</label>
+					<label class="container-xbox-tiny">
+						<input type="checkbox" name="attr_armorDelete01">
+						<span class="checkmark" title="@{armorDelete01}"></span>
+					</label>
 					
 					<input type="text" name="attr_armorName01" title="@{armorName01}" value="" maxlength="20" tabindex="50"/>
 					
@@ -620,6 +629,10 @@ <h1>Mass</h1>
 						<input type="checkbox" checked="checked" name="attr_armorCarried02">
 						<span class="checkmark-tiny" title="@{armorCarried02}"></span>
 					</label>
+					<label class="container-xbox-tiny">
+						<input type="checkbox" name="attr_armorDelete02">
+						<span class="checkmark" title="@{armorDelete02}"></span>
+					</label>
 					
 					<input type="text" name="attr_armorName02" title="@{armorName02}" value="" maxlength="20" tabindex="56"/>
 					
@@ -671,6 +684,10 @@ <h1>Mass</h1>
 						<input type="checkbox" checked="checked" name="attr_armorCarried03">
 						<span class="checkmark-tiny" title="@{armorCarried03}"></span>
 					</label>
+					<label class="container-xbox-tiny">
+						<input type="checkbox" name="attr_armorDelete03">
+						<span class="checkmark" title="@{armorDelete03}"></span>
+					</label>
 					
 					<input type="text" name="attr_armorName03" title="@{armorName03}" value="" maxlength="20" tabindex="61"/>
 					
@@ -722,6 +739,10 @@ <h1>Mass</h1>
 						<input type="checkbox" checked="checked" name="attr_armorCarried04">
 						<span class="checkmark-tiny" title="@{armorCarried04}"></span>
 					</label>
+					<label class="container-xbox-tiny">
+						<input type="checkbox" name="attr_armorDelete04">
+						<span class="checkmark" title="@{armorDelete04}"></span>
+					</label>
 					
 					<input type="text" name="attr_armorName04" title="@{armorName04}" value="" maxlength="20" tabindex="66"/>
 					
@@ -761,14 +782,28 @@ <h1>Mass</h1>
 			<!-- Shield -->			
 			<div class="subitem-tab-gear-flex-container-shield">
 				
+				<input type="hidden" class="shield-checks" name="attr_shieldChecks"  value="carry"/>
+				
+				<div class="subitem-tab-gear-flex-container-shield-checks">
+					<label class="tiny-xbox-dummy-container">
+						<div class="tiny-xbox-dummy">
+						</div>
+					</label>
+					<label class="tiny-xbox-empty-container">
+						<div class="tiny-xbox-empty">
+						</div>
+					</label>
+					<label class="container-checkbox-tiny">
+						<input type="checkbox" checked="checked" name="attr_shieldCarried">
+						<span class="checkmark-tiny" title="@{shieldCarried}"></span>
+					</label>
+					<label class="container-xbox-tiny">
+						<input type="checkbox" name="attr_weaponDelete06">
+						<span class="checkmark" title="@{weaponDelete06}"></span>
+					</label>
+				</div>
 				<div class="subitem-tab-gear-flex-container-shield-heading">
-					<div class="shield-title-container">
-						<label class="container-checkbox-tiny">
-							<input type="checkbox" checked="checked" name="attr_shieldCarried">
-							<span class="checkmark-tiny" title="@{shieldCarried}"></span>
-						</label>
-						<h1>Shield</h1>
-					</div>
+					<h1>Shield</h1>
 					<input type="text" name="attr_weaponName06" title="@{weaponName06}" value="" maxlength="20" tabindex="76"/>
 				</div>
 				<div class="subitem-tab-gear-flex-container-shield-heading">
@@ -1446,7 +1481,7 @@ <h2>END:</h2>
 			<input type="hidden" class="weapon-type04" name="attr_weaponType04" value="killing">
 			<input type="hidden" class="weapon-type05" name="attr_weaponType05" value="killing">
 			
-			<input type="hidden" class="weapon-checks" name="attr_weaponChecks"  value="false"/>
+			<input type="hidden" class="weapon-checks" name="attr_weaponChecks"  value="move"/>
 			
 			<!-- Weapon Heading -->
 			<div class="subitem-tab-gear-flex-container-weapon-heading">
@@ -1454,6 +1489,10 @@ <h2>END:</h2>
 					<input type="checkbox" name="attr_checkWielded">
 					<span class="checkmark-tiny" title="@{checkWielded}"></span>
 				</label>
+				<label class="tiny-xbox-dummy-container">
+					<div class="tiny-xbox-dummy">
+					</div>
+				</label>
 				<h1>Weapons</h1>
 				<div class="set-AtoB-button">
 					<button type="action" name="act_weaponSetAtoB" tabindex="-1" class="button button-gear-set"><div>A/B</div></button>
@@ -1488,6 +1527,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_weaponCarried01">
 					<span class="checkmark-tiny" title="@{weaponCarried01}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_weaponDelete01">
+					<span class="checkmark" title="@{weaponDelete01}"></span>
+				</label>
 				
 				<input type="text" name="attr_weaponName01" title="@{weaponName01}" value="" maxlength="20" tabindex="86"/>
 				
@@ -1524,6 +1567,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_weaponCarried02">
 					<span class="checkmark-tiny" title="@{weaponCarried02}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_weaponDelete02">
+					<span class="checkmark" title="@{weaponDelete02}"></span>
+				</label>
 				
 				<input type="text" name="attr_weaponName02" title="@{weaponName02}" value="" maxlength="20" tabindex="94"/>
 				
@@ -1560,6 +1607,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_weaponCarried03">
 					<span class="checkmark-tiny" title="@{weaponCarried03}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_weaponDelete03">
+					<span class="checkmark" title="@{weaponDelete03}"></span>
+				</label>
 				
 				<input type="text" name="attr_weaponName03" title="@{weaponName03}" value="" maxlength="20" tabindex="104"/>
 				
@@ -1596,6 +1647,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_weaponCarried04">
 					<span class="checkmark-tiny" title="@{weaponCarried04}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_weaponDelete04">
+					<span class="checkmark" title="@{weaponDelete04}"></span>
+				</label>
 				
 				<input type="text" name="attr_weaponName04" title="@{weaponName04}" value="" maxlength="20" tabindex="113"/>
 				
@@ -1632,6 +1687,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_weaponCarried05">
 					<span class="checkmark-tiny" title="@{weaponCarried05}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_weaponDelete05">
+					<span class="checkmark" title="@{weaponDelete05}"></span>
+				</label>
 				
 				<input type="text" name="attr_weaponName05" title="@{weaponName05}" vvalue="" maxlength="20" tabindex="122"/>
 				
@@ -1653,13 +1712,17 @@ <h1>Mass</h1>
 		</div>
 		
 		<div class="item-tab-gear-flex-container-equipment">
-			<input type="hidden" class="equipment-checks" name="attr_equipmentChecks"  value="false"/>
+			<input type="hidden" class="equipment-checks" name="attr_equipmentChecks"  value="move"/>
 			
 			<div class="subitem-tab-gear-flex-container-equipment-heading">
 				<label class="container-checkbox-tiny-light">
 					<input type="checkbox" name="attr_checkCarried">
 					<span class="checkmark-tiny-light" title="@{checkCarried}"></span>
 				</label>
+				<label class="tiny-xbox-dummy-container">
+					<div class="tiny-xbox-dummy">
+					</div>
+				</label>
 				<h1>Equipment</h1>
 				<h1>Mass</h1>
 			</div>
@@ -1679,6 +1742,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried01">
 					<span class="checkmark-tiny-light" title="@{equipCarried01}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete01">
+					<span class="checkmark" title="@{equipDelete01}"></span>
+				</label>
 				<input type="text" name="attr_equipText01" title="@{equipText01}" maxlength="30" tabindex="131"/>
 				<input type="number" name="attr_equipMass01" title="@{equipMass01}" min="0" step="0.1" tabindex="132"/>
 			</div>
@@ -1698,6 +1765,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried02">
 					<span class="checkmark-tiny-light" title="@{equipCarried02}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete02">
+					<span class="checkmark" title="@{equipDelete02}"></span>
+				</label>
 				<input type="text" name="attr_equipText02" title="@{equipText02}" maxlength="30" tabindex="134"/>
 				<input type="number" name="attr_equipMass02" title="@{equipMass02}" min="0" step="0.1" tabindex="135"/>
 			</div>
@@ -1717,6 +1788,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried03">
 					<span class="checkmark-tiny-light" title="@{equipCarried03}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete03">
+					<span class="checkmark" title="@{equipDelete03}"></span>
+				</label>
 				<input type="text" name="attr_equipText03" title="@{equipText03}" maxlength="30" tabindex="136"/>
 				<input type="number" name="attr_equipMass03" title="@{equipMass03}" min="0" step="0.1" tabindex="137"/>
 			</div>
@@ -1736,6 +1811,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried04">
 					<span class="checkmark-tiny-light" title="@{equipCarried04}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete04">
+					<span class="checkmark" title="@{equipDelete04}"></span>
+				</label>
 				<input type="text" name="attr_equipText04" title="@{equipText04}" maxlength="30" tabindex="138"/>
 				<input type="number" name="attr_equipMass04" title="@{equipMass04}" min="0" step="0.1" tabindex="139"/>
 			</div>
@@ -1755,6 +1834,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried05">
 					<span class="checkmark-tiny-light" title="@{equipCarried05}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete05">
+					<span class="checkmark" title="@{equipDelete05}"></span>
+				</label>
 				<input type="text" name="attr_equipText05" title="@{equipText05}" maxlength="30" tabindex="140"/>
 				<input type="number" name="attr_equipMass05" title="@{equipMass05}" min="0" step="0.1" tabindex="141"/>
 			</div>
@@ -1774,6 +1857,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried06">
 					<span class="checkmark-tiny-light" title="@{equipCarried06}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete06">
+					<span class="checkmark" title="@{equipDelete06}"></span>
+				</label>
 				<input type="text" name="attr_equipText06" title="@{equipText06}" maxlength="30" tabindex="142"/>
 				<input type="number" name="attr_equipMass06" title="@{equipMass06}" min="0" step="0.1" tabindex="143"/>
 			</div>
@@ -1793,6 +1880,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried07">
 					<span class="checkmark-tiny-light" title="@{equipCarried07}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete07">
+					<span class="checkmark" title="@{equipDelete07}"></span>
+				</label>
 				<input type="text" name="attr_equipText07" title="@{equipText07}" maxlength="30" tabindex="144"/>
 				<input type="number" name="attr_equipMass07" title="@{equipMass07}" min="0" step="0.1" tabindex="145"/>
 			</div>
@@ -1812,6 +1903,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried08">
 					<span class="checkmark-tiny-light" title="@{equipCarried08}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete08">
+					<span class="checkmark" title="@{equipDelete08}"></span>
+				</label>
 				<input type="text" name="attr_equipText08" title="@{equipText08}" maxlength="30" tabindex="146"/>
 				<input type="number" name="attr_equipMass08" title="@{equipMass08}" min="0" step="0.1" tabindex="147"/>
 			</div>
@@ -1831,6 +1926,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried09">
 					<span class="checkmark-tiny-light" title="@{equipCarried09}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete09">
+					<span class="checkmark" title="@{equipDelete09}"></span>
+				</label>
 				<input type="text" name="attr_equipText09" title="@{equipText09}" maxlength="30" tabindex="148"/>
 				<input type="number" name="attr_equipMass09" title="@{equipMass09}" min="0" step="0.1" tabindex="149"/>
 			</div>
@@ -1850,6 +1949,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried10">
 					<span class="checkmark-tiny-light" title="@{equipCarried10}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete10">
+					<span class="checkmark" title="@{equipDelete10}"></span>
+				</label>
 				<input type="text" name="attr_equipText10" title="@{equipText10}" maxlength="30" tabindex="150"/>
 				<input type="number" name="attr_equipMass10" title="@{equipMass10}" min="0" step="0.1" tabindex="151"/>
 			</div>
@@ -1869,6 +1972,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried11">
 					<span class="checkmark-tiny-light" title="@{equipCarried11}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete11">
+					<span class="checkmark" title="@{equipDelete11}"></span>
+				</label>
 				<input type="text" name="attr_equipText11" title="@{equipText11}" maxlength="30" tabindex="152"/>
 				<input type="number" name="attr_equipMass11" title="@{equipMass11}" min="0" step="0.1" tabindex="153"/>
 			</div>
@@ -1888,6 +1995,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried12">
 					<span class="checkmark-tiny-light" title="@{equipCarried12}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete12">
+					<span class="checkmark" title="@{equipDelete12}"></span>
+				</label>
 				<input type="text" name="attr_equipText12" title="@{equipText12}" maxlength="30" tabindex="154"/>
 				<input type="number" name="attr_equipMass12" title="@{equipMass12}" min="0" step="0.1" tabindex="155"/>
 			</div>
@@ -1907,6 +2018,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried13">
 					<span class="checkmark-tiny-light" title="@{equipCarried13}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete13">
+					<span class="checkmark" title="@{equipDelete13}"></span>
+				</label>
 				<input type="text" name="attr_equipText13" title="@{equipText13}" maxlength="30" tabindex="156"/>
 				<input type="number" name="attr_equipMass13" title="@{equipMass13}" min="0" step="0.1" tabindex="157"/>
 			</div>
@@ -1926,6 +2041,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried14">
 					<span class="checkmark-tiny-light" title="@{equipCarried14}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete14">
+					<span class="checkmark" title="@{equipDelete14}"></span>
+				</label>
 				<input type="text" name="attr_equipText14" title="@{equipText14}" maxlength="30" tabindex="158"/>
 				<input type="number" name="attr_equipMass14" title="@{equipMass14}" min="0" step="0.1" tabindex="159"/>
 			</div>
@@ -1945,6 +2064,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried15">
 					<span class="checkmark-tiny-light" title="@{equipCarried15}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete15">
+					<span class="checkmark" title="@{equipDelete15}"></span>
+				</label>
 				<input type="text" name="attr_equipText15" title="@{equipText15}" maxlength="30" tabindex="160"/>
 				<input type="number" name="attr_equipMass15" title="@{equipMass15}" min="0" step="0.1" tabindex="161"/>
 			</div>
@@ -1964,6 +2087,10 @@ <h1>Mass</h1>
 					<input type="checkbox" checked="checked" name="attr_equipCarried16">
 					<span class="checkmark-tiny-light" title="@{equipCarried16}"></span>
 				</label>
+				<label class="container-xbox-tiny">
+					<input type="checkbox" name="attr_equipDelete16">
+					<span class="checkmark" title="@{equipDelete16}"></span>
+				</label>
 				<input type="text" name="attr_equipText16" title="@{equipText16}" maxlength="30" tabindex="162"/>
 				<input type="number" name="attr_equipMass16" title="@{equipText16}" min="0" step="0.1" tabindex="163"/>
 			</div>
@@ -12518,6 +12645,17 @@ <h1>Name-Title Separator</h1>
 				</div>
 				<h1>Whisper Rolls to GM</h1>
 			</div>
+			
+			<div class="item-thematic-break">
+			</div>
+			
+			<div class="item-options-row">
+				<label class="container-xbox">
+					<input type="checkbox" name="attr_activateDeleteChecks">
+					<span class="checkmark" title="@{activateDeleteChecks}"></span>
+				</label>
+				<h1>Activate Item Delete Boxes. Deactivate to complete Deletion. </h1>
+			</div>
 		</div>
 		
 		<div class="item-version-row">
@@ -12527,7 +12665,7 @@ <h2>Version:</h2>
 			
 			<div class="item-version-information">
 				<!-- Update version before release. -->
-				<input type="text" value="3.41" name="attr_version" title="@{version}" readonly tabindex="-1"/>
+				<input type="text" value="3.50" name="attr_version" title="@{version}" readonly tabindex="-1"/>
 			</div>
 		</div>
 		
@@ -12596,6 +12734,11 @@ <h2>Version:</h2>
 <input type="hidden" name="attr_hiddenEnhancerSkillsCost"  value="0"/>
 <input type="hidden" name="attr_hiddenMartialSkillsCost"  value="0"/>
 
+<!-- Variables for displaying formatted numbers related carried weight -->
+<input type="hidden" name="attr_liftWeight" value="0"/>
+<input type="hidden" name="attr_freeCarry" value="0"/>
+<input type="hidden" name="attr_carriedWeight" value="0"/>
+
 <!-- Hidden variables for clean weapon damage strings -->
 <input type="hidden" name="attr_hiddenWeaponDamage01"  value="0"/>
 <input type="hidden" name="attr_hiddenWeaponDamage02"  value="0"/>
@@ -12659,10 +12802,6 @@ <h2>Version:</h2>
 <!-- Hidden variable for token display -->
 <input type="hidden" name="attr_currentDCV" value="0"/>
 
-<!-- Transitional CVs for Display -->
-<!-- <input type="hidden" name="attr_ephemeralOCV" value="0"/>
-<input type="hidden" name="attr_ephemeralDCV" value="0"/> -->
-
 <!-- Set B armor variables -->
 <input type="hidden" name="attr_armorName11" value=""/>
 <input type="hidden" name="attr_armorPD11" value="0"/>
@@ -13234,16 +13373,16 @@ <h2>Version:</h2>
 		let name = values.character_name;
 		let origVersion = parseFloat(values.version)||1.0;
 		let statValue = 0;
-
+		
 		attributes.theSheetAvatar = values.character_avatar;
-
+		
 		// Version Checks
 		// Check for unversioned sheets
 		if (values.validateMay23 == undefined) {
 			// if no points spent, then it's a new sheet
 			if (parseInt(values.totalCharacterCost)||0 != 0)
 				origVersion = 1.0;
-
+				
 			attributes.validateMay23 = 1;
 		}
 		let version = origVersion;
@@ -13251,7 +13390,7 @@ <h2>Version:</h2>
 		if (version < 1.1) {
 			values = await _getAttrs(["intelligenceChance", "enhancedPerceptionModifier", "body", "stun", "endurance", "strength", "optionSuperHeroicEndurance"]);
 			var hiddenBasicEndurance = (parseInt(values.strength)||0) / (values.optionSuperHeroicEndurance != 0 ? 10 : 5);
-
+			
 			attributes.perceptionEnhanced = parseInt(values.intelligenceChance)||11 + parseInt(values.enhancedPerceptionModifier)||0;
 			attributes.CurrentBODY_max = parseInt(values.body)||0;
 			attributes.CurrentSTUN_max = parseInt(values.stun)||0;
@@ -13259,7 +13398,7 @@ <h2>Version:</h2>
 			attributes.hiddenBasicEndurance = Math.max(1, heroRoundLow(hiddenBasicEndurance));
 			version = 1.1;
 		}
-
+		
 		if (version < 2.1) {
 			values = await _getAttrs(["whisperToGM"]);
 			if (values.whisperToGM||0 == "on")
@@ -13459,9 +13598,18 @@ <h2>Version:</h2>
 			version = 3.05;
 		}
 		
-		if (version < 3.41) {
-			// No updates needed.
-			version = 3.41;
+		if (version < 3.50) {
+			// Update carry weight
+			values = await _getAttrs(["carriedWeight", "strength", "strengthMod"]);
+			
+			statValue = (parseInt(values.strength)||0) + (parseInt(values.strengthMod)||0);
+			
+			attributes.liftWeightDisplay = displayMass( calculateLift(statValue) );
+			attributes.freeCarry = calculateLift(statValue)/10;
+			attributes.freeCarryDisplay = displayMass( calculateLift(statValue)/10 );
+			attributes.carriedWeightDisplay = displayMass(parseFloat(values.carriedWeight)||0);
+			
+			version = 3.50;
 		}
 		
 		if (version != origVersion) {
@@ -13473,6 +13621,18 @@ <h2>Version:</h2>
 		setAttrs(attributes);
 	});
 	
+	
+	// Open with first tab (thanks to GiGs).
+	// Make sure delete readiness is off and delete checks are clear.
+	on("sheet:opened", function() {
+		clearDeleteChecks();
+		
+		setAttrs({
+			sheetTab: "characteristics",
+			activateDeleteChecks: 0
+		});
+	});
+	
 
 	// Show the selected sheet tab. This operation works via a proxy variable to make the CSS easier.
 	const buttonlist = ["characteristics","skills","powers","complications","gear","options"];
@@ -14002,7 +14162,7 @@ <h2>Version:</h2>
 			const costStat = 1;
 			let statCP = 0;
 			let enduranceCostBasic = 0;
-			var liftCapability;
+			var liftCapacity;
 			var freeCarry;
 			
 			// Basic damage
@@ -14023,29 +14183,18 @@ <h2>Version:</h2>
 				statCP=(statValue-baseStat)*costStat;
 			}	
 			
-			switch (statValue + statMod) {
-				case 0:	liftCapability = 0;
-						break;
-				case 1:	liftCapability = 8;
-						break;
-				case 2:	liftCapability = 16;
-						break;
-				case 3:	liftCapability = 25;
-						break;
-				case 4:	liftCapability = 38;
-						break;
-				default: liftCapability = Math.round(25*Math.pow(2,( (Math.max(0, statValue + statMod))/5)));
-			}
-			
-			freeCarry=liftCapability/10;
+			liftCapacity = calculateLift(statValue+statMod);
+			freeCarry = liftCapacity/10;
 			
-			// Update cost and roll chance		
+			// Update cost and roll chance and carry values		
 			setAttrs({
 				"strengthNet": Math.max(0, statValue + statMod),
 				"strengthCP": statCP,
 				"strengthChance": calculateRoll(Math.max(0, statValue + statMod)),
-				"liftWeight": liftCapability,
-				"encumbranceFreeCarry": freeCarry,
+				"liftWeight": calculateLift(statValue+statMod),
+				"liftWeightDisplay": displayMass(liftCapacity),
+				"freeCarry": freeCarry,
+				"freeCarryDisplay": displayMass(freeCarry),
 				"hiddenBasicDamage": hiddenDamage,
 				"hiddenBasicEndurance": enduranceCostBasic
 			});
@@ -14056,6 +14205,28 @@ <h2>Version:</h2>
 	});
 	
 	
+	function calculateLift (statValue) {
+		// Returns calculated value consistent with HERO standard lift chart.
+		let lift = 0;
+		
+		switch (statValue) {
+			case 0:	lift = 0;
+					break;
+			case 1:	lift = 8;
+					break;
+			case 2:	lift = 16;
+					break;
+			case 3:	lift = 25;
+					break;
+			case 4:	lift = 38;
+					break;
+			default: lift = Math.round(25*Math.pow(2,( (Math.max(0, statValue))/5)));
+		}
+		
+		return lift;
+	}
+	
+	
 	function calculateBasicDamage (statValue) {
 		let theNumberOfD6 = (parseInt((statValue - (statValue%5))/5)||0).toString();
 		let theNumberOfD3 = 0;
@@ -16890,42 +17061,257 @@ <h2>Version:</h2>
 	});
 	
 	
-	// Show carried armor checks.
-	on("change:checkArmored", function() {
-		getAttrs(["checkArmored"], function(values) {
+	// Show carried armor checks or delete items marked for deletion.
+	// DANGER: Risk of data loss.
+	on("change:checkArmored change:activateDeleteChecks", function() {
+		getAttrs(["checkArmored", "activateDeleteChecks", "armorDelete01", "armorDelete02", "armorDelete03", "armorDelete04"], function(values) {
+			var attributes = new Object();
+			var itemId = "";
+			
+			if (values.activateDeleteChecks === "on") {
+				attributes.armorChecks = "delete";
+				attributes.setDamageToggle = "0";
+				
+				// Clear all delete checks for safety.
+				clearArmorDeleteChecks();
+			} else {
+				attributes.armorChecks = (values.checkArmored === "on") ? "carry" : "move";
+				
+				for (var i = 1; i <= maxArmorNum; i++) {
+					itemId = String(i).padStart(2,'0');
+					
+					if (values["armorDelete"+itemId] === "on") {
+						attributes["armorName"+itemId] = "";
+						attributes["armorPD"+itemId] = 0;
+						attributes["totalPD"+itemId] = 0;
+						attributes["armorED"+itemId] = 0;
+						attributes["totalED"+itemId] = 0;
+						attributes["armorEND"+itemId] = 0;
+						attributes["armorActivation"+itemId] = 18;
+						attributes["armorLocations"+itemId] = "";
+						attributes["armorMass"+itemId] = 0;
+						attributes["armorDelete"+itemId] = 0;
+					}
+				}
+			}
+			
+			setAttrs(attributes);
+		});
+	});
+	
+	
+	function clearArmorDeleteChecks() {
+		var attributes = new Object();
+		var itemId = "";
+		
+		for (var i = 1; i <= maxArmorNum; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["armorDelete"+itemId] = 0;
+		}
+		
+		setAttrs(attributes);
+	}
+	
+	
+	// Show carried armor checks or delete items marked for deletion.
+	// DANGER: Risk of data loss.
+	on("change:activateDeleteChecks", function() {
+		getAttrs(["activateDeleteChecks", "weaponDelete06"], function(values) {
 			var attributes = new Object();
 			
-			attributes.armorChecks = (values.checkArmored === "on") ? "true" : "false";
+			if (values.activateDeleteChecks === "on") {
+				attributes.shieldChecks = "delete";
+				attributes.setDamageToggle = "0";
+				
+				// Clear all delete checks for safety.
+				clearShieldDeleteChecks();
+			} else {
+				attributes.shieldChecks = "carry";
+				
+				if (values["weaponDelete06"] === "on") {
+					attributes["weaponName06"] = "";
+					attributes["shieldDCV"] = 0;
+					attributes["weaponCSL06"] = 0;
+					attributes["weaponOCV06"] = 0;
+					attributes["weaponStunMod06"] = 0;
+					attributes["weaponEndurance06"] = "0";
+					attributes["shieldBody"] = 0;
+					attributes["shieldDefense"] = 0;
+					attributes["shieldMass"] = 0;
+					
+					// Damage Worksheet Values
+					attributes["weaponDamage06"] = "0";
+					attributes["weaponNormalDamage06"] = "on";
+					attributes["weaponStrengthMin06"] = 1;
+					attributes["weaponStrength06"] = 1;
+					attributes["weaponDC06"] = 0;
+					attributes["rangeBasedOnStr06"] = 0;
+					attributes["weaponEnhancedByStr06"] = 0;
+					attributes["weaponAdvantage06"] = 0;
+					attributes["weaponCSL06"] = 0;
+					attributes["weaponEndMod06"] = 0;
+					attributes["weaponAdjustedDamage06"] = "0";
+					attributes["weaponAdjustedDC06"] = 0;
+					attributes["weaponPenalty06"] = "0";
+					attributes["weaponEndurance06"] = "0";
+				}
+			}
 			
 			setAttrs(attributes);
 		});
 	});
 	
 	
-	// Show carried weapon checks.
-	on("change:checkWielded", function() {
-		getAttrs(["checkWielded"], function(values) {
+	function clearShieldDeleteChecks() {
+		var attributes = new Object();
+		
+		attributes["weaponDelete06"] = 0;
+		
+		setAttrs(attributes);
+	}
+	
+	
+	// Show carried weapon checks or delete items marked for deletion.
+	// DANGER: Risk of data loss.
+	on("change:checkWielded change:activateDeleteChecks", function() {
+		getAttrs(["checkWielded", "activateDeleteChecks", "weaponDelete01", "weaponDelete02", "weaponDelete03", "weaponDelete04", "weaponDelete05"], function(values) {
 			var attributes = new Object();
+			var itemId = "";
 			
-			attributes.weaponChecks = (values.checkWielded === "on") ? "true" : "false";
+			if (values.activateDeleteChecks === "on") {
+				attributes.weaponChecks = "delete";
+				attributes.setDamageToggle = "0";
+				
+				// Clear all delete checks for safety.
+				clearWeaponDeleteChecks();
+			} else {
+				attributes.weaponChecks = (values.checkWielded === "on") ? "carry" : "move";
+				
+				for (var i = 1; i <= maxWeaponNum-1; i++) {
+					itemId = String(i).padStart(2,'0');
+					
+					if (values["weaponDelete"+itemId] === "on") {
+						attributes["weaponName"+itemId] = "";
+						attributes["weaponCSL"+itemId] = 0;
+						attributes["weaponOCV"+itemId] = 0;
+						attributes["weaponStunMod"+itemId] = 0;
+						attributes["weaponEndurance"+itemId] = "0";
+						attributes["weaponRange"+itemId] = 0;
+						attributes["weaponRangeMod"+itemId] = 0;
+						attributes["weaponShots"+itemId] = 0;
+						attributes["weaponAreaEffect"+itemId] = 0;
+						attributes["weaponMass"+itemId] = 0;
+						
+						// Damage Worksheet Values
+						attributes["weaponDamage"+itemId] = "0";
+						attributes["weaponNormalDamage"+itemId] = 0;
+						attributes["weaponStrengthMin"+itemId] = 1;
+						attributes["weaponStrength"+itemId] = 1;
+						attributes["weaponDC"+itemId] = 0;
+						attributes["rangeBasedOnStr"+itemId] = 0;
+						attributes["weaponEnhancedByStr"+itemId] = 0;
+						attributes["weaponAdvantage"+itemId] = 0;
+						attributes["weaponCSL"+itemId] = 0;
+						attributes["weaponEndMod"+itemId] = 0;
+						attributes["weaponAdjustedDamage"+itemId] = "0";
+						attributes["weaponAdjustedDC"+itemId] = 0;
+						attributes["weaponPenalty"+itemId] = "0";
+						attributes["weaponEndurance"+itemId] = "0";
+					}
+				}
+			}
 			
 			setAttrs(attributes);
 		});
 	});
 	
 	
-	// Show carried equipment checks.
-	on("change:checkCarried", function() {
-		getAttrs(["checkCarried"], function(values) {
+	function clearWeaponDeleteChecks() {
+		var attributes = new Object();
+		var itemId = "";
+		
+		for (var i = 1; i <= maxWeaponNum-1; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["weaponDelete"+itemId] = 0;
+		}
+		
+		setAttrs(attributes);
+	}
+	
+	
+	// Show carried equipment checks or delete items marked for deletion.
+	// DANGER: Risk of data loss.
+	on("change:checkCarried change:activateDeleteChecks", function() {
+		getAttrs(["checkCarried", "activateDeleteChecks", "equipDelete01", "equipDelete02", "equipDelete03", "equipDelete04", "equipDelete05", "equipDelete06", "equipDelete07", "equipDelete08", "equipDelete09", "equipDelete10", "equipDelete11", "equipDelete12", "equipDelete13", "equipDelete14", "equipDelete15", "equipDelete16"], function(values) {
 			var attributes = new Object();
+			var itemId = "";
 			
-			attributes.equipmentChecks = (values.checkCarried === "on") ? "true" : "false";
+			if (values.activateDeleteChecks === "on") {
+				attributes.equipmentChecks = "delete";
+				
+				// Clear all delete checks for safety.
+				clearEquipDeleteChecks();
+			} else {
+				attributes.equipmentChecks = (values.checkCarried === "on") ? "carry" : "move";
+				
+				for (var i = 1; i <= maxEquipmentNum; i++) {
+					itemId = String(i).padStart(2,'0');
+					
+					if (values["equipDelete"+itemId] === "on") {
+						attributes["equipText"+itemId] = "";
+						attributes["equipMass"+itemId] = "";
+						attributes["equipDelete"+itemId] = 0;
+					}
+				}
+			}
 			
 			setAttrs(attributes);
 		});
 	});
 	
 	
+	function clearEquipDeleteChecks() {
+		var attributes = new Object();
+		var itemId = "";
+		
+		for (var i = 1; i <= maxEquipmentNum; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["equipDelete"+itemId] = 0;
+		}
+		
+		setAttrs(attributes);
+	}
+	
+	
+	function clearDeleteChecks() {
+		var attributes = new Object();
+		var itemId = "";
+		
+		// Armor
+		for (var i = 1; i <= maxArmorNum; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["armorDelete"+itemId] = 0;
+		}
+		
+		// Shield
+		attributes["weaponDelete06"] = 0;
+		
+		// Weapons
+		for (var i = 1; i <= maxWeaponNum-1; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["weaponDelete"+itemId] = 0;
+		}
+		
+		// Equipment
+		for (var i = 1; i <= maxEquipmentNum; i++) {
+			itemId = String(i).padStart(2,'0');
+			attributes["equipDelete"+itemId] = 0;
+		}
+		
+		setAttrs(attributes);
+	}
+	
+	
 	/* Gear Tab sum up equipment weight */
 	on("change:liftWeight change:optionCarryAllSets change:armorEND01 change:armorEND02 change:armorEND03 change:armorEND04 change:armorCarried01 change:armorCarried02 change:armorCarried03 change:armorCarried04 change:armorMass01 change:armorMass01 change:armorMass02 change:armorMass03 change:armorMass04 change:shieldCarried change:shieldMass change:weaponCarried01 change:weaponCarried02 change:weaponCarried03 change:weaponCarried04 change:weaponCarried05 change:weaponMass01 change:weaponMass02 change:weaponMass03 change:weaponMass04 change:weaponMass05 change:equipMass01 change:equipMass02 change:equipMass03 change:equipMass04 change:equipMass05 change:equipMass06 change:equipMass07 change:equipMass08 change:equipMass09 change:equipMass10 change:equipMass11 change:equipMass12 change:equipMass13 change:equipMass14 change:equipMass15 change:equipMass16 change:equipCarried01 change:equipCarried02 change:equipCarried03 change:equipCarried04 change:equipCarried05 change:equipCarried06 change:equipCarried07 change:equipCarried08 change:equipCarried09 change:equipCarried10 change:equipCarried11 change:equipCarried12 change:equipCarried13 change:equipCarried14 change:equipCarried15 change:equipCarried16", function () {
 		// Add the masses of all items of equipment.
@@ -16981,7 +17367,7 @@ <h2>Version:</h2>
 			}
 			
 			carriedWeight=armorCarried+weaponsCarried+equipCarried;
-			carriedWeight=Math.floor(10*carriedWeight)/10;
+			// carriedWeight=Math.floor(10*carriedWeight)/10;
 			
 			
 			// Determine penalties
@@ -17018,21 +17404,56 @@ <h2>Version:</h2>
 			}
 			
 			setAttrs({
-				"carriedWeight":carriedWeight,
-				"weightEndPenalty":enduranceCost,
-				"weightDexDCVPenalty":dexPenalty,
-				"weightMovePenalty":movePenalty,
-				"runningPenalty":movePenalty,
-				"leapingPenalty":movePenalty,
-				"swimmingPenalty":movePenalty
+				"carriedWeight": carriedWeight,
+				"carriedWeightDisplay": displayMass(carriedWeight),
+				"weightEndPenalty": enduranceCost,
+				"weightDexDCVPenalty": dexPenalty,
+				"weightMovePenalty": movePenalty,
+				"runningPenalty": movePenalty,
+				"leapingPenalty": movePenalty,
+				"swimmingPenalty": movePenalty
 			});
 		});
 	});
 	
-	// Open with first tab (thanks to GiGs)
-	on("sheet:opened", function() {
-		setAttrs({sheetTab:"characteristics"});
-	});
+	
+	// Num to text for display mass.
+	function displayMass(theMass) {
+		let mass = theMass;
+		let theString = theMass.toString();
+		
+		if (theMass > 1e6) {
+			if (theMass < 1e7) {
+				mass = (Math.round(mass/1e5))/10;
+				theString = mass.toString();
+				theString += " kt";
+			} else {
+				mass = Math.round(mass/1e6);
+				theString = mass.toString();
+				theString += " kt";
+			}
+		} else if (theMass > 1000) {
+			if (theMass < 1e4) {
+				mass = (Math.round(mass/100))/10;
+				theString = mass.toString();
+				theString += " t";
+			} else {
+				mass = Math.round(mass/1000);
+				theString = mass.toString();
+				theString += " t";
+			}
+		} else {
+			if (theMass < 100) {
+				mass = (Math.round(mass*10))/10;
+				theString = mass.toString();
+			} else {
+				mass = Math.round(mass);
+				theString = mass.toString();
+			}
+		}
+		
+		return theString;
+	} 
 	
 	
 	/* ----------------------- */
@@ -17173,7 +17594,11 @@ <h2>Version:</h2>
 	
 	// Exchange all armor in a set.
 	on("clicked:armorSetAtoB", function() {
-		swapArmorSet();
+		getAttrs(["activateDeleteChecks"], function(values) {
+			if (values.activateDeleteChecks !== "on") {
+				swapArmorSet();
+			}
+		});
 	});
 	
 	
@@ -17346,9 +17771,9 @@ <h2>Version:</h2>
 					damageLabel = "Contest";
 					
 					attributes.hiddenDamage = contestDice;
-					attributes.hiddenIsNormal = false;
-					attributes.hiddenIsContest = true;
-					attributes.hiddenIsPower = false;
+					attributes.hiddenIsNormal = "false";
+					attributes.hiddenIsContest = "true";
+					attributes.hiddenIsPower = "false";
 					attributes.hiddenMessage = rollMessage;
 					
 				} else if (isAttack) {
@@ -17358,14 +17783,14 @@ <h2>Version:</h2>
 					attributes.hiddenDamage = getDamageDice(damageObject.DC + modDC, 0, damageObject.normal, damageObject.pip);
 					attributes.hiddenStunMod = stunMod;
 					attributes.hiddenIsNormal = isNormal ? "true" : "false";
-					attributes.hiddenIsContest = false;
+					attributes.hiddenIsContest = "false";
 					attributes.hiddenMessage = rollMessage;
-					attributes.hiddenIsAoE = false;
+					attributes.hiddenIsAoE = "false";
 					
 				} else if (isDodging) {
 					
-					attributes.hiddenIsContest = false;
-					attributes.hiddenIsPower = false;
+					attributes.hiddenIsContest = "false";
+					attributes.hiddenIsPower = "false";
 					attributes.rangeManeuver = 0;
 					attributes.checkSet = 0;
 					attributes.checkBrace = 0;
@@ -17707,7 +18132,7 @@ <h2>Version:</h2>
 		
 		normalMessage = hitLocation + ": " + theMessage;
 		killMessage = normalMessage;
-
+		
 		if (NSTUN != 1) {
 			normalMessage += " STUNx" + NSTUN;
 		}
@@ -17715,7 +18140,7 @@ <h2>Version:</h2>
 			normalMessage += " BODYx" + BODYx;
 			killMessage += " BODYx" + BODYx;
 		}
-
+		
 		var theHitLocation = {
 			normalMessage: normalMessage,
 			killMessage: killMessage,
@@ -17724,7 +18149,7 @@ <h2>Version:</h2>
 			NSTUN: NSTUN,
 			BODYx: BODYx
 		};
-					
+		
 		return theHitLocation;
 	}
 	
@@ -17754,8 +18179,8 @@ <h2>Version:</h2>
 						computed = computed+1;
 					}
 				}
-				}
-					}
+			}
+		}
 		return computed;
 	}
 	
@@ -18309,12 +18734,19 @@ <h2>Version:</h2>
 		});
 	});
 	
+	
 	// Show set weapon damage dialog
 	arrayOf(maxWeaponNum).forEach(num => {
 		var weaponId = String(num).padStart(2,'0');	
 		on(`clicked:setDamage${weaponId}`, (info) => {
-			setAttrs({
-				"setDamageToggle":weaponId
+			getAttrs(["activateDeleteChecks"], function(values) {
+				
+				if (values.activateDeleteChecks !== "on") {
+					
+					setAttrs({
+						"setDamageToggle":weaponId
+					});
+				}
 			});
 		});
 	});
@@ -19679,7 +20111,11 @@ <h2>Version:</h2>
 	
 	// Exchange all weapons in a set.
 	on("clicked:weaponSetAtoB", function() {
-		swapWeaponSet();
+		getAttrs(["activateDeleteChecks"], function(values) {
+			if (values.activateDeleteChecks !== "on") {
+				swapWeaponSet();
+			}
+		});
 	});
 	
 	
diff --git a/HeroSystem6eHeroic/README.md b/HeroSystem6eHeroic/README.md
index 0bc193fb883..5f30ad001a4 100644
--- a/HeroSystem6eHeroic/README.md
+++ b/HeroSystem6eHeroic/README.md
@@ -275,6 +275,15 @@ Paste a single Unicode character in this text field if you would like a custom d
 
 This dropdown offers three options: Never, Always, or Prompt. These give the option to send your rolls only to the GM, with prompt offering the option whenever you roll or show an ability.
 
+![Delete Option](/HeroSystem6eHeroic/images/OptionDelete.png)
+
+### Activate Item Delete Mode. Deactivate to complete Deletion
+
+This option activates or deactivates the line item deletion mode for armor, weapons, equipment, and the shield. Select whichever items you would like to remove. These items will not be deleted until you deactivate the mode. If you close the character sheet the deletion marks will be reset, aborting the action.
+
+>[!CAUTION]
+> Use of the Delete Mode may lead to unwanted data loss. Deleted items are not recoverable.
+
 # <a id="mods">Mod Support</a>
 
 ### HERO System 6e Heroic HD Importer
@@ -322,4 +331,4 @@ During play, add the Turn Token to the Turn Tracker using the "Tracker" button o
 ![Turn Tracker](/HeroSystem6eHeroic/images/TurnTracker.png)
 
 *First version by Villain In Glasses, August 1, 2021.*
-*Last updated by Villain in Glasses on October 1, 2024 to represent the sheet as of version 3.41.*
+*Last updated by Villain in Glasses on October 15, 2024 to represent the sheet as of version 3.50.*
diff --git a/HeroSystem6eHeroic/images/OptionDelete.png b/HeroSystem6eHeroic/images/OptionDelete.png
new file mode 100644
index 00000000000..00d6a2e3158
Binary files /dev/null and b/HeroSystem6eHeroic/images/OptionDelete.png differ
diff --git a/HeroSystem6eHeroic/images/screenshot-06-scaled.png b/HeroSystem6eHeroic/images/screenshot-06-scaled.png
index 608d230d311..bc746f0ac13 100644
Binary files a/HeroSystem6eHeroic/images/screenshot-06-scaled.png and b/HeroSystem6eHeroic/images/screenshot-06-scaled.png differ
diff --git a/HeroSystem6eHeroic/images/screenshot-06.png b/HeroSystem6eHeroic/images/screenshot-06.png
index 908fed8452b..be1cdafca43 100644
Binary files a/HeroSystem6eHeroic/images/screenshot-06.png and b/HeroSystem6eHeroic/images/screenshot-06.png differ