diff --git a/Draw Steel/draw-steel.css b/Draw Steel/draw-steel.css
index 7dc68cbcdd..4c684d4f16 100644
--- a/Draw Steel/draw-steel.css	
+++ b/Draw Steel/draw-steel.css	
@@ -4,31 +4,172 @@
 	grid-column-end: -1
 }
 
-/* Main Sheet */
+/* Sheet-wide variables */
+
 .charsheet {
-        background-color: #eee;
-	padding: 1em;
-	font-family: Georgia, serif;
-	overflow: clip;
+	/* === COLORS === */
+    /* Backgrounds */
+    --color-bg-main: #ffffff; 
+    --color-bg-section: #e0e0e0;
+
+    /* Text */
+    --color-text-body: #333333; 
+    --color-text-header: #1a1a1a; 
+    --color-text-accent: #666666; 
+
+    /* Borders & Accents */
+    --color-border: #999999; 
+    --color-accent-steel: #777777; 
+
+    /* Inputs & UI */
+    --color-input-bg: #ffffff; 
+    --color-input-border: #b0b0b0; 
+	--color-button-bg: var(--color-border);
+	--color-button-border: #555555; 
+	--color-button-hover-bg: var(--color-accent-steel);
+	--color-button-hover-border: #1a1a1a;
+
+    /* === FONTS === */
+    --font-family-header: "Georgia", "Times New Roman", serif;
+    --font-family-body: "Georgia", "Times New Roman", serif;
+
+    /* === SIZING & SPACING === */
+    --border-main: 1px solid var(--color-border);
+	--border-section: 2px solid var(--color-border);
+    --border-radius: 5px;
+	--box-shadow: inset 0 0 2px rgba(255, 255, 255, 0.05), 0 0 4px rgba(0, 0, 0, 0.3);
+    --sheet-padding: 8px;
+    --section-gap: 0.5em;
 }
 
+/* Dark Mode Sheet-wide variables */
+
+.sheet-darkmode .charsheet {
+	 /* === COLORS === */
+    /* Backgrounds */
+    --color-bg-main: #1f1f1f; /* Very dark gray, near black */
+    --color-bg-section: rgb(59, 64, 69); /* Slightly lighter dark gray for sections */
+
+    /* Text */
+    --color-text-body: #cccccc; /* Light gray for body text */
+    --color-text-header: #f0f0f0; /* Very light gray, almost white for headers */
+    --color-text-accent: #999999; /* Mid-gray for emphasis or subtle accent */
+
+    /* Borders & Accents */
+    --color-border: #666666; /* Darker mid-gray for borders */
+    --color-accent-steel: #888888; /* A solid gray for steel-like accents */
+
+    /* Inputs & UI */
+    --color-input-bg: #444444; /* Darker gray for inputs */
+    --color-input-border: #777777; /* Mid-gray for input borders */
+	--color-button-bg: #3b4045;
+	--color-button-border: #888888; 
+	--color-button-hover-border: #aaaaaa;
+    
+}
+
+/* Roll Template variables */ 
+
+.sheet-rolltemplate-monsterability .sheet-roll-container,
+.sheet-rolltemplate-ability .sheet-roll-container,
+.sheet-rolltemplate-powerroll .sheet-roll-container,
+.sheet-rolltemplate-abilitypowerroll .sheet-roll-container {
+	/* === COLORS === */
+    /* Backgrounds */
+    --color-bg-main: #f5f5f5; 
+    --color-bg-section: #e0e0e0;
+
+    /* Text */
+    --color-text-body: #333333; 
+    --color-text-header: #1a1a1a; 
+    --color-text-accent: #666666; 
+
+    /* Borders & Accents */
+    --color-border: #999999; 
+    --color-accent-steel: #777777; 
+
+	/* === FONTS === */
+    --font-family-header: "Georgia", "Times New Roman", serif;
+    --font-family-body: "Georgia", "Times New Roman", serif;
+
+    /* === SIZING & SPACING === */
+    --border-main: 1px solid var(--color-border);
+	--border-section: 1px solid var(--color-border);
+    --border-radius: 5px;
+	--sheet-padding: 8px;
+}
+
+/* Darkmode Roll Template variables */ 
+
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-monsterability .sheet-roll-container,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-ability .sheet-roll-container,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-powerroll .sheet-roll-container,
+.sheet-rolltemplate-abilitypowerroll.sheet-rolltemplate-darkmode .sheet-roll-container {
+ 	--color-bg-main: #1f1f1f; 
+    --color-bg-section: rgb(59, 64, 69); 
+
+    /* Text */
+    --color-text-body: #cccccc; 
+    --color-text-header: #f0f0f0; 
+    --color-text-accent: #999999; 
+
+    /* Borders & Accents */
+    --color-border: #666666; 
+    --color-accent-steel: #888888; 
+	
+}
+
+
+/* Main Sheet */
+
+.charsheet {
+    background-color: var(--color-bg-main) ;
+	color: var(--color-text-body);
+	font-family: var(--font-family-body);
+	padding: 1em;
+	overflow: clip;
+	min-width: 566px;
+}
+
+/*
 .sheet-darkmode .charsheet {
 	color: #e0e0e0;
 	background: #2b3035 !important;
 }
+*/
+
+.sheet-panel {
+	background-color: var(--color-bg-section);
+	color: var(--color-text-body);
+	border: var(--border-main);
+	border-radius: var(--border-radius);
+	box-shadow: var(--box-shadow);
+	padding: var(--sheet-padding);
+	margin-bottom: var(--section-gap);
+}
+
+.sheet-panel-box {
+	border: var(--border-section);
+	border-radius: var(--border-radius);
+	padding: var(--sheet-padding);
+	background-color: var(--color-bg-subsection);
+}
+
+/*
+.sheet-header {
+	display: grid;
+}
+*/
 
 .sheet-darkmode img[alt="Powered By Draw Steel"] {
   filter: invert(100%);
 }
 
-.sheet-header {
-	display: grid;
-}
-
-.sheet-body {
+.sheet-body { /* Sets the minimum width for the player character sheet */
 	min-width:800px;
 }
 
+/*
 .sheet-body > :not(.v-spacer):not(.h-spacer) {
 	background-color: #fdfdfd;
 }
@@ -40,68 +181,24 @@ background: #2b3035 !important;
   box-shadow: inset 0 0 2px rgba(255, 255, 255, 0.05),
               0 0 4px rgba(0, 0, 0, 0.3);
 }
+*/
 
-.sheet-darkmode button[type="action"] {
-  background-color: #3b4045 !important;
+.charsheet button[type="action"] {
+	background-color: var(--color-button-bg);
+    color: var(--color-text-body);
+    border: 1px solid var(--color-button-border);
+    border-radius: var(--border-radius);
+    font-family: var(--font-family-body);
+    cursor: pointer;
+    transition: background-color 0.2s ease;
 }
 
-.border {
-	border: 3px solid #aaa;
-	border-radius: 4px;
-	padding: 0.5em;
+.charsheet button[type="action"]:hover {
+	background-color: var(--color-button-hover-bg);
+	border-color: var(--color-button-hover-border);
 }
 
-.border-right {
-	border-right: 1px solid #aaa;
-}
-
-.v-spacer {
-	height: 1em;
-}
-
-.hexagon {
-  background-color: #f9f9f9;
-  border: 2px solid #ccc;
-  border-radius: 0.5em;
-  padding: 0.5em;
-  text-align: center;
-  box-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
-}
-
-.sheet-darkmode .hexagon {
-  background-color: #3b4045;
-}
-
-.charsheet input {
-	width: unset;
-}
-.charsheet input[type=number] {
-	text-align: center;
-}
-.charsheet input[type=number].no-spin::-webkit-inner-spin-button,
-.charsheet input[type=number].no-spin::-webkit-inner-spin-button {
-	-webkit-appearance: none;
-	margin: 0;
-}
-.charsheet input.input-md {
-	height: 20px;
-	font-size: 0.9em;
-}
-
-.sheet-darkmode .charsheet input.input-md {
-  background-color: #3b4045;
-  color: #e0e0e0;
-  border-color: #444;
-}
-
-.charsheet input.input-stamina {
-	height: 20px;
-	font-size: 0.9em;
-        width: 100%;
- 	box-sizing: border-box;
-  	min-width: 6em;
-}
-.charsheet label {
+.characterviewer .charsheet label {
 	display: unset;
 	margin: unset;
 	padding: unset;
@@ -109,24 +206,120 @@ background: #2b3035 !important;
 	text-align: unset;
 	float: unset;
 	font-size: 1em;
+	color: var(--color-text-header);
 }
-label.sublabel {
+
+.charsheet input {
+	width: unset;
+	color: var(--color-text-body);
+	background-color: var(--color-input-bg);
+	border: 1px solid var(--color-input-border);
+	border-radius: var(--border-radius);
+}
+.charsheet input[type=number] { 
+	text-align: center;
+}
+
+.charsheet select {
+	margin: unset;
+	width: unset;
+	color: var(--color-text-body);
+	background-color: var(--color-input-bg);
+	border: 1px solid var(--color-input-border);
+	border-radius: var(--border-radius);
+}
+
+.charsheet textarea {
+	margin: unset;
+	width: unset;
+	resize: vertical;
+	color: var(--color-text-body);
+	background-color: var(--color-input-bg);
+	border: 1px solid var(--color-input-border);
+	border-radius: var(--border-radius);
+	min-height: 50px;
+	box-sizing: border-box;
+}
+
+.charsheet h1, 
+.charsheet h2, 
+.charsheet h3, 
+.charsheet h4, 
+.charsheet h5, 
+.charsheet h6 {
+	color: var(--color-text-header);
+	font-family: var(--font-family-header);
+}
+
+.charsheet .repcontrol {
+	margin: var(--sheet-padding);
+}
+/*
+.border {
+	border: 3px solid #aaa;
+	border-radius: 4px;
+	padding: 0.5em;
+}
+*/
+
+.border-right {
+	border-right: var(--border-main);
+}
+
+/*
+.v-spacer {
+	height: 1em;
+}
+*/
+
+
+
+/*
+.sheet-darkmode .hexagon {
+  background-color: #3b4045;
+}
+*/
+
+.charsheet input[type=number].no-spin::-webkit-inner-spin-button,
+.charsheet input[type=number].no-spin::-webkit-inner-spin-button {
+	-webkit-appearance: none;
+	margin: 0;
+}
+
+.charsheet input.input-md {
+	height: 20px;
+	font-size: 0.9em;
+}
+
+.charsheet input.input-stamina {
+	height: 20px;
+	font-size: 0.9em;
+    width: 100%;
+ 	box-sizing: border-box;
+  	min-width: 6em;
+}
+
+.charsheet label.sublabel {
 	height: 16px;
 	font-size: 0.8em;
 	font-weight: normal;
+	color: var(--color-text-accent);
 }
 .charsheet label.sublabel input {
 	padding: 0;
 	font-size: 1em;
 }
-.charsheet select {
-	margin: unset;
-	width: unset;
+
+.charsheet .panel-title {
+	font-size: 14px;
+	text-align: center
 }
-.charsheet textarea {
-	margin: unset;
-	width: unset;
-	resize: vertical;
+
+/*
+.sheet-darkmode .charsheet input.input-md {
+  background-color: #3b4045;
+  color: #e0e0e0;
+  border-color: #444;
 }
 
 .sheet-darkmode .charsheet input.input-stamina {
@@ -159,34 +352,42 @@ label.sublabel {
   color: #e0e0e0;
   opacity: 1;
 }
-
+*/
 .progressbox-group {
 	display: flex;
 }
 .progressbox-group > input {
 	display: none;
 }
-.progressbox-group > .progressbox {
+.charsheet .progressbox-group > .progressbox {
 	display: block;
 	height: 1.5em;
 	width: 1.3em;
-	border: 1px solid #aaa;
+	border: 1px solid var(--color-input-border);
 	cursor: pointer;
 }
 
 .progressbox-group > .progressbox:has(~ input:checked),
 .progressbox-group > input:checked + .progressbox {
-	background-color: #777;
+	background-color: var(--color-accent-steel);
 }
 
+/*
 .sheet-darkmode .progressbox-group > .progressbox:has(~ input:checked),
 .sheet-darkmode .progressbox-group > input:checked + .progressbox {
 	background-color: #e0e0e0;
 }
+*/
+/* Sheet Options Panel */
+
+
+
+
+/* Header Panel */
 
 .header-panel {
 	display: flex;
-	gap: 0.5em;
+	gap: var(--section-gap);
 }
 .header-panel > * {
 	flex: 1 1 0;
@@ -200,6 +401,26 @@ label.sublabel {
 .text-warning {
 	color: orangered;
 }
+/* Minimize Panel Icon 
+.minimize {
+	display:none; 
+}
+
+#stats-minimize-checkbox:checked + label::before,
+#biography-minimize-checkbox:checked + label::before,
+#skills-languages-minimize-checkbox:checked + label::before,
+#features-minimize-checkbox:checked + label::before,
+#abilities-minimize-checkbox:checked + label::before,
+#inventory-minimize-checkbox:checked + label::before,
+#projects-minimize-checkbox:checked + label::before {
+	content:'&';
+}
+label[for*='minimize']::before {
+	display: inline-block;
+	content:'_';
+	font-family: 'Pictos';
+}
+*/
 
 .minimizable:has(.minimize-control > .minimize:checked) > :not(.minimize-control):not(.minimize-ignore):not(.minimize-show),
 .minimizable:has(.minimize-control > .minimize:checked) > .minimize-ignore > :not(.minimize-ignore),
@@ -220,7 +441,7 @@ label.sublabel {
 .profile-panel .name-input-group {
 	grid-column-end: span 2;
 }
-
+/*
 .sheet-darkmode .panel-dark input[type="text"] {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
@@ -237,7 +458,7 @@ label.sublabel {
   color: #e0e0e0;
   border-color: #444;
 }
-
+*/
 .progress-panel {
 	display: grid;
 	grid-template-columns: repeat(6, 1fr);
@@ -256,6 +477,7 @@ label.sublabel {
 	grid-column-end: span 2;
 }
 
+/*
 .sheet-darkmode h5[data-i18n="victories"],
 .sheet-darkmode h5[data-i18n="level"],
 .sheet-darkmode h5[data-i18n="biography"],
@@ -273,29 +495,106 @@ label.sublabel {
 .sheet-darkmode h2[data-i18n="move-actions"] {
   color: #e0e0e0;
 }
+*/
 
 .stats-panel {
 	position: sticky;
 	top: 0;
 	z-index: 10;
 	display: grid;
-	grid-template-columns: repeat(12, 1fr);
-	gap: 0.25em;
-}
-.stats-panel > .minimize-control {
-	grid-column-start: 1;
-	grid-column-end: -1;
+	grid-template-columns: repeat(10,76px);
+	grid-template-rows: auto;
+	gap: 5px;
 }
 
+.charsheet .sheet-body .stats-panel input[type=number]::-webkit-inner-spin-button, 
+.charsheet .sheet-body .stats-panel input[type=number]::-webkit-outer-spin-button { 
+    -webkit-appearance: none;
+    margin: 0; 
+}
+
+.charsheet .sheet-body .stats-panel input[type=number] {
+	-moz-appearance: textfield;
+}
+
+.stats-panel > .minimize-control {
+	grid-column: 1 / -1;
+}
+
+.stat-dashboard {
+  display: grid;
+  grid-template-columns: repeat(10, 76px);
+  gap: 5px;
+  grid-column: 1/-1;
+  justify-items: center;
+  align-items: end;
+
+}
+
+.hexagon {
+--b: 2px;
+  height: 75px;
+  aspect-ratio: cos(30deg);
+  clip-path: polygon(50% 0,-50% 50%,50% 100%,150% 50%,50% 0, 50% var(--b), calc(100% - var(--b)*sin(60deg)) calc(25% + var(--b)*cos(60deg)), calc(100% - var(--b)*sin(60deg)) calc(75% - var(--b)*cos(60deg)), 50% calc(100% - var(--b)), calc(var(--b)*sin(60deg)) calc(75% - var(--b)*cos(60deg)), calc(var(--b)*sin(60deg)) calc(25% + var(--b)*cos(60deg)), 50% var(--b));
+  background: var(--color-bg-main);
+  position: absolute;
+  z-index: -10;
+  top: 0px;
+}
+
+.dashboard-characteristics {
+  grid-column-start: 1;
+  grid-column-end: span 5;
+  display: flex;
+  gap: 2px;
+  flex-direction: row;
+}
+
+.dashboard-stat-group {
+  text-align: center;
+  width: 75px;
+  position: relative;
+  display: grid;
+  justify-items: center;
+}
+
+.charsheet .sheet-body .dashboard-stat-group input[type="number"] {
+  display: block;
+  width: 50px;
+  height: 45px;
+  font-size: 1.5em;
+  text-align: center;
+  color: var(--color-text-header);
+  -moz-appearance: textfield;
+}
+
+.charsheet .sheet-body .dashboard-stat-group input[type=number]::-webkit-inner-spin-button, 
+.charsheet .sheet-body .dashboard-stat-group input[type=number]::-webkit-outer-spin-button { 
+    -webkit-appearance: none;
+    margin: 0; 
+}
+.dashboard-stamina {
+  grid-column: 6/ span 2;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  align-items: end;
+}
+
+.dashboard-resource, .dashboard-recoveries {
+  font-size: 0.9em;
+}
+
+/*
 .core-panel {
-	grid-column-end: span 6;
-	grid-row-end: span 2;
+	grid-column-start: 1;
+	grid-column-end: 5;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	justify-content: space-between;
 }
-
+*/
+/*
 .characteristics {
 	display: grid;
 	grid-template-columns: repeat(5, 1fr);
@@ -305,26 +604,41 @@ label.sublabel {
 	grid-column-start: 1;
 	grid-column-end: -1;
 }
+*/
 .characteristic-input-group > label {
 	cursor: pointer;
 }
 .characteristic-input-group > input {
 	text-align: center;
 }
-
+/*
 .sheet-darkmode .characteristic-input-group > input {
   background-color: #3b4045;
   color: #e0e0e0;
   border-color: #444;
 }
-
-.potencies, .potencies > div {
+*/
+.potencies {
+	grid-column-start: 1;
+	grid-column-end: span 2;
 	display: flex;
-	align-items: center;
 	gap: 0.25em;
+	flex-direction: column;
 }
 
+.potency-input-group {
+  flex-direction: row;
+  display: flex;
+  justify-content: right;
+  gap: 0.5em;
+}
+
+.potencies .potency-input-group input[type="number"] {
+	width:4.5em;
+}
 .movement {
+	grid-column-start: 1;
+	grid-column-end: span 5;
 	display: grid;
 	grid-template-columns: repeat(4, 1fr);
 	gap: 0.1em;
@@ -339,44 +653,72 @@ label.sublabel {
 	text-align: center;
 }
 
+
 .stamina-panel {
-	grid-column-end: span 3;
+	grid-column-start: 6;
+	grid-column-end: span 2;
 	display: grid;
-	grid-template-columns: 2fr 2fr 2fr;
-	column-gap: 0.5em;
+	grid-template-columns: 75px 1fr;
+	column-gap: 5px;
+	padding: 3px;
 }
+/*
 .stamina-panel > .panel-title {
 	grid-column-start: 1;
 	grid-column-end: -1;
 	text-align: center;
 }
-.stamina-input-group,
-.stamina-temporary-input-group {
+*/
+.stamina-input-group {
 	grid-row-end: span 2;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
+.stamina-temp-max-group {
+	grid-column-end: -1;
+	grid-column-start: 1;
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	text-align: center;
+}
 
-.stamina-input-group input,
-.stamina-temporary-input-group input {
+.stamina-input-group input{
   width: 100%;
   box-sizing: border-box;
   min-width: 6em;
 }
 
-.recoveries-panel {
-	grid-column-end: span 2;
-	display: grid;
-	grid-template-columns: repeat(2, 1fr);
-	grid-auto-rows: min-content;
-	gap: 0.1em;
+.stamina-winded-input-group, .stamina-dying-input-group {
+	text-align: center;
 }
+.stamina-temporary-input-group input {
+	min-width:6em;
+}
+
+.charsheet .stamina-panel input[name="attr_stamina"],
+.charsheet .recoveries-panel input[name="attr_recoveries"],
+.charsheet .resource-panel input[name="attr_resource"] {
+	height: 57px;
+	font-size: 1.5em;
+	padding: 0;
+	width: 75px;
+	min-width: unset;
+}
+
+.recoveries-panel {
+	display: flex;
+	flex-direction: column;
+}
+
+/*
 .recoveries-panel > .panel-title {
 	grid-column-start: 1;
 	grid-column-end: -1;
-	justify-self: center;
+/	justify-self: center;
 }
+*/
+
 .recoveries-input-group {
 	grid-column-start: 1;
 	grid-column-end: -1;
@@ -390,102 +732,124 @@ label.sublabel {
 }
 
 .damage-mod-panel {
-	grid-column-end: span 6;
 	display: grid;
 	grid-template-columns: auto 1fr;
 	align-items: center;
 	gap: 0.25em;
+	grid-column-start: 3;
+	grid-column-end: 7;
 }
 
 .resource-description-panel {
-	grid-column-end: span 4;
-}
+	grid-column: 7/-1;
+}	
+
 .resource-description-panel > textarea {
 	width: 100%;
-	height: 6em;
+	height: 7em;
 	resize: vertical;
+	box-sizing: border-box;
 }
 
 .resource-panel {
-	grid-column-end: span 2;
 	justify-self: center;
 	display: grid;
 	grid-template-columns: 1fr;
 	grid-auto-rows: min-content;
 	justify-items: center;
 }
+
+/*
 .resource-panel > .panel-title {
 	overflow-wrap: break-word;
 	text-align: center;
 }
+*/
+
 .resource-name-input-group > input {
 	width: 100px;
 	text-align: center;
 }
 
 .surges-panel {
-	grid-column-end: span 2;
 	display: grid;
 	grid-template-columns: 1fr;
 	grid-auto-rows: min-content;
 	justify-items: center;
+	grid-column-start: 10;
+}
 }
 .surges-panel > label {
 	justify-self: start;
 }
 
-.conditions-panel {
-	grid-column-end: span 4;
+.surges-panel > span {
+	font-size: 0.7em;
 }
+
+.conditions-panel {
+	grid-column: 1 /-1;
+}
+
 .repcontainer[data-groupname="repeating_conditions"] > .repitem {
 	display: grid;
-	grid-template-columns: auto auto;
+	grid-template-columns: 3fr auto 1fr;
 	gap: 0.25em;
 	align-items: start;
 }
+
 .repcontainer[data-groupname="repeating_conditions"] > .repitem > input {
 	grid-row-end: span 2;
 }
 
+/* Biography Panel Styling */
 .biography-panel {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
 	grid-gap: 0.5em;
 }
+
 .biography-panel > .minimize-control {
 	grid-column-start: 1;
 	grid-column-end: -1;
 }
+
 .career-panel {
 	display: grid;
 }
-.career-panel > .panel-title,
+
 .career-panel > input,
 .career-panel > label {
 	text-align: center;
 }
+
 .career-panel > input {
 	font-weight: bold;
 }
+
 .career-panel > textarea {
 	height: 75px;
 	resize: vertical;
 }
+
 .complication-panel {
 	display: grid;
 }
-.complication-panel > .panel-title,
+
 .complication-panel > input,
 .complication-panel > label {
 	text-align: center;
 }
+
 .complication-panel > input {
 	font-weight: bold;
 }
+
 .complication-panel > textarea {
 	height: 75px;
 	resize: vertical;
 }
+
 .culture-panel {
 	grid-column-start: 1;
 	grid-column-end: -1;
@@ -493,19 +857,22 @@ label.sublabel {
 	grid-template-columns: repeat(3, 1fr);
 	grid-gap: 0.2em;
 }
+
 .culture-panel > .panel-title {
 	grid-column-start: 1;
 	grid-column-end: -1;
-	text-align: center;
 }
+
 .culture-panel > label {
 	text-align: center;
 }
+
 .culture-panel > textarea {
 	height: 75px;
 	resize: vertical;
 }
 
+/* Skills and Language Panel Styling */
 .skills-panel {
 	display: grid;
 	grid-template-columns: auto 1fr;
@@ -526,6 +893,7 @@ label.sublabel {
 	grid-column-end: -1;
 }
 
+/* Features Panel Styling */
 .features-panel {
 	display: grid;
 	grid-template-columns: repeat(6, 1fr);
@@ -536,56 +904,12 @@ label.sublabel {
 	grid-column-end: -1;
 }
 
-.inventory-panel {
-	display: grid;
-	grid-template-columns: repeat(6, 1fr);
-	grid-gap: 0.5em;
-}
-.inventory-panel > .minimize-control {
-	grid-column-start: 1;
-	grid-column-end: -1;
-}
-
 .class-panel {
 	grid-column-end: span 4;
 }
 .ancestry-panel {
 	grid-column-end: span 2;
 }
-.class-panel > .panel-title,
-.ancestry-panel > .panel-title {
-	text-align: center;
-}
-
-.trinket-panel {
-	grid-column-end: span 4;
-}
-.consumable-panel {
-	grid-column-end: span 2;
-}
-
-.level-treasure-panel {
-	grid-column-end: span 6;
-}
-
-.trinket-panel > .panel-title,
-.consumable-panel > .panel-title,
-.level-treasure-panel > .panel-title {
-	text-align: center;
-}
-
-.level-treasure-panel .carry-checks {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	gap: 0.5em;
-	margin-bottom: 0.5em;
-	flex-wrap: wrap;
-}
-
-.carry-checks .carry-label {
-	font-weight: bold;
-}
 
 .repcontainer[data-groupname="repeating_classfeatures"] {
 	display: grid;
@@ -618,85 +942,37 @@ label.sublabel {
   resize: vertical;
 }
 
-.repcontainer[data-groupname="repeating_trinkets"] {
-	display: grid;
-	grid-template-columns: repeat(2, 1fr);
-	grid-gap: 0.2em;
-}
-
-.repcontainer[data-groupname="repeating_leveltreasure"] {
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	grid-gap: 0.2em;
-}
-
 .repcontainer[data-groupname="repeating_classfeatures"] > .repitem,
 .repcontainer[data-groupname="repeating_ancestrytraits"] > .repitem {
 	display: grid;
 	grid-gap: 0.2em;
 }
 
-.repcontainer[data-groupname="repeating_trinkets"] > .repitem,
-.repcontainer[data-groupname="repeating_leveltreasure"] > .repitem {
-	display: grid;
-	grid-gap: 0.2em;
-}
-
-.repcontainer[data-groupname="repeating_consumables"] > .repitem {
-  display: flex;
-  align-items: center;
-  gap: 0.2em;
-  flex-wrap: wrap;
-}
-
 .repcontainer[data-groupname="repeating_classfeatures"] > .repitem > input,
 .repcontainer[data-groupname="repeating_ancestrytraits"] > .repitem > input {
 	font-weight: bold;
 }
 
-.repcontainer[data-groupname="repeating_trinkets"] > .repitem > input,
-.repcontainer[data-groupname="repeating_leveltreasure"] > .repitem > input {
-	font-weight: bold;
-}
-
-.repcontainer[data-groupname="repeating_consumables"] > .repitem > input {
-  flex: 1 1 auto;
-  font-weight: bold;
-}
-
 .repcontainer[data-groupname="repeating_classfeatures"] > .repitem > textarea,
 .repcontainer[data-groupname="repeating_ancestrytraits"] > .repitem > textarea {
 	height: 50px;
 	resize: vertical;
 }
 
-.repcontainer[data-groupname="repeating_trinkets"] > .repitem > textarea,
-.repcontainer[data-groupname="repeating_leveltreasure"] > .repitem > textarea {
-	height: 50px;
-	resize: vertical;
-}
-
-.repcontainer[data-groupname="repeating_consumables"] > .repitem > textarea {
-  flex: 1 1 100%;
-  resize: vertical;
-  height: 50px;
-}
-
 .perks-panel {
 	grid-column-end: span 4;
 }
+
 .titles-panel {
 	grid-column-end: span 2;
 }
-.perks-panel > .panel-title,
-.titles-panel > .panel-title {
-	text-align: center;
-}
+
 .repcontainer[data-groupname="repeating_perks"] {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
 	grid-gap: 0.2em;
 }
+
 .repcontainer[data-groupname="repeating_titles"] {
 	display: grid;
 	grid-gap: 0.2em;
@@ -707,10 +983,6 @@ label.sublabel {
 	grid-column-end: -1;
 }
 
-.modifiers-panel > .panel-title {
-	text-align: center;
-}
-
 .repcontainer[data-groupname="repeating_modifiers"] {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
@@ -731,50 +1003,78 @@ label.sublabel {
 .modifier-card:has(> .modifier-type > option[value="kit"]:not(:checked)) > .kit {
 	display: none;
 }
+
 .modifier-type {
 	grid-column-end: span 2;
 }
 
+/*
 .sheet-darkmode .modifier-type {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
 }
-
+*/
 .modifier-card > .input-group {
 	display: grid;
 }
+
 .modifier-card > .input-group > input[type] {
 	width: 100%;
 }
+
 .modifier-card > .input-group > label {
 	text-align: center;
 }
+
 .kit-weapon-input-group,
 .kit-armor-input-group {
 	grid-column-end: span 3;
 }
+
 .modifier-card > .kit-damage-label {
 	grid-column-end: span 3;
 	text-align: center;
 }
+
 .modifier-card:has(> .modifier-type > option[value="kit"]:checked) > .modifier-description {
 	grid-column-end: span 3;
 	grid-row-end: span 4;
 	height: 100%;
 }
+
 .modifier-card:has(> .modifier-type > option[value="kit"]:not(:checked)) > .modifier-description {
 	grid-column-start: 1;
 	grid-column-end: -1;
 	height: 75px;
 }
+/*
+.feature-button {
+  width: 20px;
+  height: 20px;
+  padding: 0px;
+  margin: 0px;
+  background-color: var(--color-button-bg);
+  border: 1px solid var(--color-button-border);
+  border-radius: var(--border-ra;
+}
+
+.sheet-darkmode .feature-button {
+  background-color: #3b4045 !important;
+  color: #e0e0e0 !important;
+  border: 1px solid #e0e0e0;
+}
+*/
 
 /*Abilities Panel*/
 
 .abilities-panel {
 	display: grid;
 	grid-gap: 0.5em;
+	padding-top: 5px;
 }
 
+
+/* -- Ability Tab Buttons */
 .abilities-buttons {
 	display: flex;
 	border-bottom: 2px solid;
@@ -791,7 +1091,7 @@ label.sublabel {
 }
 
 .abilities-buttons button[type="action"]:hover {
-  background-color: rgba(255, 215, 0, 0.6);
+  background-color: var(--color-button-hover-bg)/*rgba(255, 215, 0, 0.6)*/;
 }
 
 .charsheet .sheet-action,
@@ -807,11 +1107,11 @@ label.sublabel {
 .charsheet .sheet-tabstoggle[value="triggered"] ~ abilities-buttons .sheet-button-triggered
 .charsheet .sheet-tabstoggle[value="noaction"] ~ abilities-buttons .sheet-button-noaction
 .charsheet .sheet-tabstoggle[value="move"] ~ abilities-buttons .sheet-button-move {
-  background-color: #fdfdfd;
-  border-radius: 8px 8px 0 0;
-  border: 1px solid #ccc;
-  border-bottom: none;
-  box-shadow: 0 -2px 0 #444 inset;
+	background-color: var(--color-button-bg);
+	border-radius: 8px 8px 0 0;
+	border: var(--color-button-border) /*1px solid #ccc*/;
+	border-bottom: none;
+	box-shadow: 0 -2px 0 #444 inset;
 }
 
 .charsheet .sheet-tabstoggle[value="action"] ~ div.sheet-action,
@@ -831,21 +1131,223 @@ label.sublabel {
 .default-maneuvers,
 .default-moves,
 .default-noaction,
-.default-mainaction {
+.default-mainaction,
+.standard-abilities {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
 	grid-gap: 0.5em;
 }
 
-/*Read-only Ability Card Styling*/
+.standard-abilities-item {
+	position: relative;
+}
+/* -- Ability Card Styling */
 
+#ability-edit::before {
+	content: 'p';
+	font-family: "Pictos";
+	font-size: 1.5em;
+	cursor: pointer;
+}
+
+#ability-edit {
+	top: 0px;
+	right: 5px;
+	position: absolute;
+	appearance: none;
+	background-color: transparent;
+	border-color: transparent;
+	color: var(--color-text-accent);
+}
+
+#ability-edit:hover {
+  color: var(--color-text-header);
+}
+
+.charsheet input.ability-edit:not(:checked) ~ div.card-edit, .charsheet input.ability-edit:checked ~ div.card-display {
+    display: none;
+}
+
+.ability-card {
+	display: grid;
+	grid-template-columns: 30px repeat(3, 1fr) auto 30px;
+	background-color: var(--color-bg-section);
+	border: var(--border-section);
+	border-radius: var(--border-radius);
+	padding: var(--sheet-padding);
+}
+
+.ability-share-button {
+	width: 20px;
+	height: 20px;
+	padding: 0px;
+	margin: 0px;
+}
+
+.ability-name {
+	grid-column-end: span 2;
+	grid-column-start: 2;
+	font-weight: bold;
+}
+
+.ability-name::placeholder {
+	opacity: 0.7;
+}
+
+.ability-cost-input-group, .ability-cost {
+	grid-column-start: 5;
+	justify-self: end;
+}
+
+.ability-cost-input-group > input {
+	font-weight: bold;
+}
+
+.ability-cost input:not([value]) ~ span,
+.ability-cost input[value="0"] ~ span {
+	display: none;
+}
+
+.ability-details {
+	grid-column: 1/-1;
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+}
+
+.ability-description {
+	grid-column-start: 1;
+	grid-column-end: -1;
+	font-size: 0.8em;
+	font-style: italic;
+}
+
+.ability-description::placeholder {
+	opacity: 0.7;
+}
+
+.ability-keywords {
+	/*grid-column-end: span 4;*/
+	font-size: 0.8em;
+	font-weight: bold;
+}
+
+.ability-keywords::placeholder {
+	opacity: 0.7;
+}
+
+.ability-type {
+	/*grid-column-end: span 2;*/
+	text-align: end;
+	font-weight: bold;
+}
+/*
+.sheet-darkmode .ability-type {
+  background-color: #3b4045 !important;
+  color: #e0e0e0 !important;
+}
+*/
+
+.ability-type:has(> option[value*="triggered"]:checked) ~ .triggered-hide,
+.ability-type:not(:has(> option[value*="triggered"]:checked)) ~ .triggered-show {
+	display: none;
+}
+
+.ability-distance {
+	font-size: 0.9em;
+}
+
+.ability-distance::placeholder {
+	opacity: 0.7;
+}
+
+.ability-target {
+/*	grid-column-end: span 3; */
+	font-size: 0.8em;
+	text-align: end;
+}
+
+.ability-target::placeholder {
+	opacity: 0.7;
+}
+
+.card-edit .ability-details:has([name="attr_has_power_roll"]:not(:checked)) > .power-roll > .power-roll-mods > :not(input[type="checkbox"]):not(label),
+.card-edit .ability-details:has([name="attr_has_power_roll"]:not(:checked)) > .power-roll > :not(.power-roll-mods) {
+	display: none;
+}
+
+.card-display .ability-details input[name*="attr_has"]:not([value="on"]) + div {
+  display: none;
+}
+
+.ability-card > .power-roll-hide,
+.ability-card > .power-roll {
+	grid-column-start: 1;
+	grid-column-end: -1;
+}
+
+.power-roll {
+	grid-column: 1 / -1;
+	display: grid;
+	grid-template-columns: auto 1fr;
+	column-gap: 0.5em;
+	align-items: center;
+}
+
+.power-roll-mods {
+	grid-column-start: 1;
+	grid-column-end: -1;
+}
+.power-roll-characteristic {
+	font-weight: bold;
+}
+
+/*
+.sheet-darkmode select.power-roll-characteristic {
+	background-color: #3b4045;
+}
+*/
+
+.power-roll-characteristic::placeholder {
+	opacity: 0.7;
+}
+
+.power-roll-tier-effect {
+	font-size: 0.8em;
+}
+
+.power-roll label.sublabel {
+	background-color: var(--color-bg-subsection);
+	border: var(--border-main);
+	border-radius: var(--border-radius);
+	padding: 1px;
+	text-align: center;
+	margin: 4PX 0px 0px 0px;
+	line-height: normal;
+} 
+
+.ability-details > .ability-trigger,
+.ability-details > .ability-effect {
+	grid-column-start: 1;
+	grid-column-end: -1;
+	height: auto;
+}
+
+
+
+/*
 .ability-edit-label {
   float: right;
   margin-right: 20px;
   font-family: 'Cinzel', serif;
   font-style: bold;
 }
+*/
 
+
+/* -- Read-only Ability Card Styling*/
+
+
+/*
 .read-ability-name:empty::before {
   content: attr(data-i18n-placeholder);
   font-style: bold;
@@ -912,7 +1414,8 @@ label.sublabel {
 .read-ability-card .ability-effect, .ability-trigger {
 	height: auto;
 }
-
+*/
+/*
 label.ability-edit {
 	font-family: "Pictos";
 	font-size: 1.5em;
@@ -927,13 +1430,6 @@ label.ability-edit {
 	color: #e0e0e0;
 }
 
-.charsheet input.ability-edit:not(:checked) ~ div.ability-card, .charsheet input.ability-edit:checked ~ div.read-ability-card {
-    display: none;
-}
-
-.abilities-panel {
-	padding-top: 5px;
-}
 
 .sheet-action > .repcontainer[data-groupname="repeating_abilities"] > .repitem,
 .sheet-maneuver > .repcontainer[data-groupname="repeating_maneuvers"] > .repitem,
@@ -1022,31 +1518,11 @@ label.ability-edit {
 	display: none;
 }
 
+
 .ability-trigger {
 	grid-column-end: span 6;
 }
 
-.feature-button {
-  width: 20px;
-  height: 20px;
-  padding: 0px;
-  margin: 0px;
-  background-color: #ddd;
-  border: 1px solid #aaa;
-  border-radius: 5px;
-}
-
-.sheet-darkmode .feature-button {
-  background-color: #3b4045 !important;
-  color: #e0e0e0 !important;
-  border: 1px solid #e0e0e0;
-}
-
-input.ability-edit {
-	right: 5px;
-	position: absolute;
-}
-
 .free-strikes > div,
 .default-maneuvers > div,
 .default-moves > div,
@@ -1059,121 +1535,90 @@ input.ability-edit {
 	grid-column-start: 1;
 	grid-column-end: -1;
 }
+*/
 /*End Read-only Ability Card Styling*/
 
-.ability-card {
+
+
+/* Inventory Panel Styling */
+.inventory-panel {
 	display: grid;
-	grid-template-columns: repeat(4, 1fr) repeat(2, auto);
-}
-.ability-name {
-	grid-column-end: span 4;
-	font-weight: bold;
+	grid-template-columns: repeat(3, 1fr);
+	grid-gap: 0.5em;
 }
 
-.ability-name::placeholder {
-	opacity: 0.7;
-}
-
-.ability-cost-input-group {
-	justify-self: end;
-}
-.ability-cost-input-group > input {
-	font-weight: bold;
-}
-.ability-description {
-	grid-column-start: 1;
-	grid-column-end: -1;
-	font-size: 0.8em;
-	font-style: italic;
-}
-
-.ability-description::placeholder {
-	opacity: 0.7;
-}
-
-.ability-keywords {
-	grid-column-end: span 4;
-	font-size: 0.8em;
-	font-weight: bold;
-}
-
-.ability-keywords::placeholder {
-	opacity: 0.7;
-}
-
-.ability-type {
-	grid-column-end: span 2;
-	text-align: end;
-	font-weight: bold;
-}
-
-.sheet-darkmode .ability-type {
-  background-color: #3b4045 !important;
-  color: #e0e0e0 !important;
-}
-
-.ability-type:has(> option[value*="triggered"]:checked) ~ .triggered-hide,
-.ability-type:not(:has(> option[value*="triggered"]:checked)) ~ .triggered-show {
-	display: none;
-}
-.ability-distance {
-	grid-column-end: span 3;
-}
-
-.ability-distance::placeholder {
-	opacity: 0.7;
-}
-
-.ability-target {
-	grid-column-end: span 3;
-	font-size: 0.8em;
-	text-align: end;
-}
-
-.ability-target::placeholder {
-	opacity: 0.7;
-}
-
-.ability-card:has([name="attr_has_power_roll"]:not(:checked)) > .power-roll > .power-roll-mods > :not(input[type="checkbox"]):not(label),
-.ability-card:has([name="attr_has_power_roll"]:not(:checked)) > .power-roll > :not(.power-roll-mods) {
-	display: none;
-}
-.ability-card > .power-roll-hide,
-.ability-card > .power-roll {
-	grid-column-start: 1;
-	grid-column-end: -1;
-}
-.power-roll {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	align-items: center;
-}
-.power-roll-mods {
-	grid-column-start: 1;
-	grid-column-end: -1;
-}
-.power-roll-characteristic {
-	font-weight: bold;
-}
-
-.sheet-darkmode select.power-roll-characteristic {
-	background-color: #3b4045;
-}
-
-.power-roll-characteristic::placeholder {
-	opacity: 0.7;
-}
-
-.power-roll-tier-effect {
-	font-size: 0.8em;
-}
-.ability-card > .ability-trigger,
-.ability-card > .ability-effect {
-	grid-column-start: 1;
-	grid-column-end: -1;
+.inventory-panel textarea {
 	height: 50px;
+	width: 100%;
 }
 
+.inventory-panel .name-input {
+	font-weight: bold;
+}
+
+.inventory-panel > .minimize-control {
+	grid-column-start: 1;
+	grid-column-end: -1;
+}
+
+input.name-input {
+	width: 100%;
+}
+
+.trinket-panel {
+	grid-column-end: span 2;
+}
+
+.consumable-panel input-bg {
+	width: 100%
+}
+
+.level-treasure-panel {
+	grid-column: 1 / -1;
+}
+
+.level-treasure-panel .carry-checks {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	gap: 0.5em;
+	margin-bottom: 0.5em;
+	flex-wrap: wrap;
+}
+
+.carry-checks .carry-label {
+	font-weight: bold;
+}
+
+.repcontainer[data-groupname="repeating_trinkets"] {
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	grid-gap: var(--sheet-padding);
+}
+
+.repcontainer[data-groupname="repeating_consumables"] {
+	display: flex;
+	grid-gap: var(--sheet-padding);
+	flex-direction: column;
+}
+
+.repcontainer[data-groupname="repeating_leveltreasure"] {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	grid-gap: var(--sheet-padding);
+}
+
+
+.repcontainer[data-groupname="repeating_trinkets"] > .repitem,
+.repcontainer[data-groupname="repeating_leveltreasure"] > .repitem,
+.repcontainer[data-groupname="repeating_consumables"] > .repitem {
+	display: flex;
+	grid-gap: 0.2em;
+	flex-direction: column;
+}
+
+
+/* Projects Panel Styling */
 .repcontainer[data-groupname="repeating_projects"] > .repitem {
 	display: grid;
 	grid-template-columns: 5fr 4fr 3fr 3fr;
@@ -1186,27 +1631,30 @@ input.ability-edit {
 	flex-grow: 1;
 }
 
-.import-panel > textarea {
-	height: 50px;
-}
 
-.sheet-rolltemplate-powerroll,
-.sheet-rolltemplate-ability,
-.sheet-rolltemplate-abilitypowerroll {
-  background-color: #f5f5f5; /* eggshell */
-  font-family: 'Georgia', serif;
+
+/* Roll Template Styling */
+
+.sheet-rolltemplate-powerroll .sheet-roll-container,
+.sheet-rolltemplate-ability .sheet-roll-container,
+.sheet-rolltemplate-abilitypowerroll .sheet-roll-container {
+  background-color: var(--color-bg-main);
+  font-family: var(--font-family-body);
   padding: 16px;
   border-radius: 10px;
-  border: 1px solid #ccc;
+  border: var(--border-main);
   max-width: 264px;
   box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+  color: var(--color-text-body);
 }
-.sheet-rolltemplate-powerroll.sheet-rolltemplate-darkmode,
+
+/*.sheet-rolltemplate-powerroll.sheet-rolltemplate-darkmode,
 .sheet-rolltemplate-ability.sheet-rolltemplate-darkmode,
 .sheet-rolltemplate-abilitypowerroll.sheet-rolltemplate-darkmode {
 	background-color: #333333;
 	color: #ddd;
 }
+*/
 
 .sheet-rolltemplate-powerroll .sheet-header,
 .sheet-rolltemplate-ability .sheet-header,
@@ -1217,24 +1665,25 @@ input.ability-edit {
 	font-weight: bold;
 }
 
-.sheet-rolltemplate-powerroll,
-.sheet-rolltemplate-abilitypowerroll {
+.sheet-rolltemplate-powerroll .sheet-roll-container,
+.sheet-rolltemplate-abilitypowerroll .sheet-roll-container {
 	display: grid;
 	grid-template-columns: repeat(2, 1fr);
 }
 .sheet-rolltemplate-powerroll .sheet-header,
 .sheet-rolltemplate-powerroll .sheet-header {
 	margin-bottom: 3px;
-	border-bottom: 1px solid #bbb;
+	border-bottom: var(--border-main);
 	padding-bottom: 3px;
-        line-height: 1.4;
+    line-height: 1.4;
 }
 
 .sheet-rolltemplate-ability .sheet-header {
 	margin-bottom: 3px;
 	padding-bottom: 3px;
-        line-height: 1.4;
+    line-height: 1.4;
 }
+
 .sheet-rolltemplate-powerroll label,
 .sheet-rolltemplate-abilitypowerroll label,
 .sheet-rolltemplate-powerroll .sheet-powerroll-edge-bane {
@@ -1247,16 +1696,19 @@ input.ability-edit {
 	font-size: 1em;
 	font-weight: bold;
 }
+
 .sheet-rolltemplate-powerroll .sheet-powerroll-bonus-penalty {
 	grid-column-start: -2;
 }
+
 .sheet-rolltemplate-powerroll .sheet-powerroll-crit,
 .sheet-rolltemplate-powerroll .sheet-powerroll-total,
 .sheet-rolltemplate-powerroll .sheet-powerroll-tier {
 	margin-top: 3px;
-	border-top: 1px solid #bbb;
+	border-top: var(--border-main);
 	padding-top: 3px;
 }
+
 .sheet-rolltemplate-powerroll .sheet-powerroll-crit {
 	grid-column-start: 1;
 	grid-column-end: -1;
@@ -1264,15 +1716,18 @@ input.ability-edit {
 	color: red;
 	text-transform: uppercase;
 }
+
 .sheet-rolltemplate-powerroll .sheet-powerroll-total {
 	grid-column-start: 1;
 }
 
-.sheet-rolltemplate-ability .sheet-description {
+.sheet-rolltemplate-ability .sheet-description, 
+.sheet-rolltemplate-monsterability .sheet-description {
+	
   font-size: 0.80em;
   font-style: italic;
   margin-bottom: 10px;
-  border-bottom: 2px solid #aaa;
+  border-bottom: var(--border-section);
   padding-bottom: 6px;
 }
 
@@ -1310,7 +1765,7 @@ input.ability-edit {
   align-items: center;
   padding: 6px 0;
   margin-bottom: 10px;
-  border-bottom: 1px solid #aaa;
+  border-bottom: var(--border-main);
 }
 
 .sheet-rolltemplate-ability .sheet-roll-label {
@@ -1343,10 +1798,10 @@ input.ability-edit {
 
 .sheet-rolltemplate-ability .sheet-range {
 	flex-shrink: 0;
-  background-color: #e0dbce;
-  padding: 2px 6px;
-  border-radius: 4px;
-  font-weight: bold;
+	background-color: #e0dbce;
+	padding: 2px 6px;
+	border-radius: 4px;
+	font-weight: bold;
 }
 .sheet-rolltemplate-ability.sheet-rolltemplate-darkmode .sheet-range {
   background-color: #5f5d58;
@@ -1399,13 +1854,13 @@ input.ability-edit {
 
 .npc-panel {
 	display: grid;
-	background: #fff;
-	padding: 10px;
-	border-bottom: 2px solid #aaa;
-	border-left: 1px solid #aaa;
-	border-right: 1px solid #aaa;
+	background: var(--color-bg-section);
+	padding: var(--sheet-padding);
+	border-bottom: var(--border-section);
+	border-left: var(--border-main);
+	border-right: var(--border-main);
 }
-
+/*
 .sheet-darkmode .npc-panel {
   background: #3b4045 !important;
   color: #e0e0e0 !important;
@@ -1413,18 +1868,18 @@ input.ability-edit {
 	border-left: 1px solid #e0e0e0 !important;
 	border-right: 1px solid #e0e0e0 !important;
 }
-
+*/
 .npc-header-panel {
 	grid-template-columns: 1fr auto;
 	align-items: baseline;
 	border-radius: 20px 20px 0px 0px;
-	border-top: 1px solid #aaa;
+	border-top: var(--border-main);
 }
-
+/*
 sheet-darkmode .npc-header-panel {
 	border-top: 1px solid #444;
 }
-
+*/
 .npc-header-panel div:nth-child(even) {
 	justify-self: right;
 }
@@ -1487,7 +1942,7 @@ sheet-darkmode .npc-header-panel {
   gap: 0.5em;
   align-items: start;
 }
-
+/*
 .sheet-darkmode .npc-conditions {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
@@ -1499,7 +1954,7 @@ sheet-darkmode .npc-header-panel {
   color: #e0e0e0 !important;
   border-color: #444 !important;
 }
-
+*/ 
 /* NPC Ability Card Styling */
 
 .npc-abilities-panel {
@@ -1513,23 +1968,25 @@ sheet-darkmode .npc-header-panel {
 }
 
 .npc-abilities-panel > .repcontainer[data-groupname="repeating_npcabilities"] > .repitem {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	background: #fff;
-	padding: 5px;
+	border: var(--border-main);
+	border-radius: var(--border-radius);
+	background-color: var(--color-bg-section);
+	padding: var(--sheet-padding);
 }
-
+/*
 .sheet-darkmode .npc-abilities-panel > .repcontainer[data-groupname="repeating_npcabilities"] > .repitem {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
   border-color: #444 !important;
 }
-
+*/
+/*
 .npc-ability-card-display, .npc-ability-card-edit {
 	display: grid;
 	grid-template-columns: 30px repeat(4, 1fr) 30px;
 }
-
+*/
+/*
 #npc-ability-edit-toggle {
 	right: 5px;
 	position: absolute;
@@ -1560,6 +2017,7 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 	grid-column-start: 2;
 	font-weight: bold;
 }
+*/
 
 .npc-ability-subtype-selector, .npc-ability-subtype {
   grid-column-start: 4;
@@ -1568,7 +2026,7 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
   font-weight: bold;
   
 }
-
+/*
 .sheet-darkmode .npc-ability-subtype-selector, .sheet-darkmode .npc-ability-subtype {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
@@ -1580,12 +2038,18 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
   color: #e0e0e0 !important;
   border: 1px solid #e0e0e0;
 }
-
+*/
 .npc-ability-card {
 	display: grid;
 	grid-template-columns: 30px repeat(4, 1fr) 30px;
 }
 
+.npc-ability-name {
+	grid-column-start: 2;
+	grid-column-end: span 2;
+	font-weight: bold;
+}
+
 .npc-ability-solo-monster {
 
 	display: grid;
@@ -1602,11 +2066,11 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 .npc-ability-subtype-selector:not(:has(> option[value*="ability"]:checked)) ~ .npc-ability-details {
 	display: none;
 }
-
+/*
 .npc-ability-card-edit textarea {
 	height: 50px;
 }
-
+*/
 .npc-ability-type:has(> option[value*="triggered"]:checked) ~ .triggered-hide,
 .npc-ability-type:not(:has(> option[value*="triggered"]:checked)) ~ .triggered-show {
 	display: none;
@@ -1621,11 +2085,13 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 }
 
 .npc-power-roll label.sublabel {
-	border: 1px solid black;
-	border-radius: 5px;
+	background-color: var(--color-bg-subsection);
+	border: var(--border-main);
+	border-radius: var(--border-radius);
 	padding: 1px;
 	text-align: center;
 	margin: 4PX 0px 0px 0px;
+	line-height: normal;
 }
 
 .npc-power-roll-mods {
@@ -1650,11 +2116,11 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 	display: none;
 }
 
-.npc-ability-card-display input[name*="attr_has"]:not([value="on"]) + div {
+.npc-ability-card input[name*="attr_has"]:not([value="on"]) + div {
 	display: none;
 }
 
-.npc-ability-card-display .npc-ability-effect, .npc-ability-card-display .npc-ability-trigger {
+.npc-ability-card .npc-ability-effect, .npc-ability-card .npc-ability-trigger {
 	height: auto;
 }
 
@@ -1667,12 +2133,12 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 .npc-ability-type, .npc-ability-target {
 	text-align: end;
 }
-
+/*
 .sheet-darkmode .npc-ability-type {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
 }
-
+*/
 .npc-ability-distance {
 	grid-column-start: 1;
 }
@@ -1682,6 +2148,7 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
 	display: none;
 }
 
+/*
 .npc-ability-button {
   width: 20px;
   height: 20px;
@@ -1690,14 +2157,15 @@ input.npc-ability-edit-toggle:checked ~ div.npc-ability-card-display {
   background-color: #ddd;
   border: 1px solid #aaa;
   border-radius: 5px;
-}
-
+}*/
+/*
 .sheet-darkmode .npc-ability-button {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
   border: 1px solid #e0e0e0;
 }
-
+*/
+/*
 input.npc-ability-edit {
 	right: 5px;
 	position: absolute;
@@ -1707,13 +2175,13 @@ input.npc-ability-edit {
 	background-color: #ccc;
 
 }
-
-.npc-ability-card-display .npc-power-roll .npc-power-roll-mods button[type="roll"]::before {
+*/
+.npc-ability-card .npc-power-roll .npc-power-roll-mods button[type="roll"]::before {
   content: "k";
   font-family: "dicefontd10";
 }
 
-.npc-ability-card-display .npc-power-roll .npc-power-roll-mods button[type="roll"] {
+.npc-ability-card .npc-power-roll .npc-power-roll-mods button[type="roll"] {
   margin-left: 0px;
 }
 
@@ -1736,39 +2204,39 @@ input.npc-ability-edit {
 }
 
 /* Switches between Character and NPC Sheets */
-.charsheet .npc-checkbox:not(:checked) ~ .npc-sheet-body,
-.charsheet .npc-checkbox:checked ~ .sheet-body
+.charsheet input.npc-checkbox:not([value="on"]) ~ .npc-sheet-body,
+.charsheet input.npc-checkbox[value="on"] ~ .sheet-body
 {
   display: none;
 }
 
 label[for="npc-checkbox"] {
-  color: black;
+  color: var(--color-text-body);
   font-weight: bold;
   font-size: 1em;
   padding-left: 0.5em;
 }
-
+/*
 .sheet-darkmode label[for="npc-checkbox"] {
   color: #e0e0e0;
 }
-
+*/
 
 /* NPC edit styling */
 label.npc-edit-icon {
 	font-family: "Pictos";
-	font-size: 1.5em;
+	font-size: 20px;
 	position: absolute;
-	left: calc(100% - 45px);
-	top: 125px;
-	color: #aaa;
+	left: calc(100% - 60px);
+	top: 140px;
+	color: var(--color-text-accent);
 	cursor: pointer;
 }
-
+/*
 .sheet-darkmode label.npc-edit-icon {
 	color: #e0e0e0;
 }
-
+*/
 input.npc-edit-toggle {
 	display: none;
 }
@@ -1810,30 +2278,35 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
 
 
 
-/* Dark Mode */
+/* Dark Mode 
 .sheet-darkmode .characterviewer .charsheet label {
 	color: #333;
 }
+*/
 
 /* Monster Ability Roll Template */
-.sheet-rolltemplate-monsterability {
-  background-color: #f5f5f5; /* eggshell */
-  font-family: 'Georgia', serif;
+
+.sheet-rolltemplate-monsterability  .sheet-roll-container {
+  background-color: var(--color-bg-main); 
+  font-family: var(--font-family-body);
   padding: 16px;
   border-radius: 10px;
-  border: 1px solid #ccc;
+  border: var(--border-main);
   max-width: 264px;
   box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+  color: var(--color-text-body);
 }
-
+/*
 .sheet-rolltemplate-monsterability.sheet-rolltemplate-darkmode {
 	background-color: #333333;
 	color: #ddd;
 }
-
+*/
 .sheet-rolltemplate-monsterability .sheet-header {
   font-size: 1.2em;
   font-weight: bold;
+  color: var(--color-text-header);
+  font-family: var(--font-family-header);
 }
 
 .sheet-rolltemplate-monsterability .sheet-character-name,
@@ -1846,7 +2319,7 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
   font-size: 0.9em;
   font-style: italic;
   margin-bottom: 10px;
-  border-bottom: 2px solid #aaa;
+  border-bottom: var(--border-section);
   padding-bottom: 6px;
   font-weight: bold;
 }
@@ -1876,17 +2349,17 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
 
 .sheet-rolltemplate-monsterability .sheet-effect-block {
   margin-top: 14px;
-  padding: 10px;
-  background-color: #f0f0f0;
-  border: 1px solid #aaa;
-  border-radius: 6px;
+  padding: var(--sheet-padding);
+  background-color: var(--color-bg-section);
+  border: var(--border-main);
+  border-radius: var(--border-radius);
 }
-
+/*
 .sheet-rolltemplate-monsterability.sheet-rolltemplate-darkmode .sheet-effect-block {
 	background-color: #0f0f0f;
 	color: #aaa
 }
-
+*/
 .sheet-rolltemplate-monsterability .sheet-effect-text {
   font-size: .9em;
 }
@@ -1897,7 +2370,7 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
   align-items: center;
   padding: 6px 0;
   margin-bottom: 10px;
-  border-bottom: 1px solid #aaa;
+  border-bottom: var(--border-main);
 }
 
 .sheet-rolltemplate-monsterability .sheet-roll-label {
@@ -1920,7 +2393,7 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
 }
 
 .sheet-rolltemplate-monsterability .sheet-range {
-	background-color: #e0dbce;
+	background-color: var(--color-bg-section);
 	padding: 2px 6px;
 	border-radius: 4px;
 	font-weight: bold;
@@ -1928,16 +2401,17 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
 	height: 20px;
 	text-align: center;
 }
+/*
 .sheet-rolltemplate-monsterability.sheet-rolltemplate-darkmode .sheet-range {
   background-color: #5f5d58;
 }
-
+*/
 .sheet-rolltemplate-monsterability .sheet-damage {
   font-size: 0.95em;
 }
 
 /* Dark Mode for Whisper Query */
-
+/*
 .sheet-darkmode select[name="attr_wtype"] {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
@@ -1948,4 +2422,24 @@ input.npc-edit-toggle:not(:checked) ~ div.npc-edit {
   background-color: #3b4045 !important;
   color: #e0e0e0 !important;
   border-color: #e0e0e0 !important;
-}
\ No newline at end of file
+}
+*/
+.charsheet label.sheet-options-checkbox-label {
+	font-family: "Pictos";
+	font-size: 25px;
+	position: absolute;
+	color: var(--color-text-accent);
+	cursor: pointer;
+	right: 30px;
+	top: 100px;
+	font-weight: normal;
+}
+
+input.sheet-options-checkbox {
+	display: none;
+}
+
+#sheet-options-checkbox:not(:checked) + div.sheet-panel {
+    display: none;
+} 
+
diff --git a/Draw Steel/draw-steel.html b/Draw Steel/draw-steel.html
index 3a06e8f25f..85b04b2107 100644
--- a/Draw Steel/draw-steel.html	
+++ b/Draw Steel/draw-steel.html	
@@ -7,178 +7,219 @@
 			style="height: 60px"
 		/>
 	</h1>
+	<label class="sheet-options-checkbox-label" for="sheet-options-checkbox">y</label>
+	<input id="sheet-options-checkbox" class="sheet-options-checkbox" type="checkbox" />
+	<div class="sheet-panel sheet-options-toggle">
+	<!-- Options Panel for choosing Player/NPC sheet and imports -->
+		<div class="sheet-panel-box">
+			<input id="npc-checkbox" name="attr_is_npc" class="npc-checkbox" type="checkbox" />
+			<label for="npc-checkbox" data-i18n="npc-toggle"></label>
+			<div>
+				<span data-i18n="whisper-gm"></span>
+				<select name="attr_wtype">
+					<option value="" data-i18n="never-whisper-roll" selected></option>
+					<option value="?{Whisper?|Public Roll,|Whisper Roll,/w gm }" data-i18n="query-whisper-roll"></option>
+					<option value="/w gm " data-i18n="always-whisper-roll"></option>
+				</select>	
+			</div>
+		</div>
+		
+		<div class="sheet-panel-box">
+			<h5 data-i18n="import"></h5>
+			<p>Paste the contents of the Forge Steel data export (*.ds-hero file) into the text box below, then click "Import".</p>
+			<p class="text-warning">This will overwrite attributes on this sheet. This cannot be undone.</p>
+			<textarea name="attr_forgesteel_json"></textarea>
+			<button type="action" name="act_import">Import</button>
+		</div>
+	</div>
+	
 	<!-- Header End -->
 </div>
-<input id="npc-checkbox" name="attr_is_npc" class="npc-checkbox" type="checkbox" />
-<label for="npc-checkbox" data-i18n="npc-toggle"></label>
+<input type="hidden" class="npc-checkbox" name="attr_is_npc" />
 <!-- Character Sheet Start -->
 <div class="sheet-body">
-	<div class="border">
-		<div class="header-panel">
-			<div class="profile-panel border">
-				<div class="name-input-group panel-dark">
-					<input type="text" name="attr_character_name" />
-					<label class="sublabel panel-dark" data-i18n="character-name"></label>
-				</div>
-				<div class="ancestry-input-group panel-dark">
-					<input type="text" class="input-md" name="attr_ancestry" />
-					<label class="sublabel panel-dark" data-i18n="ancestry"></label>
-				</div>
-				<div class="class-input-group panel-dark">
-					<input type="text" class="input-md" name="attr_class" />
-					<label class="sublabel panel-dark" data-i18n="class"></label>
-				</div>
-				<div class="career-input-group panel-dark">
-					<input type="text" class="input-md" name="attr_career" />
-					<label class="sublabel panel-dark" data-i18n="career"></label>
-				</div>
-				<div class="subclass-input-group panel-dark">
-					<input type="text" class="input-md" name="attr_subclass" />
-					<label class="sublabel panel-dark" data-i18n="subclass"></label>
+	<!-- Header Panel --> 
+	<div class="sheet-panel header-panel">
+		<div class="sheet-panel-box profile-panel">
+			<div class="name-input-group panel-dark">
+				<input type="text" name="attr_character_name" />
+				<label class="sublabel panel-dark" data-i18n="character-name"></label>
+			</div>
+			<div class="ancestry-input-group panel-dark">
+				<input type="text" class="input-md" name="attr_ancestry" />
+				<label class="sublabel panel-dark" data-i18n="ancestry"></label>
+			</div>
+			<div class="class-input-group panel-dark">
+				<input type="text" class="input-md" name="attr_class" />
+				<label class="sublabel panel-dark" data-i18n="class"></label>
+			</div>
+			<div class="career-input-group panel-dark">
+				<input type="text" class="input-md" name="attr_career" />
+				<label class="sublabel panel-dark" data-i18n="career"></label>
+			</div>
+			<div class="subclass-input-group panel-dark">
+				<input type="text" class="input-md" name="attr_subclass" />
+				<label class="sublabel panel-dark" data-i18n="subclass"></label>
+			</div>
+		</div>
+		<div class="sheet-panel-box progress-panel">
+			<div class="victories-input-group">
+				<h5 data-i18n="victories"></h5>
+				<span name="attr_victories" class="victory-count"></span>
+				<div class="progressbox-group">
+					<input id="victories-checkbox-1" type="checkbox" value="1" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-1"></label>
+					<input id="victories-checkbox-2" type="checkbox" value="2" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-2"></label>
+					<input id="victories-checkbox-3" type="checkbox" value="3" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-3"></label>
+					<input id="victories-checkbox-4" type="checkbox" value="4" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-4"></label>
+					<input id="victories-checkbox-5" type="checkbox" value="5" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-5"></label>
+					<input id="victories-checkbox-6" type="checkbox" value="6" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-6"></label>
+					<input id="victories-checkbox-7" type="checkbox" value="7" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-7"></label>
+					<input id="victories-checkbox-8" type="checkbox" value="8" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-8"></label>
+					<input id="victories-checkbox-9" type="checkbox" value="9" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-9"></label>
+					<input id="victories-checkbox-10" type="checkbox" value="10" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-10"></label>
+					<input id="victories-checkbox-11" type="checkbox" value="11" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-11"></label>
+					<input id="victories-checkbox-12" type="checkbox" value="12" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-12"></label>
+					<input id="victories-checkbox-13" type="checkbox" value="13" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-13"></label>
+					<input id="victories-checkbox-14" type="checkbox" value="14" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-14"></label>
+					<input id="victories-checkbox-15" type="checkbox" value="15" name="attr_victories" />
+					<label class="progressbox" for="victories-checkbox-15"></label>
 				</div>
 			</div>
-			<div class="progress-panel border">
-				<div class="victories-input-group">
-					<h5 data-i18n="victories"></h5>
-					<span name="attr_victories" class="victory-count"></span>
-					<div class="progressbox-group">
-						<input id="victories-checkbox-1" type="checkbox" value="1" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-1"></label>
-						<input id="victories-checkbox-2" type="checkbox" value="2" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-2"></label>
-						<input id="victories-checkbox-3" type="checkbox" value="3" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-3"></label>
-						<input id="victories-checkbox-4" type="checkbox" value="4" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-4"></label>
-						<input id="victories-checkbox-5" type="checkbox" value="5" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-5"></label>
-						<input id="victories-checkbox-6" type="checkbox" value="6" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-6"></label>
-						<input id="victories-checkbox-7" type="checkbox" value="7" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-7"></label>
-						<input id="victories-checkbox-8" type="checkbox" value="8" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-8"></label>
-						<input id="victories-checkbox-9" type="checkbox" value="9" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-9"></label>
-						<input id="victories-checkbox-10" type="checkbox" value="10" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-10"></label>
-						<input id="victories-checkbox-11" type="checkbox" value="11" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-11"></label>
-						<input id="victories-checkbox-12" type="checkbox" value="12" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-12"></label>
-						<input id="victories-checkbox-13" type="checkbox" value="13" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-13"></label>
-						<input id="victories-checkbox-14" type="checkbox" value="14" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-14"></label>
-						<input id="victories-checkbox-15" type="checkbox" value="15" name="attr_victories" />
-						<label class="progressbox" for="victories-checkbox-15"></label>
-					</div>
-				</div>
-				<div class="level-input-group panel-dark">
-					<h5 data-i18n="level"></h5>
-					<input type="number" name="attr_level" />
-				</div>
-				<div class="wealth-input-group">
-					<label data-i18n="wealth"></label>
-					<input type="number" class="input-md" name="attr_wealth" />
-				</div>
-				<div class="renown-input-group">
-					<label data-i18n="renown"></label>
-					<input type="number" class="input-md" name="attr_renown" />
-				</div>
-				<div class="experience-input-group">
-					<label data-i18n="experience"></label>
-					<input type="number" class="input-md" name="attr_experience" />
-				</div>
+			<div class="level-input-group panel-dark">
+				<h5 data-i18n="level"></h5>
+				<input type="number" name="attr_level" />
+			</div>
+			<div class="wealth-input-group">
+				<label data-i18n="wealth"></label>
+				<input type="number" class="input-md" name="attr_wealth" />
+			</div>
+			<div class="renown-input-group">
+				<label data-i18n="renown"></label>
+				<input type="number" class="input-md" name="attr_renown" />
+			</div>
+			<div class="experience-input-group">
+				<label data-i18n="experience"></label>
+				<input type="number" class="input-md" name="attr_experience" />
 			</div>
 		</div>
 	</div>
-	<div class="v-spacer"></div>
-	<div class="stats-panel border minimizable">
+	<!-- Stats Panel -->
+	<div class="sheet-panel stats-panel minimizable">
 		<div class="minimize-control">
 			<input id="stats-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="stats-minimize-checkbox" data-i18n="minimize-label"></label>
 		</div>
-		<div class="core-panel minimize-ignore border-right">
-			<div class="characteristics minimize-ignore">
-				<span>Click Characteristic to Power Roll</span>
-				<div class="characteristic-input-group hexagon">
-					<label data-characteristic="might" data-i18n="might"></label>
+		<div class="stat-dashboard minimize-ignore">
+			<div class="dashboard-characteristics minimize-ignore">
+				<div class="dashboard-stat-group">
+					<label data-characteristic="might" data-i18n="might">Might</label>
 					<input type="number" name="attr_might" />
 				</div>
-				<div class="characteristic-input-group hexagon">
-					<label data-characteristic="agility" data-i18n="agility"></label>
+				<div class="dashboard-stat-group ">
+					<label data-characteristic="agility" data-i18n="agility">Agility</label>
 					<input type="number" name="attr_agility" />
 				</div>
-				<div class="characteristic-input-group hexagon">
+				<div class="dashboard-stat-group ">
 					<label data-characteristic="reason" data-i18n="reason"></label>
-					<input type="number" name="attr_reason" />
+					<input type="number" name="attr_reason" />				
 				</div>
-				<div class="characteristic-input-group hexagon">
+				<div class="dashboard-stat-group ">
 					<label data-characteristic="intuition" data-i18n="intuition"></label>
-					<input type="number" name="attr_intuition" />
+					<input type="number" name="attr_intuition" />				
 				</div>
-				<div class="characteristic-input-group hexagon">
+				<div class="dashboard-stat-group">
 					<label data-characteristic="presence" data-i18n="presence"></label>
-					<input type="number" name="attr_presence" />
+					<input type="number" name="attr_presence" />					
 				</div>
 			</div>
-			<div class="potencies">
-				<h5 class="panel-title" data-i18n="potencies"></h5>
+			<div class="dashboard-stamina minimize-ignore">
+				<div class="dashboard-stat-group">
+					<label data-i18n="stamina">Stamina</label>
+					<input type="number" name="attr_stamina" />	
+				</div>
 				<div>
-					<label data-i18n="potency-strong"></label>
-					<input type="number" class="input-md" name="attr_potency_strong" />
-					<label data-i18n="potency-average"></label>
-					<input type="number" class="input-md" name="attr_potency_average" />
-					<label data-i18n="potency-weak"></label>
-					<input type="number" class="input-md" name="attr_potency_weak" />
+					<div class="stamina-winded-input-group minimize-ignore">
+						<label class="sublabel" data-i18n="winded">Winded</label>
+						<div>
+							<span class="sublabel" name="attr_stamina_winded">12</span>
+						</div>
+					</div>
+					<div class="stamina-dying-input-group minimize-ignore">
+						<label class="sublabel" data-i18n="dying">Dying</label>
+						<div>
+							0 to <span class="sublabel" name="attr_stamina_dead">-12</span></div>
+						</div>
+					</div>
+				</div>
+			<div class="dashboard-recoveries minimize-ignore">
+				<div class="dashboard-stat-group">
+					<label data-characteristic="recoveries" data-i18n="recoveries">Recoveries</label>
+					<input type="number" name="attr_recoveries" />			
 				</div>
 			</div>
-			<div class="movement">
-				<div class="movement-input-group">
-					<input type="text" class="input-md" name="attr_size" />
-					<label class="sublabel" data-i18n="size"></label>
+			<div class="dashboard-resource minimize-ignore"> 
+				<div class="dashboard-stat-group">
+					<label data-characteristic="resource" data-i18n="resource">Heroic Resource</label>
+					<input type="number" name="attr_resource" />		
 				</div>
-				<div class="movement-input-group">
-					<input type="number" class="input-md" name="attr_speed" />
-					<label class="sublabel" data-i18n="speed"></label>
-				</div>
-				<div class="movement-input-group">
-					<input type="number" class="input-md" name="attr_disengage" />
-					<label class="sublabel" data-i18n="disengage"></label>
-				</div>
-				<div class="movement-input-group">
-					<input type="number" class="input-md" name="attr_stability" />
-					<label class="sublabel" data-i18n="stability"></label>
+			</div>
+			<div class="dashboard-surges minimize-ignore">
+				<div class="dashboard-stat-group">
+					<label data-characteristic="surges" data-i18n="surges">Surges</label>
+					<input type="number" name="attr_surges" />				
 				</div>
 			</div>
 		</div>
-		<div class="stamina-panel minimize-ignore panel-dark">
-			<h5 class="panel-title minimize-ignore" data-i18n="stamina"></h5>
-			<div class="stamina-input-group minimize-ignore">
-				<input type="number" name="attr_stamina" />
-				<label class="sublabel" data-i18n="stamina-current"></label>
+		<!-- Movement -->
+		<div class="movement">
+			<div class="movement-input-group">
+				<input type="text" class="input-md" name="attr_size" />
+				<label class="sublabel" data-i18n="size"></label>
 			</div>
-			<input type="number" class="input-stamina minimize-ignore" name="attr_stamina_max" />
-			<label class="sublabel minimize-ignore" data-i18n="stamina-max"></label>
-			<input type="number" class="input-stamina" name="attr_stamina_winded" />
-			<label class="sublabel" data-i18n="winded"></label>
-			<div class="stamina-temporary-input-group">
-				<input type="number" class="input-md" name="attr_stamina_temporary" />
-				<label class="sublabel" data-i18n="stamina-temporary"></label>
+			<div class="movement-input-group">
+				<input type="number" class="input-md" name="attr_speed" />
+				<label class="sublabel" data-i18n="speed"></label>
+			</div>
+			<div class="movement-input-group">
+				<input type="number" class="input-md" name="attr_disengage" />
+				<label class="sublabel" data-i18n="disengage"></label>
+			</div>
+			<div class="movement-input-group">
+				<input type="number" class="input-md" name="attr_stability" />
+				<label class="sublabel" data-i18n="stability"></label>
 			</div>
-			<input type="number" class="input-md" disabled value="0" />
-			<label class="sublabel" data-i18n="dying"></label>
-			<input type="number" class="input-stamina" name="attr_stamina_dead" />
-			<label class="sublabel" data-i18n="dead"></label>
 		</div>
-		<div class="recoveries-panel minimize-ignore panel-dark">
-			<h5 class="panel-title minimize-ignore" data-i18n="recoveries"></h5>
-			<div class="recoveries-input-group minimize-ignore">
-				<input type="number" name="attr_recoveries" />
+		<!-- Stamina --> 
+		<div class="stamina-panel">
+			<div class="stamina-temp-max-group">
+				<div class="stamina-temporary-input-group">
+					<input type="number" class="input-md" name="attr_stamina_temporary" />
+					<label class="sublabel" data-i18n="stamina-temporary"></label>
+				</div>
+				<div class="stamina-max-input-group">
+					<input type="number" class="input-stamina minimize-ignore" name="attr_stamina_max" />
+					<label class="sublabel minimize-ignore" data-i18n="stamina-max"></label>
+				</div>
 			</div>
+		</div>
+		<!-- Recoveries -->
+		<div class="recoveries-panel">
 			<div class="recovery-amount-input-group">
-				<input type="number" class="input-stamina" name="attr_recovery_amount" />
+				<input type="number" class="input-md" name="attr_recovery_amount" />
 				<label class="sublabel" data-i18n="recovery-amount"></label>
 			</div>
 			<div class="recoveries-max-input-group">
@@ -186,37 +227,51 @@
 				<label class="sublabel" data-i18n="recoveries-max"></label>
 			</div>
 		</div>
-		<div class="damage-mod-panel panel-dark">
+		<!-- Heroic Resource Name -->
+		<div class="resource-panel">
+			<div class="resource-name-input-group">
+				<input type="text" class="input-md" name="attr_resource_name" data-i18n-placeholder="resource-name-placeholder" />
+			</div>
+		</div>
+		<!-- Surges -->
+		<div class="surges-panel">
+			<label class="sublabel">
+				1 Surge:
+			</label>
+			<span>Damage</span>
+			<input type="number" class="input-md" name="attr_surge_damage">
+			<label class="sublabel">2 Surges:</label>
+			<span>Potency + 1</span>
+		</div>
+		<!-- Potencies -->
+		<div class="potencies sheet-panel-box">
+				<h5 class="panel-title" data-i18n="potencies"></h5>
+				<div class="potency-input-group">
+					<label data-i18n="potency-strong"></label>
+					<input type="number" class="input-md" name="attr_potency_strong" />
+				</div>
+				<div class="potency-input-group">
+					<label data-i18n="potency-average"></label>
+					<input type="number" class="input-md" name="attr_potency_average" />
+				</div>
+				<div class="potency-input-group">
+					<label data-i18n="potency-weak"></label>
+					<input type="number" class="input-md" name="attr_potency_weak" />
+				</div>
+		</div>
+		<!-- Immunity and Weakness-->
+		<div class="damage-mod-panel sheet-panel-box">
 			<label><span data-i18n="immunity"></span></label>
 			<input type="text" class="input-md" name="attr_immunity" />
 			<label><span data-i18n="weakness"></span></label>
 			<input type="text" class="input-md" name="attr_weakness" />
 		</div>
-		<div class="resource-description-panel panel-dark">
+		<!-- Heroic Resource Description -->
+		<div class="resource-description-panel sheet-panel-box">
 			<textarea data-i18n-placeholder="resource-description-placeholder" name="attr_resource_description"></textarea>
 		</div>
-		<div class="resource-panel minimize-ignore border-right panel-dark">
-			<h5 class="panel-title minimize-ignore" data-i18n="resource"></h5>
-			<div class="resource-input-group minimize-ignore">
-				<input type="number" name="attr_resource" />
-			</div>
-			<div class="resource-name-input-group">
-				<input type="text" class="input-md" name="attr_resource_name" data-i18n-placeholder="resource-name-placeholder" />
-			</div>
-		</div>
-		<div class="surges-panel minimize-ignore panel-dark">
-			<h5 class="panel-title minimize-ignore" data-i18n="surges"></h5>
-			<div class="surges-input-group minimize-ignore">
-				<input type="number" name="attr_surges" />
-			</div>
-			<label class="sublabel">
-				1 Surge = Damage <input type="number" class="input-sm" name="attr_surge_damage" />
-			</label>
-			<label class="sublabel">
-				2 Surges = Potency + 1
-			</label>
-		</div>
-		<div class="conditions-panel panel-dark">
+		<!-- Conditions -->
+		<div class="conditions-panel sheet-panel-box">
 			<h5 class="panel-title" data-i18n="conditions"></h5>
 			<fieldset class="repeating_conditions">
 				<input type="text" name="attr_condition_name" data-i18n-placeholder="condition" />
@@ -229,11 +284,10 @@
 					<label data-i18n="save-ends"></label>
 				</div>
 			</fieldset>
-		</div>
+		</div>		
 	</div>
-	<div class="v-spacer"></div>
 	<!-- Biography Panel-->
-	<div class="biography-panel border minimizable">
+	<div class="sheet-panel biography-panel minimizable">
 		<div class="minimize-control">
 			<input id="biography-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="biography-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -241,23 +295,23 @@
 		<div class="minimize-show">
 			<h5 data-i18n="biography"></h5>
 		</div>
-		<div class="career-panel border panel-dark">
+		<div class="sheet-panel-box career-panel">
 			<h5 class="panel-title" data-i18n="career"></h5>
 			<input type="text" name="attr_career" />
 			<label class="sublabel" data-i18n="career-benefit"></label>
-			<textarea name="attr_career_benefit"></textarea>
+			<textarea name="attr_career_benefit" spellcheck="false"></textarea>
 			<label class="sublabel" data-i18n="career-incident"></label>
-			<textarea name="attr_career_incident"></textarea>
+			<textarea name="attr_career_incident" spellcheck="false"></textarea>
 		</div>
-		<div class="complication-panel border panel-dark">
+		<div class="sheet-panel-box complication-panel">
 			<h5 class="panel-title" data-i18n="complication"></h5>
 			<input type="text" name="attr_complication" />
 			<label class="sublabel" data-i18n="complication-benefit"></label>
-			<textarea name="attr_complication_benefit"></textarea>
+			<textarea name="attr_complication_benefit" spellcheck="false"></textarea>
 			<label class="sublabel" data-i18n="complication-drawback"></label>
-			<textarea name="attr_complication_drawback"></textarea>
+			<textarea name="attr_complication_drawback" spellcheck="false"></textarea>
 		</div>
-		<div class="culture-panel border panel-dark">
+		<div class="sheet-panel-box culture-panel">
 			<h5 class="panel-title" data-i18n="culture"></h5>
 			<label class="sublabel" data-i18n="culture-environment"></label>
 			<label class="sublabel" data-i18n="culture-organization"></label>
@@ -265,14 +319,13 @@
 			<input type="text" name="attr_culture_environment" />
 			<input type="text" name="attr_culture_organization" />
 			<input type="text" name="attr_culture_upbringing" />
-			<textarea name="attr_culture_environment_description"></textarea>
-			<textarea name="attr_culture_organization_description"></textarea>
-			<textarea name="attr_culture_upbringing_description"></textarea>
+			<textarea name="attr_culture_environment_description" spellcheck="false"></textarea>
+			<textarea name="attr_culture_organization_description" spellcheck="false"></textarea>
+			<textarea name="attr_culture_upbringing_description" spellcheck="false"></textarea>
 		</div>
 	</div>
-	<div class="v-spacer"></div>
 	<!-- Skills and Languages Panel-->
-	<div class="skills-languages-panel border minimizable panel-dark">
+	<div class="sheet-panel skills-languages-panel minimizable panel-dark">
 		<div class="minimize-control">
 			<input id="skills-languages-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="skills-languages-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -298,9 +351,8 @@
 			<input type="text" data-i18n-placeholder="caelian" name="attr_languages" />
 		</div>
 	</div>
-	<div class="v-spacer"></div>
 	<!-- Features Panel-->
-	<div class="features-panel border minimizable panel-dark">
+	<div class="sheet-panel features-panel minimizable panel-dark">
 		<div class="minimize-control">
 			<input id="features-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="features-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -308,7 +360,8 @@
 		<div class="minimize-show">
 			<h5 data-i18n="features"></h5>
 		</div>
-		<div class="class-panel border">
+		<!-- Class Features Panel -->
+		<div class="sheet-panel-box class-panel">
 			<h5 class="panel-title" data-i18n="class-features"></h5>
 			<fieldset class="repeating_classfeatures">
 				<div class="class-feature-header">
@@ -321,7 +374,8 @@
 				</div>
 			</fieldset>
 		</div>
-		<div class="ancestry-panel border">
+		<!-- Ancestry Features Panel -->
+		<div class="sheet-panel-box ancestry-panel">
 			<h5 class="panel-title" data-i18n="ancestry-traits"></h5>
 			<fieldset class="repeating_ancestrytraits">
 				<div class="anc-feature-header">
@@ -334,7 +388,8 @@
 				</div>
 			</fieldset>
 		</div>
-		<div class="modifiers-panel border">
+		<!-- Modifiers Panel -->
+		<div class="sheet-panel-box modifiers-panel">
 			<h5 class="panel-title" data-i18n="modifiers"></h5>
 			<fieldset class="repeating_modifiers">
 				<div class="modifier-card">
@@ -405,7 +460,8 @@
 				</div>
 			</fieldset>
 		</div>
-		<div class="perks-panel border">
+		<!-- Perks Panel -->
+		<div class="sheet-panel-box perks-panel">
 			<h5 class="panel-title" data-i18n="perks"></h5>
 			<fieldset class="repeating_perks">
 				<div class="perk-feature-header">
@@ -418,7 +474,8 @@
 				</div>
 			</fieldset>
 		</div>
-		<div class="titles-panel border">
+		<!-- Titles Panel -->
+		<div class="sheet-panel-box titles-panel">
 			<h5 class="panel-title" data-i18n="titles"></h5>
 			<fieldset class="repeating_titles">
 				<div class="title-feature-header">
@@ -432,9 +489,8 @@
 			</fieldset>
 		</div>
 	</div>
-	<div class="v-spacer"></div>
 	<!-- Abilities Panel-->
-	<div class="abilities-panel border minimizable panel-dark">
+	<div class="sheet-panel abilities-panel minimizable panel-dark">
 		<div class="minimize-control">
 			<input id="abilities-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="abilities-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -442,6 +498,7 @@
 		<div class="minimize-show">
 			<h5 data-i18n="abilities"></h5>
 		</div>
+		<!-- Ability Type Tabs -->
 		<input type="hidden" class="sheet-tabstoggle" name="attr_abilitiesTab" value="action" />
 		<div class="abilities-buttons">
 		    <button type="action" name="act_action" class="sheet-button-action">Main Actions</button>
@@ -450,459 +507,491 @@
 		    <button type="action" name="act_noaction" class="sheet-button-noaction">No Action/Traits</button>
 		    <button type="action" name="act_move" class="sheet-button-move">Move</button>
 		</div>
+		<!-- Main Action Abilities -->
 		<div class="sheet-action">
 			<!-- Main Actions: repeating_abilities -->
 		    <h2 data-i18n="main-actions"></h2>
 			<fieldset class="repeating_abilities">
 				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<div class="ability-card card-edit">
 					<input type="text" class="ability-name" data-i18n-placeholder="ability-name" name="attr_ability_name" />
 					<div class="ability-cost-input-group">
 						<label data-i18n="ability-cost"></label>
 						<input type="number" name="attr_ability_cost" />
 					</div>
-					<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_ability_description" />
-					<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_ability_keywords" />
-					<input type="hidden" name="attr_moves_type" value="main-action" />
-					<span class="ability-type" data-i18n="main-action"></span>
+					<div class="ability-details">
+						<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_ability_description" />
+						<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_ability_keywords" />
+						<input type="hidden" name="attr_moves_type" value="main-action" />
+						<span class="ability-type" data-i18n="main-action"></span>
 					
-					<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_ability_distance" />
-					<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_ability_target" />
-					<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_ability_trigger"></textarea>
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<input type="checkbox" name="attr_has_power_roll" checked />
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="ability-type" name="attr_ability_characteristic">
-							  <option value="might" data-i18n="might"></option>
-							  <option value="agility" data-i18n="agility"></option>
-							  <option value="reason" data-i18n="reason"></option>
-							  <option value="intuition" data-i18n="intuition"></option>
-							  <option value="presence" data-i18n="presence"></option>
-							</select>
+						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_ability_distance" />
+						<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_ability_target" />
+						<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_ability_trigger"></textarea>
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<input type="checkbox" name="attr_has_power_roll" checked />
+								<label data-i18n="power-roll"></label>
+								<span>+</span>
+								<select class="ability-type" name="attr_ability_characteristic">
+								  <option value="might" data-i18n="might"></option>
+								  <option value="agility" data-i18n="agility"></option>
+								  <option value="reason" data-i18n="reason"></option>
+								  <option value="intuition" data-i18n="intuition"></option>
+								  <option value="presence" data-i18n="presence"></option>
+								</select>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_1" />
+							<label class="sublabel">12-16</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_2" />
+							<label class="sublabel">17+</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_3" />
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_1" />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_2" />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_ability_tier_3" />
+						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_ability_effect"></textarea>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_ability_effect"></textarea>
 				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_share">
+				<div class="ability-card card-display">
+					<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_share">
 						<!-- speech balloon -->
 						&#128172;
 					</button>
-					<div class="read-ability-name-cost">
-						<span class="ability-name read-ability-name" name="attr_ability_name"></span>
-						<span class="ability-cost read-cardtext" name="attr_ability_cost"></span>
+					<span class="ability-name" name="attr_ability_name"></span>
+					<div class="ability-cost">
+						<input type="hidden" name="attr_ability_cost" />
+						<span data-i18n="ability-cost"></span>
+						<span>:&nbsp;</span>
+						<span name="attr_ability_cost"></span>
 					</div>
-					<span class="ability-description read-ability-description" name="attr_ability_description"></span>
+						&nbsp;
+					<div class="ability-details">
+						<span class="ability-description" name="attr_ability_description"></span>
 				
-					<span class="ability-keywords read-ability-keywords" name="attr_ability_keywords"></span>
-					<span class="ability-type read-ability-type" name="attr_ability_type" data-i18n-dynamic></span>
-					
-					<span class="ability-distance read-ability-distance" name="attr_ability_distance" ></span>
-					<span class="ability-target read-ability-target" name="attr_ability_target" ></span>
-					<input class="ability-type" type="hidden" name="attr_ability_type" />
-					<span class="ability-trigger" name="attr_ability_trigger"></span>
-					<input type="hidden" name="attr_has_power_roll" class="read-power-roll-flag" />
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_ability_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+						<span class="ability-keywords" name="attr_ability_keywords"></span>
+						<span class="ability-type" name="attr_ability_type" data-i18n-dynamic></span>
+						
+						<span class="ability-distance" name="attr_ability_distance" ></span>
+						<span class="ability-target" name="attr_ability_target" ></span>
+						<input class="ability-type" type="hidden" name="attr_ability_type" />
+						<!--<span class="ability-trigger" name="attr_ability_trigger"></span>-->
+						<input type="hidden" name="attr_has_power_roll" id="power-roll-flag" />
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<label>2d10</label>
+								<span>+</span>
+								<span class="power-roll-characteristic" data-i18n-dynamic name="attr_ability_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
+									<!-- Dice pic -->
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+								</button>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_ability_tier_1" ></span>
+							<label class="sublabel">12-16</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_ability_tier_2" ></span>
+							<label class="sublabel">17+</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_ability_tier_3" ></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_ability_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_ability_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_ability_tier_3" ></span>
+						<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_ability_effect"></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_ability_effect"></span>
 				</div>
 			</fieldset>
-			<div class="free-strikes">
-			<!-- Free Strikes-->
-				<div class="melee-free-strike">
+			<!-- Standard Abilities -->
+			<div class="standard-abilities">
 				<!-- Melee Free Strike Ability -->
+				<div class="standard-abilities-item">
 					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
+					<div class="ability-card card-edit">
 						<input type="text" class="ability-name" data-i18n-placeholder="melee-free-strike" name="attr_melee_free_strike_name" value="Melee Weapon Free Strike" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="melee-free-strike-keywords" name="attr_melee_free_strike_keywords" value="Charge, Melee, Strike, Weapon" />
-						<input type="hidden" name="attr_melee_free_strike_type" value="main-action" />
-						<div class="ability-type">
-						  <span data-i18n="main-action"></span>
-					  </div>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_melee_free_strike_distance" value="Melee 1" />
-						<input type="text" class="ability-target" data-i18n-placeholder="one-creature-object" name="attr_melee_free_strike_target" value="One creature or object" />
-						<input type="hidden" name="attr_melee_free_strike_has_power_roll" value="on" />
-						<div class="power-roll">
-							<div class="power-roll-mods">
-								<label data-i18n="power-roll"></label>
-								<span>+</span>
-								<select class="power-roll-characteristic" name="attr_melee_free_strike_characteristic">
-								  <option value="might" data-i18n="might"></option>
-								<option value="agility" data-i18n="agility"></option>
-							  </select>
+						<div class="ability-details">
+							<input type="text" class="ability-keywords" data-i18n-placeholder="melee-free-strike-keywords" name="attr_melee_free_strike_keywords" value="Charge, Melee, Strike, Weapon" />
+							<input type="hidden" name="attr_melee_free_strike_type" value="main-action" />
+							<div class="ability-type">
+								<span data-i18n="main-action"></span>
+							</div>
+							<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_melee_free_strike_distance" value="Melee 1" />
+							<input type="text" class="ability-target" data-i18n-placeholder="one-creature-object" name="attr_melee_free_strike_target" value="One creature or object" />
+							<input type="hidden" name="attr_melee_free_strike_has_power_roll" value="on" />
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label data-i18n="power-roll"></label>
+									<span>+</span>
+									<select class="power-roll-characteristic" name="attr_melee_free_strike_characteristic">
+										<option value="might" data-i18n="might"></option>
+										<option value="agility" data-i18n="agility"></option>
+									</select>
+								</div>
+								<label class="sublabel">≤11</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_1" value="2 + (Might or Agility) damage" />
+								<label class="sublabel">12-16</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_2" value="5 + (Might or Agility) damage" />
+								<label class="sublabel">17+</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_3" value="7 + (Might or Agility) damage" />
 							</div>
-							<label class="sublabel">≤11</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_1" value="2 + (Might or Agility) damage" />
-							<label class="sublabel">12-16</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_2" value="5 + (Might or Agility) damage" />
-							<label class="sublabel">17+</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_3" value="7 + (Might or Agility) damage" />
 						</div>
 					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_melee_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_melee_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" name="attr_melee_free_strike_name"></span>
-						<span class="ability-keywords read-ability-keywords" name="attr_melee_free_strike_keywords"></span>
-						<span class="read-ability-type" data-i18n="main-action"></span>
-						
-						<span class="ability-distance read-ability-distance" name="attr_melee_free_strike_distance" ></span>
-						<span class="ability-target read-ability-target" name="attr_melee_free_strike_target" ></span>
-						<div class="read-power-roll">
-							<div class="power-roll-mods">
-								<label>2d10</label>
-								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_melee_free_strike_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_melee_power_roll_share">
-									<!-- Dice pic -->
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-								</button>
+						<span class="ability-name" name="attr_melee_free_strike_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_melee_free_strike_keywords"></span>
+							<span class="ability-type" data-i18n="main-action"></span>
+							
+							<span class="ability-distance" name="attr_melee_free_strike_distance" ></span>
+							<span class="ability-target" name="attr_melee_free_strike_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_melee_free_strike_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_melee_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_melee_free_strike_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_melee_free_strike_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" name="attr_melee_free_strike_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" name="attr_melee_free_strike_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" name="attr_melee_free_strike_tier_3" ></span>
 						</div>
 					</div>
 				</div>
-				<div class="ranged-free-strike">
 				<!-- Ranged Free Strike Ability -->
+				<div class="standard-abilities-item">
 					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
+					<div class="ability-card card-edit">
 						<input type="text" class="ability-name" data-i18n-placeholder="ranged-free-strike" name="attr_ranged_free_strike_name" value="Ranged Weapon Free Strike" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="ranged-free-strike-keywords" name="attr_ranged_free_strike_keywords" value="Ranged, Strike, Weapon" />
-						<input type="hidden" name="attr_ranged_free_strike_type" value="main-action" />
-						<div class="ability-type">
-						  <span data-i18n="main-action"></span>
-					  </div>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_ranged_free_strike_distance" value="Ranged 5" />
-						<input type="text" class="ability-target" data-i18n-placeholder="one-creature-object" name="attr_ranged_free_strike_target" value="One creature or object" />
-						<input type="hidden" name="attr_ranged_free_strike_has_power_roll" value="on" />
-						<div class="power-roll">
-							<div class="power-roll-mods">
-								<label data-i18n="power-roll"></label>
-								<span>+</span>
-								<select class="power-roll-characteristic" name="attr_ranged_free_strike_characteristic">
-								  <option value="might" data-i18n="might"></option>
-								  <option value="agility" data-i18n="agility"></option>
-							  </select>
+						<div class="ability-details">
+							<input type="text" class="ability-keywords" data-i18n-placeholder="ranged-free-strike-keywords" name="attr_ranged_free_strike_keywords" value="Ranged, Strike, Weapon" />
+							<input type="hidden" name="attr_ranged_free_strike_type" value="main-action" />
+							<div class="ability-type">
+								<span data-i18n="main-action"></span>
+							</div>
+							<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_ranged_free_strike_distance" value="Ranged 5" />
+							<input type="text" class="ability-target" data-i18n-placeholder="one-creature-object" name="attr_ranged_free_strike_target" value="One creature or object" />
+							<input type="hidden" name="attr_ranged_free_strike_has_power_roll" value="on" />
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label data-i18n="power-roll"></label>
+									<span>+</span>
+									<select class="power-roll-characteristic" name="attr_ranged_free_strike_characteristic">
+										<option value="might" data-i18n="might"></option>
+										<option value="agility" data-i18n="agility"></option>
+									</select>
+								</div>
+								<label class="sublabel">≤11</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_1" value="2 + (Might or Agility) damage" />
+								<label class="sublabel">12-16</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_2" value="5 + (Might or Agility) damage" />
+								<label class="sublabel">17+</label>
+								<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_3" value="7 + (Might or Agility) damage" />
 							</div>
-							<label class="sublabel">≤11</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_1" value="2 + (Might or Agility) damage" />
-							<label class="sublabel">12-16</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_2" value="4 + (Might or Agility) damage" />
-							<label class="sublabel">17+</label>
-							<input type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_3" value="6 + (Might or Agility) damage" />
 						</div>
 					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_ranged_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_ranged_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" name="attr_ranged_free_strike_name"></span>
-						<span class="ability-keywords read-ability-keywords" name="attr_ranged_free_strike_keywords"></span>
-						<span class="read-ability-type" data-i18n="main-action"></span>
-						
-						<span class="ability-distance read-ability-distance" name="attr_ranged_free_strike_distance" ></span>
-						<span class="ability-target read-ability-target" name="attr_ranged_free_strike_target" ></span>
-						<div class="read-power-roll">
-							<div class="power-roll-mods">
-								<label>2d10</label>
-								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_ranged_free_strike_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_ranged_power_roll_share">
-									<!-- Dice pic -->
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-								</button>
+						<span class="ability-name" name="attr_ranged_free_strike_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_ranged_free_strike_keywords"></span>
+							<span class="ability-type" data-i18n="main-action"></span>
+							
+							<span class="ability-distance" name="attr_ranged_free_strike_distance" ></span>
+							<span class="ability-target" name="attr_ranged_free_strike_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_ranged_free_strike_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_ranged_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_ranged_free_strike_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" name="attr_ranged_free_strike_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" name="attr_ranged_free_strike_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" name="attr_ranged_free_strike_tier_3" ></span>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="default-mainaction">
-			<!-- Default Main Actions-->
-				<div class="charge">
 				<!-- Charge Main Action -->
+				<div class="standard-abilities-item">
 					<input type="hidden" class="ability-name" data-i18n-placeholder="charge" name="attr_charge_name" value="Charge" />
-					<input type="hidden" class="ability-keywords" data-i18n-placeholder="charge-keywords" name="attr_charge_keywords" value="-" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="charge-keywords" name="attr_charge_keywords" value="" />
 					<input type="hidden" name="attr_charge_type" value="main-action" />
 					<input type="hidden" class="ability-effect" name="attr_charge_effect" value="When a creature takes the Charge main action, they move up to their speed in a straight line, then make a melee free strike against a target when they end their move. If the creature has an ability with the Charge keyword, they can use that ability against the target instead of a free strike. A creature can’t move through difficult terrain or shift when they charge. They can fly or burrow as part of the Charge main action if they have that movement available to them, but they can’t climb or swim while charging unless they can automatically use that movement at full speed." />
-						
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_charge_share">
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_charge_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" name="attr_charge_name"></span>
-						<span class="ability-keywords read-ability-keywords" name="attr_charge_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="main-action"></span>
-						<span class="ability-effect read-ability-effect" name="attr_charge_effect"></span>
+						<span class="ability-name" name="attr_charge_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_charge_keywords"></span>
+							<span class="ability-type" data-i18n="main-action"></span>
+							
+							<span class="ability-effect read-ability-effect" name="attr_charge_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="defend">
 				<!-- Defend Main Action -->
+				<div class="standard-abilities-item">
 					<input type="hidden" class="ability-name" data-i18n-placeholder="defend" name="attr_defend_name" value="Defend" />
-					<input type="hidden" class="ability-keywords" data-i18n-placeholder="defend-keywords" name="attr_defend_keywords" value="-" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="defend-keywords" name="attr_defend_keywords" value="" />
 					<input type="hidden" name="attr_defend_type" value="Main Action" />
 					<input type="hidden" class="ability-effect" name="attr_defend_effect" value="When a creature takes the Defend main action, ability rolls made against them have a double bane until the start of their next turn. Additionally, you have a double edge on tests when called for to resist environmental effects or a creature’s traits or abilities. A creature gains no benefit from this action while another creature is taunted by them." />
 					
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_defend_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_defend_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Defend" name="attr_defend_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="defend" name="attr_defend_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="main-action"></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_defend_effect"></span>
+						<span class="ability-name" data-i18n-placeholder="Defend" name="attr_defend_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" data-i18n-placeholder="defend" name="attr_defend_keywords"></span>
+							<span class="ability-type" data-i18n="main-action"></span>
+							<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_defend_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="heal">
 				<!-- Heal Main Action -->
+				<div class="standard-abilities-item">
 					<input type="hidden" class="ability-name" data-i18n-placeholder="heal" name="attr_heal_name" value="Heal" />
-					<input type="hidden" class="ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_heal_keywords" value="-" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_heal_keywords" value="" />
 					<input type="hidden" name="attr_heal_type" value="Main Action" />
 					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_heal_distance" value="Melee 1" />
 					<input type="hidden" class="ability-target" name="attr_heal_target" value="One creature" />
 					<input type="hidden" class="ability-effect" name="attr_heal_effect" value="A creature who uses the Heal main action employs medicine or inspiring words to make an adjacent creature feel better and stay in the fight. The target creature can spend a Recovery to regain Stamina, or can make a saving throw against one effect they are suffering that is ended by a saving throw." />
 					
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_heal_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_heal_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Heal" name="attr_heal_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_heal_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="main-action"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_heal_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_heal_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_heal_effect"></span>
+						<span class="ability-name" data-i18n-placeholder="Heal" name="attr_heal_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_heal_keywords"></span>
+							<span class="ability-type" data-i18n="main-action"></span>
+							<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_heal_distance" ></span>
+							<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_heal_target" ></span>
+							<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_heal_effect"></span>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
+		<!-- Maneuver Abilities -->
 		<div class="sheet-maneuver">
-			<!-- Maneuvers -->
+			<!-- Maneuvers: repeating_maneuvers -->
 			<h2 data-i18n="maneuvers"></h2>
-			<fieldset class="repeating_maneuvers">
+			 <fieldset class="repeating_maneuvers">
 				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<div class="ability-card card-edit">
 					<input type="text" class="ability-name" data-i18n-placeholder="ability-name" name="attr_maneuver_name" />
 					<div class="ability-cost-input-group">
 						<label data-i18n="ability-cost"></label>
 						<input type="number" name="attr_maneuver_cost" />
 					</div>
-					<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_maneuver_description" />
-					<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_maneuver_keywords" />
-					<select class="ability-type" name="attr_maneuver_type">
-						<option value="maneuver" data-i18n="maneuver"></option>
-						<option value="free-maneuver" data-i18n="free-maneuver"></option>
-					</select>
-					<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_maneuver_distance" />
-					<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_maneuver_target" />
-					<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_maneuver_trigger"></textarea>
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<input type="checkbox" name="attr_has_power_roll" checked />
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="ability-type" name="attr_maneuver_characteristic">
-							  <option value="might" data-i18n="might"></option>
-							  <option value="agility" data-i18n="agility"></option>
-							  <option value="reason" data-i18n="reason"></option>
-							  <option value="intuition" data-i18n="intuition"></option>
-							  <option value="presence" data-i18n="presence"></option>
-							</select>
+					<div class="ability-details">
+						<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_maneuver_description" />
+						<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_maneuver_keywords" />
+						<input type="hidden" name="attr_moves_type" />
+						<select class="ability-type" name="attr_maneuver_type">
+							<option value="maneuver" data-i18n="maneuver"></option>
+							<option value="free-maneuver" data-i18n="free-maneuver"></option>
+						</select>
+						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_maneuver_distance" />
+						<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_maneuver_target" />
+						<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_maneuver_trigger"></textarea>
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<input type="checkbox" name="attr_has_power_roll" checked />
+								<label data-i18n="power-roll"></label>
+								<span>+</span>
+								<select class="ability-type" name="attr_maneuver_characteristic">
+								  <option value="might" data-i18n="might"></option>
+								  <option value="agility" data-i18n="agility"></option>
+								  <option value="reason" data-i18n="reason"></option>
+								  <option value="intuition" data-i18n="intuition"></option>
+								  <option value="presence" data-i18n="presence"></option>
+								</select>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_1" />
+							<label class="sublabel">12-16</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_2" />
+							<label class="sublabel">17+</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_3" />
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_1" />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_2" />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_maneuver_tier_3" />
+						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_maneuver_effect"></textarea>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_maneuver_effect"></textarea>
 				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_share">
+				<div class="ability-card card-display">
+					<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_share">
 						<!-- speech balloon -->
 						&#128172;
 					</button>
-					<div class="read-ability-name-cost">
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Ability Name" name="attr_maneuver_name"></span>
-						<span class="ability-cost read-cardtext" name="attr_maneuver_cost" data-i18n-placeholder="Cost"></span>
+					<span class="ability-name" name="attr_maneuver_name"></span>
+					<div class="ability-cost">
+						<input type="hidden" name="attr_maneuver_cost" />
+						<span data-i18n="ability-cost"></span>
+						<span>:&nbsp;</span>
+						<span name="attr_maneuver_cost"></span>
 					</div>
-					<span class="ability-description read-ability-description" data-i18n-placeholder="Description" name="attr_maneuver_description"></span>
+						&nbsp;
+					<div class="ability-details">
+						<span class="ability-description" name="attr_maneuver_description"></span>
 				
-					<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="Keywords" name="attr_maneuver_keywords"></span>
-					<span class="ability-type read-ability-type" data-i18n-placeholder="Ability Type" name="attr_maneuver_type" data-i18n-dynamic></span>
-					
-					<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_maneuver_distance" ></span>
-					<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_maneuver_target" ></span>
-					<input class="ability-type" type="hidden" name="attr_maneuver_type" />
-					<span class="ability-trigger" data-i18n-placeholder="trigger" name="attr_maneuver_trigger"></span>
-					<input type="hidden" name="attr_has_power_roll" class="read-power-roll-flag" />
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_maneuver_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
-						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_maneuver_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_maneuver_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_maneuver_tier_3" ></span>
-					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_maneuver_effect"></span>
-				</div>
-			</fieldset>
-			<div class="default-maneuvers">
-			<!-- Default Maneuvers-->
-				<div class="knockback">
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="knockback" name="attr_knockback_name" value="Knockback" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_knockback_keywords" value="Melee, Weapon" />
-						<input type="hidden" name="attr_knockback_type" value="maneuver" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_knockback_distance" value="Melee 1" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_knockback_target" value="One creature" />
-						<input type="hidden" name="attr_knockback_has_power_roll" value="on" />
-						<input type="hidden" class="power-roll-characteristic" name="attr_knockback_characteristic" value="might" />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_1" value="Push 1" />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_2" value="Push 2" />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_3" value="Push 3" />
-						<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_knockback_effect" value="Effect: You can usually target only creatures of your size or smaller. If your Might score is 2 or higher, you can target any creature with a size equal to or less than your Might score." />
-					
-						<button type="action" data-i18n-title="ability-share" name="act_knockback_share">
-							<!-- speech balloon -->
-							&#128172;
-						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Knockback" name="attr_knockback_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_knockback_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="maneuver"></span>
+						<span class="ability-keywords" name="attr_maneuver_keywords"></span>
+						<span class="ability-type" name="attr_maneuver_type" data-i18n-dynamic></span>
 						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_knockback_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_knockback_target" ></span>
-						<div class="read-power-roll">
+						<span class="ability-distance" name="attr_maneuver_distance" ></span>
+						<span class="ability-target" name="attr_maneuver_target" ></span>
+						<input class="ability-type" type="hidden" name="attr_maneuver_type" />
+						<!--<span class="ability-trigger" name="attr_maneuver_trigger"></span>-->
+						<input type="hidden" name="attr_has_power_roll" id="power-roll-flag" />
+						<div class="power-roll">
 							<div class="power-roll-mods">
 								<label>2d10</label>
 								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_knockback_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_knockback_power_roll_share">
+								<span class="power-roll-characteristic" data-i18n-dynamic name="attr_maneuver_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
 									<!-- Dice pic -->
 									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
 									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
 								</button>
 							</div>
 							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_knockback_tier_1" ></span>
+							<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_maneuver_tier_1" ></span>
 							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_knockback_tier_2" ></span>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_maneuver_tier_2" ></span>
 							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_knockback_tier_3" ></span>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_maneuver_tier_3" ></span>
 						</div>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_knockback_effect"></span>
+						<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_maneuver_effect"></span>
 					</div>
 				</div>
-				<div class="grab">
-				<!-- Grab Maneuver Ability -->
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="grab" name="attr_grab_name" value="Grab" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="grab-keywords" name="attr_grab_keywords" value="Melee, Weapon" />
-						<input type="hidden" name="attr_grab_type" value="maneuver" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_grab_distance" value="Melee 1" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_grab_target" value="One creature" />
-						<input type="hidden" name="attr_grab_has_power_roll" value="on" />
-						<input type="hidden" class="power-roll-characteristic" name="attr_grab_characteristic" value="might" />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_1" value="No effect." />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_2" value="You can grab the target, but if you do, the target can make a melee free strike against you before they are grabbed." />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_3" value="The target is grabbed by you." />
-						<input type="hidden" class="ability-effect" name="attr_grab_effect" value="Effect: You can usually target only creatures of your size or smaller. If your Might score is 2 or higher, you can target any creature with a size equal to or less than your Might score. Unless otherwise indicated, a creature can grab only one creature at a time." />
+			</fieldset>
+			
+			<!-- Standard Maneuvers -->
+			<div class="standard-abilities">
+				<!-- Knockback -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="knockback" name="attr_knockback_name" value="Knockback" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_knockback_keywords" value="Melee, Weapon" />
+					<input type="hidden" name="attr_knockback_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_knockback_distance" value="Melee 1" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_knockback_target" value="One creature" />
+					<input type="hidden" name="attr_knockback_has_power_roll" value="on" />
+					<input type="hidden" class="power-roll-characteristic" name="attr_knockback_characteristic" value="might" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_1" value="Push 1" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_2" value="Push 2" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_knockback_tier_3" value="Push 3" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_knockback_effect" value="Effect: You can usually target only creatures of your size or smaller. If your Might score is 2 or higher, you can target any creature with a size equal to or less than your Might score." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_knockback_share">
+							<!-- speech balloon -->
+							&#128172;
+						</button>
+						<span class="ability-name" data-i18n-placeholder="Knockback" name="attr_knockback_name"></span>
+						<div class="ability-details">
+							
+							<span class="ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_knockback_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							
+							<span class="ability-distance" data-i18n-placeholder="Distance" name="attr_knockback_distance" ></span>
+							<span class="ability-target" data-i18n-placeholder="Target" name="attr_knockback_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_knockback_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_knockback_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_knockback_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_knockback_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_knockback_tier_3" ></span>
+							</div>
+							<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_knockback_effect"></span>
+						</div>
+					</div>
+				</div>
+				<!-- Grab -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="grab" name="attr_grab_name" value="Grab" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="grab-keywords" name="attr_grab_keywords" value="Melee, Weapon" />
+					<input type="hidden" name="attr_grab_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_grab_distance" value="Melee 1" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_grab_target" value="One creature" />
+					<input type="hidden" name="attr_grab_has_power_roll" value="on" />
+					<input type="hidden" class="power-roll-characteristic" name="attr_grab_characteristic" value="might" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_1" value="No effect." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_2" value="You can grab the target, but if you do, the target can make a melee free strike against you before they are grabbed." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_grab_tier_3" value="The target is grabbed by you." />
+					<input type="hidden" class="ability-effect" name="attr_grab_effect" value="Effect: You can usually target only creatures of your size or smaller. If your Might score is 2 or higher, you can target any creature with a size equal to or less than your Might score. Unless otherwise indicated, a creature can grab only one creature at a time." />
+					
+					<div class="ability-card">
 						<button type="action" data-i18n-title="ability-share" name="act_grab_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Grab" name="attr_grab_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="grab-keywords" name="attr_grab_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_grab_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_grab_target" ></span>
-						<div class="read-power-roll">
-							<div class="power-roll-mods">
-								<label>2d10</label>
-								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_grab_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_grab_power_roll_share">
-									<!-- Dice pic -->
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-								</button>
+						<span class="ability-name" data-i18n-placeholder="Grab" name="attr_grab_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" data-i18n-placeholder="grab-keywords" name="attr_grab_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							
+							<span class="ability-distance" data-i18n-placeholder="Distance" name="attr_grab_distance" ></span>
+							<span class="ability-target" data-i18n-placeholder="Target" name="attr_grab_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_grab_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_grab_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_grab_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_grab_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_grab_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_grab_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_grab_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_grab_tier_3" ></span>
+							<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_grab_effect"></span>
 						</div>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_grab_effect"></span>
 					</div>
 				</div>
-				<div class="escape-grab">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					
+				<!-- Escape Grab -->
+				<div class="standard-abilities-item">
 					<input type="hidden" class="ability-name" data-i18n-placeholder="escape-grab" name="attr_escape_grab_name" value="Escape Grab" />
-					<input type="hidden" class="ability-keywords" data-i18n-placeholder="escape-grab-keywords" name="attr_escape_grab_keywords" value="-" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="escape-grab-keywords" name="attr_escape_grab_keywords" value="" />
 					<input type="hidden" name="attr_escape_grab_type" value="maneuver" />
 					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_escape_grab_distance" value="Self" />
 					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_escape_grab_target" value="Self" />
@@ -911,709 +1000,740 @@
 					<input type="hidden" class="power-roll-tier-effect" name="attr_escape_grab_tier_3" value="You are no longer grabbed." />
 					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_escape_grab_effect" value="Effect: You take a bane on this maneuver if your size is smaller than the size of the creature, object, or effect that has you grabbed" />
 					
-					<div class="ability-card">
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Escape Grab" name="attr_escape_grab_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_escape_grab_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="maneuver"></span>
+					<input class="ability-edit" type="checkbox" id="ability-edit"/>
+					<div class="ability-card card-edit">
+						<span class="ability-name" data-i18n-placeholder="Escape Grab" name="attr_escape_grab_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_escape_grab_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
 						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_escape_grab_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_escape_grab_target" ></span>
-						<div class="power-roll">
-							<div class="power-roll-mods">
-								<label data-i18n="power-roll"></label>
-								<span>+</span>
-								<select class="ability-type" name="attr_escape_grab_characteristic">
-									  <option value="might" data-i18n="might"></option>
-									  <option value="agility" data-i18n="agility"></option>
-								</select>
+							<span class="ability-distance" data-i18n-placeholder="Distance" name="attr_escape_grab_distance" ></span>
+							<span class="ability-target" data-i18n-placeholder="Target" name="attr_escape_grab_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label data-i18n="power-roll"></label>
+									<span>+</span>
+									<select class="ability-type" name="attr_escape_grab_characteristic">
+										<option value="might" data-i18n="might"></option>
+										<option value="agility" data-i18n="agility"></option>
+									</select>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_escape_grab_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_escape_grab_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_escape_grab_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_escape_grab_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_escape_grab_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_escape_grab_tier_3" ></span>
+							<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_escape_grab_effect"></span>						
 						</div>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_escape_grab_effect"></span>						
 					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_escape_grab_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_escape_grab_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Escape Grab" name="attr_escape_grab_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_escape_grab_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="maneuver"></span>
+						<span class="ability-name" data-i18n-placeholder="Escape Grab" name="attr_escape_grab_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" data-i18n-placeholder="knockback-keywords" name="attr_escape_grab_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
 						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_escape_grab_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_escape_grab_target" ></span>
-						<div class="read-power-roll">
-							<div class="power-roll-mods">
-								<label>2d10</label>
-								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_escape_grab_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_escape_grab_power_roll_share">
-									<!-- Dice pic -->
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-								</button>
+							<span class="ability-distance" data-i18n-placeholder="Distance" name="attr_escape_grab_distance" ></span>
+							<span class="ability-target" data-i18n-placeholder="Target" name="attr_escape_grab_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_escape_grab_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_escape_grab_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_escape_grab_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_escape_grab_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_escape_grab_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_escape_grab_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_escape_grab_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_escape_grab_tier_3" ></span>
+							<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_escape_grab_effect"></span>
 						</div>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_escape_grab_effect"></span>
 					</div>
 				</div>
-				<div class="claw-dirt">
 				<!-- Claw Dirt Maneuver -->
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="claw-dirt" name="attr_claw_dirt_name" value="Claw Dirt" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="claw-dirt-keywords" name="attr_claw_dirt_keywords" value="-" />
-						<input type="hidden" name="attr_claw_dirt_type" value="maneuver" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_claw_dirt_distance" value="Self" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_claw_dirt_target" value="Self" />
-						<input type="hidden" class="power-roll-characteristic" data-i18n-placeholder="might" name="attr_claw_dirt_characteristic" value="might" />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_1" value="You can move 1 square into, out of, or through ground you are touching that can be burrowed through, and you are slowed and weakened (EoT)." />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_2" value="You can use your main action this turn to move 1 square into, out of, or through ground you are touching that can be burrowed through, and you are slowed (EoT)." />
-						<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_3" value="You can move 1 square into, out of, or through ground you are touching that can be burrowed through." />
-						<input type="hidden" name="attr_claw_dirt_has_power_roll" value="on" />
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="claw-dirt" name="attr_claw_dirt_name" value="Claw Dirt" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="claw-dirt-keywords" name="attr_claw_dirt_keywords" value="" />
+					<input type="hidden" name="attr_claw_dirt_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_claw_dirt_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_claw_dirt_target" value="Self" />
+					<input type="hidden" class="power-roll-characteristic" data-i18n-placeholder="might" name="attr_claw_dirt_characteristic" value="might" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_1" value="You can move 1 square into, out of, or through ground you are touching that can be burrowed through, and you are slowed and weakened (EoT)." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_2" value="You can use your main action this turn to move 1 square into, out of, or through ground you are touching that can be burrowed through, and you are slowed (EoT)." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_claw_dirt_tier_3" value="You can move 1 square into, out of, or through ground you are touching that can be burrowed through." />
+					<input type="hidden" name="attr_claw_dirt_has_power_roll" value="on" />
 						
-						<button type="action" data-i18n-title="ability-share" name="act_claw_dirt_share">
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_claw_dirt_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Claw Dirt" name="attr_claw_dirt_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="claw-dirt-keywords" name="attr_claw_dirt_keywords"></span>
-						<span class="ability-type read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_claw_dirt_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_claw_dirt_target" ></span>
-						<div class="read-power-roll">
-							<div class="power-roll-mods">
-								<label>2d10</label>
-								<span>+</span>
-								<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_claw_dirt_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_claw_dirt_power_roll_share">
-									<!-- Dice pic -->
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-								</button>
+						<span class="ability-name" name="attr_claw_dirt_name"></span>
+						<div class="ability-details"> 						
+							<span class="ability-keywords" name="attr_claw_dirt_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							
+							<span class="ability-distance" name="attr_claw_dirt_distance" ></span>
+							<span class="ability-target" name="attr_claw_dirt_target" ></span>
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_claw_dirt_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_claw_dirt_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_claw_dirt_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span class="power-roll-tier-effect" name="attr_claw_dirt_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span class="power-roll-tier-effect" name="attr_claw_dirt_tier_3" ></span>
 							</div>
-							<label class="sublabel">≤ 11</label>
-							<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_claw_dirt_tier_1" ></span>
-							<label class="sublabel">12-16</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_claw_dirt_tier_2" ></span>
-							<label class="sublabel">17+</label>
-							<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_claw_dirt_tier_3" ></span>
+							<span class="ability-effect" name="attr_claw_dirt_effect"></span>
 						</div>
-						<span class="ability-effect read-ability-effect" name="attr_claw_dirt_effect"></span>
 					</div>
 				</div>
-				<div class="aid-attack">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="aid-attack" name="attr_aid_attack_name" value="Aid Attack" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_aid_attack_keywords" value="-" />
-						<input type="hidden" name="attr_aid_attack_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_aid_attack_distance" value="Melee 1" />
-						<input type="text" class="ability-target" data-i18n-placeholder="one-creature" name="attr_aid_attack_target" value="One enemy" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_aid_attack_effect">A creature who uses the Aid Attack maneuver chooses an enemy adjacent to them. The next ability roll an ally makes against that enemy before the start of the aiding creature’s next turn gains an edge.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_aid_attack_share">
+				<!-- Aid Attack -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" name="attr_aid_attack_name" value="Aid Attack" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="heal-keywords" name="attr_aid_attack_keywords" value="" />
+					<input type="hidden" name="attr_aid_attack_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_aid_attack_distance" value="Melee 1" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_aid_attack_target" value="One enemy" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_aid_attack_effect" value="A creature who uses the Aid Attack maneuver chooses an enemy adjacent to them. The next ability roll an ally makes against that enemy before the start of the aiding creature’s next turn gains an edge." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_aid_attack_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Aid Attack" name="attr_aid_attack_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="aid-attack-keywords" name="attr_aid_attack_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_aid_attack_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_aid_attack_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_aid_attack_effect"></span>
+						<span class="ability-name" data-i18n-placeholder="Aid Attack" name="attr_aid_attack_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="aid-attack-keywords" name="attr_aid_attack_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							
+							<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_aid_attack_distance" ></span>
+							<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_aid_attack_target" ></span>
+							<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_aid_attack_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="catch-breath">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="catch-breath" name="attr_catch_breath_name" value="Catch Breath" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="catch-breath-keywords" name="attr_catch_breath_keywords" value="-" />
-						<input type="hidden" name="attr_catch_breath_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_catch_breath_distance" value="Self" />
-						<input type="text" class="ability-target" data-i18n-placeholder="self" name="attr_catch_breath_target" value="Self" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_catch_breath_effect">A creature who uses the Catch Breath maneuver spends a Recovery and regains Stamina equal to their recovery value. A creature who is dying can’t use the Catch Breath maneuver, but other creatures can help them spend Recoveries in other ways.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_catch_breath_share">
+				<!-- Catch Breath -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="catch-breath" name="attr_catch_breath_name" value="Catch Breath" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="catch-breath-keywords" name="attr_catch_breath_keywords" value="" />
+					<input type="hidden" name="attr_catch_breath_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_catch_breath_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_catch_breath_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_catch_breath_effect" value="A creature who uses the Catch Breath maneuver spends a Recovery and regains Stamina equal to their recovery value. A creature who is dying can’t use the Catch Breath maneuver, but other creatures can help them spend Recoveries in other ways." />
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_catch_breath_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Catch Breath" name="attr_catch_breath_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="catch-breath-keywords" name="attr_catch_breath_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_catch_breath_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_catch_breath_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_catch_breath_effect"></span>
+						<span class="ability-name" data-i18n-placeholder="Catch Breath" name="attr_catch_breath_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_catch_breath_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							<span class="ability-distance" name="attr_catch_breath_distance" ></span>
+							<span class="ability-target" name="attr_catch_breath_target" ></span>
+							<span class="ability-effect" name="attr_catch_breath_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="hiding">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="hide" name="attr_hide_name" value="Hide" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="hide-keywords" name="attr_hide_keywords" value="-" />
-						<input type="hidden" name="attr_hide_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_hide_distance" value="Self" />
-						<input type="text" class="ability-target" data-i18n-placeholder="self" name="attr_hide_target" value="Self" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_hide_effect">Using the Hide maneuver, a creature attempts to hide from other creatures who aren’t observing them while they have cover or concealment.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_hide_share">
+				<!-- Hide Maneuver -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="hide" name="attr_hide_name" value="Hide" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="hide-keywords" name="attr_hide_keywords" value="" />
+					<input type="hidden" name="attr_hide_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_hide_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_hide_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_hide_effect" value="Using the Hide maneuver, a creature attempts to hide from other creatures who aren’t observing them while they have cover or concealment." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_hide_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Hide" name="attr_hide_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="hide-keywords" name="attr_hide_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_hide_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_hide_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_hide_effect"></span>
+						<span class="ability-name" name="attr_hide_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_hide_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							<span class="ability-distance" name="attr_hide_distance" ></span>
+							<span class="ability-target" name="attr_hide_target" ></span>
+							<span class="ability-effect" name="attr_hide_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="search">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="search" name="attr_search_name" value="Search for Hidden Creatures" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="search-keywords" name="attr_search_keywords" value="-" />
-						<input type="hidden" name="attr_hide_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_search_distance" value="Self" />
-						<input type="text" class="ability-target" data-i18n-placeholder="self" name="attr_search_target" value="Self" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_search_effect">The Search for Hidden Creatures maneuver allows a creature to attempt to locate creatures hidden from them.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_search_share">
+				<!-- Search Maneuver -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="search" name="attr_search_name" value="Search for Hidden Creatures" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="search-keywords" name="attr_search_keywords" value="" />
+					<input type="hidden" name="attr_hide_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_search_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_search_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_search_effect" value="The Search for Hidden Creatures maneuver allows a creature to attempt to locate creatures hidden from them." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_search_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Search" name="attr_search_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="search-keywords" name="attr_search_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_search_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_search_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_search_effect"></span>
+						<span class="ability-name" name="attr_search_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_search_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							<span class="ability-distance" name="attr_search_distance" ></span>
+							<span class="ability-target" name="attr_search_target" ></span>
+							<span class="ability-effect" name="attr_search_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="standup">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="standup" name="attr_standup_name" value="Stand Up" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="standup-keywords" name="attr_standup_keywords" value="-" />
-						<input type="hidden" name="attr_hide_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_standup_distance" value="Self or Melee 1" />
-						<input type="text" class="ability-target" data-i18n-placeholder="self" name="attr_standup_target" value="Self or one creature" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_standup_effect">A creature can use the Stand Up maneuver to stand up if they are prone, ending that condition. Alternatively, they can use this maneuver to make a willing adjacent prone creature stand up.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_standup_share">
+				<!-- Stand Up -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="standup" name="attr_standup_name" value="Stand Up" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="standup-keywords" name="attr_standup_keywords" value="" />
+					<input type="hidden" name="attr_hide_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_standup_distance" value="Self or Melee 1" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_standup_target" value="Self or one creature" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_standup_effect" value="A creature can use the Stand Up maneuver to stand up if they are prone, ending that condition. Alternatively, they can use this maneuver to make a willing adjacent prone creature stand up." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_standup_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Stand up" name="attr_standup_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="standup-keywords" name="attr_standup_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_standup_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_standup_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_standup_effect"></span>
+						<span class="ability-name" name="attr_standup_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_standup_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							<span class="ability-distance" name="attr_standup_distance" ></span>
+							<span class="ability-target" name="attr_standup_target" ></span>
+							<span class="ability-effect" name="attr_standup_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="consumable">
-					<input class="ability-edit" type="checkbox" id="ability-edit"/>
-					<span class="ability-edit-label">Edit</span>
-					<div class="ability-card">
-						<input type="text" class="ability-name" data-i18n-placeholder="consumable" name="attr_consumable_name" value="Use Consumable" />
-						<input type="text" class="ability-keywords" data-i18n-placeholder="consumable-keywords" name="attr_consumable_keywords" value="-" />
-						<input type="hidden" name="attr_hide_type" value="Maneuver" />
-						<select class="ability-type" disabled>
-							<option value="Maneuver" data-i18n="maneuver"></option>
-						</select>
-						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_consumable_distance" value="Self or Melee 1" />
-						<input type="text" class="ability-target" data-i18n-placeholder="self" name="attr_consumable_target" value="Self or one creature" />
-						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_consumable_effect">Unless otherwise noted in its description, a creature can activate a consumable treasure such as a potion with the Use Consumable maneuver. A creature can use this maneuver to administer a consumable treasure that benefits the user either to themself or to a willing adjacent creature.</textarea>
-					</div>
-					<div class="read-ability-card panel-dark">
-						<button type="action" data-i18n-title="ability-share" name="act_standup_share">
+				<!-- Use Consumable -->
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="consumable" name="attr_consumable_name" value="Use Consumable" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="consumable-keywords" name="attr_consumable_keywords" value="" />
+					<input type="hidden" name="attr_hide_type" value="maneuver" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_consumable_distance" value="Self or Melee 1" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="self" name="attr_consumable_target" value="Self or one creature" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_consumable_effect" value="Unless otherwise noted in its description, a creature can activate a consumable treasure such as a potion with the Use Consumable maneuver. A creature can use this maneuver to administer a consumable treasure that benefits the user either to themself or to a willing adjacent creature." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_standup_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Use consumable" name="attr_consumable_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="consumable-keywords" name="attr_consumable_keywords"></span>
-						<span class="read-ability-type" data-i18n="maneuver"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_consumable_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_consumable_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_consumable_effect"></span>
+						<span class="ability-name" name="attr_consumable_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_consumable_keywords"></span>
+							<span class="ability-type" data-i18n="maneuver"></span>
+							<span class="ability-distance" name="attr_consumable_distance" ></span>
+							<span class="ability-target" name="attr_consumable_target" ></span>
+							<span class="ability-effect" name="attr_consumable_effect"></span>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
+		<!-- Triggered Abilities-->
 		<div class="sheet-triggered">
-			<!-- Triggered Actions-->
 		    <h2 data-i18n="triggered"></h2>
+			<!-- Triggered: repeating_triggered -->
 			<fieldset class="repeating_triggered">
 				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<div class="ability-card card-edit">
 					<input type="text" class="ability-name" data-i18n-placeholder="ability-name" name="attr_triggered_name" />
 					<div class="ability-cost-input-group">
 						<label data-i18n="ability-cost"></label>
 						<input type="number" name="attr_triggered_cost" />
 					</div>
-					<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_triggered_description" />
-					<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_triggered_keywords" />
-					<select class="ability-type" name="attr_triggered_type">
-						<option value="triggered-action" data-i18n="triggered-action"></option>
-						<option value="free-triggered-action" data-i18n="free-triggered-action"></option>
-					</select>
-					<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_triggered_distance" />
-					<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_triggered_target" />
-					<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_triggered_trigger"></textarea>
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<input type="checkbox" name="attr_has_power_roll" checked />
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="ability-type" name="attr_triggered_characteristic">
-								<option value="might" data-i18n="might"></option>
-								<option value="agility" data-i18n="agility"></option>
-								<option value="reason" data-i18n="reason"></option>
-								<option value="intuition" data-i18n="intuition"></option>
-								<option value="presence" data-i18n="presence"></option>
-							</select>
+					<div class="ability-details">
+						<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_triggered_description" />
+						<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_triggered_keywords" />
+						<select class="ability-type" name="attr_triggered_type">
+							<option value="triggered-action" data-i18n="triggered-action"></option>
+							<option value="free-triggered-action" data-i18n="free-triggered-action"></option>
+						</select>
+						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_triggered_distance" />
+						<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_triggered_target" />
+						<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_triggered_trigger"></textarea>
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<input type="checkbox" name="attr_has_power_roll" checked />
+								<label data-i18n="power-roll"></label>
+								<span>+</span>
+								<select class="ability-type" name="attr_triggered_characteristic">
+								  <option value="might" data-i18n="might"></option>
+								  <option value="agility" data-i18n="agility"></option>
+								  <option value="reason" data-i18n="reason"></option>
+								  <option value="intuition" data-i18n="intuition"></option>
+								  <option value="presence" data-i18n="presence"></option>
+								</select>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_1" />
+							<label class="sublabel">12-16</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_2" />
+							<label class="sublabel">17+</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_3" />
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_1" />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_2" />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_triggered_tier_3" />
+						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_triggered_effect"></textarea>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_triggered_effect"></textarea>
 				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_share">
+				<div class="ability-card card-display">
+					<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_share">
 						<!-- speech balloon -->
 						&#128172;
 					</button>
-					<div class="read-ability-name-cost">
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Ability Name" name="attr_triggered_name"></span>
-						<span class="ability-cost read-cardtext" name="attr_triggered_cost" data-i18n-placeholder="Cost"></span>
+					<span class="ability-name" name="attr_triggered_name"></span>
+					<div class="ability-cost">
+						<input type="hidden" name="attr_triggered_cost" />
+						<span data-i18n="ability-cost"></span>
+						<span>:&nbsp;</span>
+						<span name="attr_triggered_cost"></span>
 					</div>
-					<span class="ability-description read-ability-description" data-i18n-placeholder="Description" name="attr_triggered_description"></span>
+						&nbsp;
+					<div class="ability-details">
+						<span class="ability-description" name="attr_triggered_description"></span>
 				
-					<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="Keywords" name="attr_triggered_keywords"></span>
-					<span class="ability-type read-ability-type" data-i18n-placeholder="Ability Type" name="attr_triggered_type" data-i18n-dynamic></span>
-					
-					<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_triggered_distance" ></span>
-					<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_triggered_target" ></span>
-					<input class="ability-type" type="hidden" name="attr_triggered_type" />
-					<span class="ability-trigger" data-i18n-placeholder="trigger" name="attr_triggered_trigger"></span>
-					<input type="hidden" name="attr_has_power_roll" class="read-power-roll-flag" />
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_triggered_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+						<span class="ability-keywords" name="attr_triggered_keywords"></span>
+						<span class="ability-type" name="attr_triggered_type" data-i18n-dynamic></span>
+						
+						<span class="ability-distance" name="attr_triggered_distance" ></span>
+						<span class="ability-target" name="attr_triggered_target" ></span>
+						<input class="ability-type" type="hidden" name="attr_triggered_type" />
+						<span class="ability-trigger" name="attr_triggered_trigger"></span>
+						<input type="hidden" name="attr_has_power_roll" id="power-roll-flag" />
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<label>2d10</label>
+								<span>+</span>
+								<span class="power-roll-characteristic" data-i18n-dynamic name="attr_triggered_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
+									<!-- Dice pic -->
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+								</button>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_triggered_tier_1" ></span>
+							<label class="sublabel">12-16</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_triggered_tier_2" ></span>
+							<label class="sublabel">17+</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_triggered_tier_3" ></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_triggered_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_triggered_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_triggered_tier_3" ></span>
+						<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_triggered_effect"></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_triggered_effect"></span>
 				</div>
 			</fieldset>
 		</div>
+		<!-- No-Actions Abilities -->
 		<div class="sheet-noaction">
-			<!-- No-Actions Abilities -->
 		    <h2 data-i18n="no-action-trait"></h2>
+			<!-- No Actions/Traits: repeating_noaction -->
 			<fieldset class="repeating_noaction">
 				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<div class="ability-card card-edit">
 					<input type="text" class="ability-name" data-i18n-placeholder="ability-name" name="attr_noaction_name" />
 					<div class="ability-cost-input-group">
 						<label data-i18n="ability-cost"></label>
 						<input type="number" name="attr_noaction_cost" />
 					</div>
-					<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_noaction_description" />
-					<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_noaction_keywords" />
-					<input type="hidden" name="attr_moves_type" value="no-action" />
-					<span class="ability-type" data-i18n="no-action"></span>
+					<div class="ability-details">
+						<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_noaction_description" />
+						<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_noaction_keywords" />
+						<input type="hidden" name="attr_moves_type" value="no-action" />
+						<span class="ability-type" data-i18n="no-action"></span>
 					
-					<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_noaction_distance" />
-					<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_noaction_target" />
-					<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_noaction_trigger"></textarea>
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<input type="checkbox" name="attr_has_power_roll" checked />
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="ability-type" name="attr_noaction_characteristic">
-								<option value="might" data-i18n="might"></option>
-								<option value="agility" data-i18n="agility"></option>
-								<option value="reason" data-i18n="reason"></option>
-								<option value="intuition" data-i18n="intuition"></option>
-								<option value="presence" data-i18n="presence"></option>
-							</select>
+						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_noaction_distance" />
+						<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_noaction_target" />
+						<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_noaction_trigger"></textarea>
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<input type="checkbox" name="attr_has_power_roll" checked />
+								<label data-i18n="power-roll"></label>
+								<span>+</span>
+								<select class="ability-type" name="attr_noaction_characteristic">
+								  <option value="might" data-i18n="might"></option>
+								  <option value="agility" data-i18n="agility"></option>
+								  <option value="reason" data-i18n="reason"></option>
+								  <option value="intuition" data-i18n="intuition"></option>
+								  <option value="presence" data-i18n="presence"></option>
+								</select>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_1" />
+							<label class="sublabel">12-16</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_2" />
+							<label class="sublabel">17+</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_3" />
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_1" />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_2" />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_noaction_tier_3" />
+						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_noaction_effect"></textarea>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_noaction_effect"></textarea>
 				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_share">
+				<div class="ability-card card-display">
+					<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_share">
 						<!-- speech balloon -->
 						&#128172;
 					</button>
-					<div class="read-ability-name-cost">
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Ability Name" name="attr_noaction_name"></span>
-						<span class="ability-cost read-cardtext" name="attr_noaction_cost" data-i18n-placeholder="Cost"></span>
+					<span class="ability-name" name="attr_noaction_name"></span>
+					<div class="ability-cost">
+						<input type="hidden" name="attr_noaction_cost" />
+						<span data-i18n="ability-cost"></span>
+						<span>:&nbsp;</span>
+						<span name="attr_noaction_cost"></span>
 					</div>
-					<span class="ability-description read-ability-description" data-i18n-placeholder="Description" name="attr_noaction_description"></span>
+						&nbsp;
+					<div class="ability-details">
+						<span class="ability-description" name="attr_noaction_description"></span>
 				
-					<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="Keywords" name="attr_noaction_keywords"></span>
-					<span class="ability-type read-ability-type">&nbsp;</span>
-					
-					<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_noaction_distance" ></span>
-					<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_noaction_target" ></span>
-					<input class="ability-type" type="hidden" name="attr_noaction_type" />
-					<span class="ability-trigger" data-i18n-placeholder="trigger" name="attr_noaction_trigger"></span>
-					<input type="hidden" name="attr_has_power_roll" class="read-power-roll-flag" />
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_noaction_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+						<span class="ability-keywords" name="attr_noaction_keywords"></span>
+						<span class="ability-type"></span>
+						
+						<span class="ability-distance" name="attr_noaction_distance" ></span>
+						<span class="ability-target" name="attr_noaction_target" ></span>
+						<input class="ability-type" type="hidden" name="attr_noaction_type" />
+						<!--<span class="ability-trigger" name="attr_noaction_trigger"></span>-->
+						<input type="hidden" name="attr_has_power_roll" id="power-roll-flag" />
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<label>2d10</label>
+								<span>+</span>
+								<span class="power-roll-characteristic" data-i18n-dynamic name="attr_noaction_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
+									<!-- Dice pic -->
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+								</button>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_noaction_tier_1" ></span>
+							<label class="sublabel">12-16</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_noaction_tier_2" ></span>
+							<label class="sublabel">17+</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_noaction_tier_3" ></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_noaction_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_noaction_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_noaction_tier_3" ></span>
+						<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_noaction_effect"></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_noaction_effect"></span>
 				</div>
 			</fieldset>
-			<div class="default-noaction">
-			<div class="jump">
-				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
-					<input type="text" class="ability-name" data-i18n-placeholder="jump" name="attr_jump_name" value="Jump" />
+			<!-- Standard Abilities -->
+			<div class="standard-abilities">
+				<!-- Jump Move -->
+				<div class="standard-abilities-item">
+					<input type="hidden" data-i18n-placeholder="jump" name="attr_jump_name" value="Jump" />
 					<input type="hidden" name="attr_jump_type" value="no-action" />
+					<input type="hidden" name="attr_jump_has_power_roll" value="on" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_jump_tier_1" value="You don’t jump any farther than your baseline jump allows." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_jump_tier_2" value="You jump 1 square longer and higher than your baseline jump allows." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_jump_tier_3" value="You jump 2 squares longer and higher than your baseline jump allows." />
+					<input type="hidden" class="ability-effect" name="attr_jump_effect" value="You can’t jump farther or higher than the distance of the effect that allows you to move. You can’t jump out of difficult terrain or damaging terrain." />
 					
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="power-roll-characteristic" name="attr_jump_characteristic">
-								<option value="might" data-i18n="might">Might</option>
-								<option value="agility" data-i18n="agility">Agility</option>
-							</select>
+					<input class="ability-edit" type="checkbox" id="ability-edit"/>
+					<div class="ability-card card-edit">
+						<span class="ability-name" name="attr_jump_name"></span>
+						<div class="ability-details">
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label data-i18n="power-roll"></label>
+									<span>+</span>
+									<select class="ability-type" name="attr_jump_characteristic">
+										<option value="might" data-i18n="might"></option>
+										<option value="agility" data-i18n="agility"></option>
+									</select>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_jump_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_jump_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_jump_tier_3" ></span>
+							</div>
+							<span class="ability-effect" name="attr_jump_effect"></span>						
 						</div>
-						<label class="sublabel">≤11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_jump_tier_1" value="You don’t jump any farther than your baseline jump allows." />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_jump_tier_2" value="You jump 1 square longer and higher than your baseline jump allows." />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_jump_tier_3" value="You jump 2 squares longer and higher than your baseline jump allows." />
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_jump_effect">You can’t jump farther or higher than the distance of the effect that allows you to move. You can’t jump out of difficult terrain or damaging terrain</textarea>
-				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_jump_share">
-						<!-- speech balloon -->
-						&#128172;
-					</button>
-					<span class="ability-name read-ability-name" data-i18n-placeholder="Jump" name="attr_jump_name"></span>
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_jump_characteristic" ></span>
-							<button type="action" data-i18n-title="power-roll-share" name="act_jump_power_roll_share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_jump_share">
+							<!-- speech balloon -->
+							&#128172;
+						</button>
+						<span class="ability-name" name="attr_jump_name"></span>
+						<div class="ability-details">
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_jump_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_jump_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_jump_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_jump_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_jump_tier_3" ></span>
+							</div>
+							<span class="ability-effect" name="attr_jump_effect"></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_jump_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_jump_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_jump_tier_3" ></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_jump_effect"></span>
 				</div>
-			</div>
-			<div class="climb-creature">
-			<!-- Climb Creature Maneuver -->
-				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<!-- Climb Creature Maneuver -->
+				<div class="standard-abilities-item">
 					<input type="hidden" class="ability-name" data-i18n-placeholder="climb-creature" name="attr_climb_creature_name" value="Climbing Other Creatures" />
-					<span class="ability-name read-ability-name" data-i18n-placeholder="Climbing Other Creatures" name="attr_climb_creature_name"></span>
 					<input type="hidden" name="attr_climb_creature_type" value="no-action" />
-					<div class="power-roll">
-						<input type="hidden" name="attr_climb_creature_has_power_roll" value="on" />
-						<div class="power-roll-mods">
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="power-roll-characteristic" name="attr_climb_creature_characteristic">
-								<option value="might" data-i18n="might">Might</option>
-								<option value="agility" data-i18n="agility">Agility</option>
-							</select>
+					<input type="hidden" name="attr_climb_creature_has_power_roll" value="on" />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_1" value="You fail to climb the creature, and they can make a free strike against you." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_2" value="You fail to climb the creature." />
+					<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_3" value="You climb the creature." />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_climb_creature_effect" value="While you climb or ride a creature, you gain an edge on melee abilities used against them." />
+					
+					<input class="ability-edit" type="checkbox" id="ability-edit"/>
+					<div class="ability-card card-edit">
+						<span class="ability-name" name="attr_climb_creature_name"></span>
+						<div class="ability-details">
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label data-i18n="power-roll"></label>
+									<span>+</span>
+									<select class="ability-type" name="attr_climb_creature_characteristic">
+										<option value="might" data-i18n="might"></option>
+										<option value="agility" data-i18n="agility"></option>
+									</select>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_climb_creature_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_climb_creature_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_climb_creature_tier_3" ></span>
+							</div>
+							<span class="ability-effect" name="attr_climb_creature_effect"></span>						
 						</div>
-						<label class="sublabel">≤11</label>
-						<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_1" value="You fail to climb the creature, and they can make a free strike against you." />
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_climb_creature_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_2" value="You fail to climb the creature." />
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_climb_creature_tier_2" ></span>	
-						<label class="sublabel">17+</label>
-						<input type="hidden" class="power-roll-tier-effect" name="attr_climb_creature_tier_3" value="You climb the creature." />
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_climb_creature_tier_3" ></span>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_climb_creature_effect">While you climb or ride a creature, you gain an edge on melee abilities used against them.</textarea>
-				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_climb_creature_share">
-						<!-- speech balloon -->
-						&#128172;
-					</button>
-					<span class="ability-name read-ability-name" data-i18n-placeholder="Climbing Other Creatures" name="attr_climb_creature_name"></span>
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_climb_creature_characteristic" ></span>
-							<button type="action" data-i18n-title="power-roll-share" name="act_climb_creature_power_roll_share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_climb_creature_share">
+							<!-- speech balloon -->
+							&#128172;
+						</button>
+						<span class="ability-name" name="attr_climb_creature_name"></span>
+						<div class="ability-details">
+							<div class="power-roll">
+								<div class="power-roll-mods">
+									<label>2d10</label>
+									<span>+</span>
+									<span class="power-roll-characteristic" data-i18n-dynamic name="attr_climb_creature_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_climb_creature_power_roll_share">
+										<!-- Dice pic -->
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+										<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+									</button>
+								</div>
+								<label class="sublabel">≤ 11</label>
+								<span class="power-roll-tier-effect" name="attr_climb_creature_tier_1" ></span>
+								<label class="sublabel">12-16</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_climb_creature_tier_2" ></span>
+								<label class="sublabel">17+</label>
+								<span type="text" class="power-roll-tier-effect" name="attr_climb_creature_tier_3" ></span>
+							</div>
+							<span class="ability-effect" name="attr_climb_creature_effect"></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_climb_creature_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_climb_creature_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_climb_creature_tier_3" ></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_climb_creature_effect"></span>
 				</div>
 			</div>
-			</div>
 		</div>
+		<!-- Move Abilities -->
 		<div class="sheet-move">
-			<!-- Move Abilities -->
 		    <h2 data-i18n="move-actions"></h2>
+			<!-- Moves: repeating_moves -->
 			<fieldset class="repeating_moves">
 				<input class="ability-edit" type="checkbox" id="ability-edit"/>
-				<span class="ability-edit-label">Edit</span>
-				<div class="ability-card">
+				<div class="ability-card card-edit">
 					<input type="text" class="ability-name" data-i18n-placeholder="ability-name" name="attr_moves_name" />
 					<div class="ability-cost-input-group">
 						<label data-i18n="ability-cost"></label>
 						<input type="number" name="attr_moves_cost" />
 					</div>
-					<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_moves_description" />
-					<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_moves_keywords" />
-					<input type="hidden" name="attr_moves_type" value="move-action" />
-					<span class="ability-type" data-i18n="move-action"></span>
-					<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_moves_distance" />
-					<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_moves_target" />
-					<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_moves_trigger"></textarea>
-					<div class="power-roll">
-						<div class="power-roll-mods">
-							<input type="checkbox" name="attr_has_power_roll" checked />
-							<label data-i18n="power-roll"></label>
-							<span>+</span>
-							<select class="ability-type" name="attr_moves_characteristic">
-								<option value="might" data-i18n="might"></option>
-								<option value="agility" data-i18n="agility"></option>
-								<option value="reason" data-i18n="reason"></option>
-								<option value="intuition" data-i18n="intuition"></option>
-								<option value="presence" data-i18n="presence"></option>
-							</select>
+					<div class="ability-details">
+						<input type="text" class="ability-description" data-i18n-placeholder="ability-description" name="attr_moves_description" />
+						<input type="text" class="ability-keywords" data-i18n-placeholder="keywords" name="attr_moves_keywords" />
+						<input type="hidden" name="attr_moves_type" value="move-action" />
+						<span class="ability-type" data-i18n="main-action"></span>
+					
+						<input type="text" class="ability-distance" data-i18n-placeholder="distance" name="attr_moves_distance" />
+						<input type="text" class="ability-target" data-i18n-placeholder="target" name="attr_moves_target" />
+						<textarea class="ability-trigger triggered-show" data-i18n-placeholder="trigger" name="attr_moves_trigger"></textarea>
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<input type="checkbox" name="attr_has_power_roll" checked />
+								<label data-i18n="power-roll"></label>
+								<span>+</span>
+								<select class="ability-type" name="attr_moves_characteristic">
+								  <option value="might" data-i18n="might"></option>
+								  <option value="agility" data-i18n="agility"></option>
+								  <option value="reason" data-i18n="reason"></option>
+								  <option value="intuition" data-i18n="intuition"></option>
+								  <option value="presence" data-i18n="presence"></option>
+								</select>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_1" />
+							<label class="sublabel">12-16</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_2" />
+							<label class="sublabel">17+</label>
+							<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_3" />
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_1" />
-						<label class="sublabel">12-16</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_2" />
-						<label class="sublabel">17+</label>
-						<input type="text" class="power-roll-tier-effect" name="attr_moves_tier_3" />
+						<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_moves_effect"></textarea>
 					</div>
-					<textarea class="ability-effect" data-i18n-placeholder="effect" name="attr_moves_effect"></textarea>
 				</div>
-				<div class="read-ability-card panel-dark">
-					<button type="action" data-i18n-title="ability-share" name="act_share">
+				<div class="ability-card card-display">
+					<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_share">
 						<!-- speech balloon -->
 						&#128172;
 					</button>
-					<div class="read-ability-name-cost">
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Ability Name" name="attr_moves_name"></span>
-						<span class="ability-cost read-cardtext" name="attr_moves_cost" data-i18n-placeholder="Cost"></span>
+					<span class="ability-name" name="attr_moves_name"></span>
+					<div class="ability-cost">
+						<input type="hidden" name="attr_moves_cost" />
+						<span data-i18n="ability-cost"></span>
+						<span>:&nbsp;</span>
+						<span name="attr_moves_cost"></span>
 					</div>
-					<span class="ability-description read-ability-description" data-i18n-placeholder="Description" name="attr_moves_description"></span>
+						&nbsp;
+					<div class="ability-details">
+						<span class="ability-description" name="attr_moves_description"></span>
 				
-					<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="Keywords" name="attr_moves_keywords"></span>
-					<span class="ability-type read-ability-type" data-i18n-placeholder="Ability Type" name="attr_moves_type" data-i18n-dynamic></span>
-					
-					<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_moves_distance" ></span>
-					<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_moves_target" ></span>
-					<input class="ability-type" type="hidden" name="attr_moves_type" />
-					<span class="ability-trigger" data-i18n-placeholder="trigger" name="attr_moves_trigger"></span>
-					<input type="hidden" name="attr_has_power_roll" class="read-power-roll-flag" />
-					<div class="read-power-roll">
-						<div class="power-roll-mods">
-							<label>2d10</label>
-							<span>+</span>
-							<span class="power-roll-characteristic read-ability-characteristic" data-i18n-dynamic name="attr_moves_characteristic" ></span>
-								<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
-								<!-- Dice pic -->
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
-								<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
-							</button>
+						<span class="ability-keywords" name="attr_moves_keywords"></span>
+						<span class="ability-type" name="attr_moves_type" data-i18n-dynamic></span>
+						
+						<span class="ability-distance" name="attr_moves_distance" ></span>
+						<span class="ability-target" name="attr_moves_target" ></span>
+						<input class="ability-type" type="hidden" name="attr_moves_type" />
+						<!--<span class="ability-trigger" name="attr_moves_trigger"></span>-->
+						<input type="hidden" name="attr_has_power_roll" id="power-roll-flag" />
+						<div class="power-roll">
+							<div class="power-roll-mods">
+								<label>2d10</label>
+								<span>+</span>
+								<span class="power-roll-characteristic" data-i18n-dynamic name="attr_moves_characteristic" ></span>
+									<button type="action" data-i18n-title="power-roll-share" name="act_power-roll-share">
+									<!-- Dice pic -->
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;">
+									<img src="https://game-icons.net/icons/ffffff/000000/1x1/skoll/d10.svg" alt="Roll Dice" style="width:32px; height:32px;"> 
+								</button>
+							</div>
+							<label class="sublabel">≤ 11</label>
+							<span class="power-roll-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_moves_tier_1" ></span>
+							<label class="sublabel">12-16</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_moves_tier_2" ></span>
+							<label class="sublabel">17+</label>
+							<span type="text" class="power-roll-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_moves_tier_3" ></span>
 						</div>
-						<label class="sublabel">≤ 11</label>
-						<span class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 1 effect" name="attr_moves_tier_1" ></span>
-						<label class="sublabel">12-16</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 2 effect" name="attr_moves_tier_2" ></span>
-						<label class="sublabel">17+</label>
-						<span type="text" class="power-roll-tier-effect read-ability-tier-effect" data-i18n-placeholder="Tier 3 effect" name="attr_moves_tier_3" ></span>
+						<span class="ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_moves_effect"></span>
 					</div>
-					<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_moves_effect"></span>
 				</div>
 			</fieldset>
-			<div class="default-moves">
-				<div class="advance">
+			<!-- Standard Moves -->
+			<div class="standard-abilities">
 				<!-- Advance Move Action -->
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="advance" name="attr_advance_name" value="Advance" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="advance-keywords" name="attr_advance_keywords" value="-" />
-						<input type="hidden" name="attr_advance_type" value="move-action" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_advance_distance" value="Self" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_advance_target" value="Self" />
-						<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_advance_effect" value="When a creature takes the Advance move action, they move a number of squares up to their speed. They can break up this movement with their maneuver and main action however they wish." />
-						<button type="action" data-i18n-title="ability-share" name="act_advance_share">
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="advance" name="attr_advance_name" value="Advance" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="advance-keywords" name="attr_advance_keywords" value="" />
+					<input type="hidden" name="attr_advance_type" value="move-action" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_advance_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_advance_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_advance_effect" value="When a creature takes the Advance move action, they move a number of squares up to their speed. They can break up this movement with their maneuver and main action however they wish." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_advance_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Advance" name="attr_advance_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="advance-keywords" name="attr_advance_keywords"></span>
-						<span class="read-ability-type" data-i18n="move-action"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_advance_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_advance_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_advance_effect"></span>
+						<span class="ability-name" name="attr_advance_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_advance_keywords"></span>
+							<span class="ability-type" data-i18n="move-action"></span>
+							<span class="ability-distance" name="attr_advance_distance" ></span>
+							<span class="ability-target" name="attr_advance_target" ></span>
+							<span class="ability-effect" name="attr_advance_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="disengage">
 				<!--Disengage Move Action -->
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="disengage" name="attr_disengage_name" value="Disengage" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="disengage-keywords" name="attr_disengage_keywords" value="-" />
-						<input type="hidden" name="attr_disengage_type" value="move-action" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_disengage_distance" value="Self" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_disengage_target" value="Self" />
-						<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_disengage_effect" value="When a creature takes the Disengage move action, they can shift 1 square. Certain class features, kits, and other rules allow a creature to shift more than 1 square when they disengage. A creature who does so can break up their shift with their maneuver and main action however they wish." />
-						<button type="action" data-i18n-title="ability-share" name="act_disengage_share">
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="disengage" name="attr_disengage_name" value="Disengage" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="disengage-keywords" name="attr_disengage_keywords" value="" />
+					<input type="hidden" name="attr_disengage_type" value="move-action" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_disengage_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_disengage_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_disengage_effect" value="When a creature takes the Disengage move action, they can shift 1 square. Certain class features, kits, and other rules allow a creature to shift more than 1 square when they disengage. A creature who does so can break up their shift with their maneuver and main action however they wish." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_disengage_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Disengage" name="attr_disengage_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="disengage-keywords" name="attr_disengage_keywords"></span>
-						<span class="read-ability-type" data-i18n="move-action"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_disengage_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_disengage_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_disengage_effect"></span>
+						<span class="ability-name" name="attr_disengage_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords read-ability-keywords" name="attr_disengage_keywords"></span>
+							<span class="ability-type" data-i18n="move-action"></span>
+							<span class="ability-distance" name="attr_disengage_distance" ></span>
+							<span class="ability-target" name="attr_disengage_target" ></span>
+							<span class="ability-effect"  name="attr_disengage_effect"></span>
+						</div>
 					</div>
 				</div>
-				<div class="ride">
 				<!-- Ride Move Action -->
-					<div class="read-ability-card panel-dark">
-						<input type="hidden" class="ability-name" data-i18n-placeholder="ride" name="attr_ride_name" value="Ride" />
-						<input type="hidden" class="ability-keywords" data-i18n-placeholder="ride-keywords" name="attr_ride_keywords" value="-" />
-						<input type="hidden" name="attr_ride_type" value="move-action" />
-						<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_ride_distance" value="Self" />
-						<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_ride_target" value="Self" />
-						<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_ride_effect" value="A creature can take the Ride move action only while mounted on another creature. When a creature takes the Ride move action, they cause their mount to move up to the mount’s speed, taking the rider with them. Alternatively, a creature can use the Ride move action to have their mount use the Disengage move action as a free triggered action. A creature can use the Ride move action only once per round. A mounted creature can only have this move action applied to them once per round. This movement can be broken with the rider’s maneuver and main action however they wish." />
-						<button type="action" data-i18n-title="ability-share" name="act_ride_share">
+				<div class="standard-abilities-item">
+					<input type="hidden" class="ability-name" data-i18n-placeholder="ride" name="attr_ride_name" value="Ride" />
+					<input type="hidden" class="ability-keywords" data-i18n-placeholder="ride-keywords" name="attr_ride_keywords" value="" />
+					<input type="hidden" name="attr_ride_type" value="move-action" />
+					<input type="hidden" class="ability-distance" data-i18n-placeholder="distance" name="attr_ride_distance" value="Self" />
+					<input type="hidden" class="ability-target" data-i18n-placeholder="one-creature" name="attr_ride_target" value="Self" />
+					<input type="hidden" class="ability-effect" data-i18n-placeholder="effect" name="attr_ride_effect" value="A creature can take the Ride move action only while mounted on another creature. When a creature takes the Ride move action, they cause their mount to move up to the mount’s speed, taking the rider with them. Alternatively, a creature can use the Ride move action to have their mount use the Disengage move action as a free triggered action. A creature can use the Ride move action only once per round. A mounted creature can only have this move action applied to them once per round. This movement can be broken with the rider’s maneuver and main action however they wish." />
+					
+					<div class="ability-card card-display">
+						<button type="action" class="ability-share-button" data-i18n-title="ability-share" name="act_ride_share">
 							<!-- speech balloon -->
 							&#128172;
 						</button>
-						<span class="ability-name read-ability-name" data-i18n-placeholder="Ride" name="attr_ride_name"></span>
-						<span class="ability-keywords read-ability-keywords" data-i18n-placeholder="ride-keywords" name="attr_ride_keywords"></span>
-						<span class="read-ability-type" data-i18n="move-action"></span>
-						
-						<span class="ability-distance read-ability-distance" data-i18n-placeholder="Distance" name="attr_ride_distance" ></span>
-						<span class="ability-target read-ability-target" data-i18n-placeholder="Target" name="attr_ride_target" ></span>
-						<span class="ability-effect read-ability-effect" data-i18n-placeholder="Effect: effect text" name="attr_ride_effect"></span>
+						<span class="ability-name" name="attr_ride_name"></span>
+						<div class="ability-details">
+							<span class="ability-keywords" name="attr_ride_keywords"></span>
+							<span class="ability-type" data-i18n="move-action"></span>
+							<span class="ability-distance" name="attr_ride_distance" ></span>
+							<span class="ability-target" name="attr_ride_target" ></span>
+							<span class="ability-effect" name="attr_ride_effect"></span>
+						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-	<div class="v-spacer"></div>
-	<div class="inventory-panel border minimizable panel-dark">
+	<!-- Inventory Panel -->
+	<div class="sheet-panel inventory-panel minimizable panel-dark">
 		<div class="minimize-control">
 			<input id="inventory-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="inventory-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -1621,21 +1741,24 @@
 		<div class="minimize-show">
 			<h5 data-i18n="inventory"></h5>
 		</div>
-		<div class="trinket-panel border">
+		<!-- Trinkets -->
+		<div class="sheet-panel-box trinket-panel">
 			<h5 class="panel-title" data-i18n="trinkets"></h5>
 			<fieldset class="repeating_trinkets">
-				<input type="text" name="attr_trinket_name" />
+				<input class="name-input" type="text" name="attr_trinket_name" />
 				<textarea name="attr_trinket_description"></textarea>
 			</fieldset>
 		</div>
-		<div class="consumable-panel border">
+		<!-- Consumables -->
+		<div class="sheet-panel-box consumable-panel">
 			<h5 class="panel-title" data-i18n="consumables"></h5>
 			<fieldset class="repeating_consumables">
-				<input type="text" name="attr_consumable_name" />
+				<input class="name-input" type="text" name="attr_consumable_name" />
 				<textarea name="attr_consumable_description"></textarea>
 			</fieldset>
 		</div>
-		<div class="level-treasure-panel border">
+		<!-- Leveled Treasures -->
+		<div class="sheet-panel-box level-treasure-panel">
 			<h5 class="panel-title" data-i18n="level-treasure"></h5>
 			<div class="carry-checks">
 				<span class="carry-label" data-i18n="carry-three-safely">carry three safely:</span>
@@ -1644,13 +1767,13 @@
 				<label><input type="checkbox" name="attr_carry_3" /></label>
 			</div>
 			<fieldset class="repeating_leveltreasure">
-				<input type="text" name="attr_leveltreasure_name" />
+				<input class="name-input" type="text" name="attr_leveltreasure_name" />
 				<textarea name="attr_leveltreasure_description"></textarea>
 			</fieldset>
 		</div>
 	</div>
-	<div class="v-spacer"></div>
-	<div class="projects-panel border minimizable panel-dark">
+	<!-- Projects Panel -->
+	<div class="sheet-panel projects-panel minimizable panel-dark">
 		<div class="minimize-control">
 			<input id="projects-minimize-checkbox" class="minimize" type="checkbox" checked />
 			<label for="projects-minimize-checkbox" data-i18n="minimize-label"></label>
@@ -1669,23 +1792,11 @@
 			</div>
 		</fieldset>
 	</div>
-	<div class="v-spacer"></div>
-	<div class="import-panel border minimizable">
-		<div class="minimize-control">
-			<input id="import-minimize-checkbox" class="minimize" type="checkbox" checked />
-			<label for="import-minimize-checkbox" data-i18n="minimize-label"></label>
-		</div>
-		<div class="minimize-show">
-			<h5 data-i18n="import"</h5>
-		</div>
-		<p>Paste the contents of the Forge Steel data export (*.ds-hero file) into the text box below, then click "Import".</p>
-		<p class="text-warning">This will overwrite attributes on this sheet. This cannot be undone.</p>
-		<textarea name="attr_forgesteel_json"></textarea>
-		<button type="action" name="act_import">Import</button>
-	</div>
 </div>
-<div class="npc-sheet-body panel-dark">
+<!-- NPC Sheet View -->
+<div class="npc-sheet-body">
 	<label class="npc-edit-icon" for="npc-edit-toggle">p</label><input class="npc-edit-toggle" type="checkbox" id="npc-edit-toggle" />
+	<!-- NPC Edit Form -->
 	<div class="npc-edit">
 		<div class="npc-edit-group npc-edit-text">
 			<label data-i18n="character-name" for="attr_character_name"></label>
@@ -1733,15 +1844,9 @@
 			<label data-i18n="presence" for="attr_presence"></label>
 			<input type="number" id="attr_presence" name="attr_presence" />
 		</div>
-		<div>
-			<span data-i18n="whisper-gm"></span>
-			<select name="attr_wtype">
-				<option value="" data-i18n="never-whisper-roll" selected></option>
-				<option value="?{Whisper?|Public Roll,|Whisper Roll,/w gm }" data-i18n="query-whisper-roll"></option>
-				<option value="/w gm " data-i18n="always-whisper-roll"></option>
-            		</select>	
-		</div>
+		
 	</div>
+	<!-- NPC Display -->
 	<div class="npc-display">
 		<div class="npc-header-panel npc-panel">
 			<div class="npc-name"><span name="attr_character_name"></span></div>
@@ -1812,7 +1917,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="npc-conditions npc-panel panel-dark">
+	<div class="npc-conditions npc-panel">
 		<h5 class="panel-title" data-i18n="conditions"></h5>
 		<fieldset class="repeating_conditions">
 			<input type="text" name="attr_condition_name" data-i18n-placeholder="condition" />
@@ -1826,10 +1931,11 @@
 			</div>
 		</fieldset>
 	</div>
-	<div class="npc-abilities-panel panel-dark">
+	<!-- NPC Abilities -->
+	<div class="npc-abilities-panel">
 		<fieldset class="repeating_npcabilities">
-			<input class="npc-ability-edit-toggle" type="checkbox" id="npc-ability-edit-toggle" />
-			<div class="npc-ability-card-edit">
+			<input class="ability-edit" type="checkbox" id="ability-edit" />
+			<div class="npc-ability-card card-edit">
 				<input type="text" class="npc-ability-name" data-i18n-placeholder="ability-name" name="attr_ability_name" />
 				<select class="npc-ability-subtype-selector" name="attr_ability_subtype">
 					<option value="normal-ability" selected data-i18n="normal-ability"></option>
@@ -1906,8 +2012,8 @@
 					</div>
 				</div>			
 			</div>
-			<div class="npc-ability-card-display">
-				<button class="npc-ability-button" type="action" data-i18n-title="ability-share" name="act_share">
+			<div class="npc-ability-card card-display">
+				<button class="ability-share-button" type="action" data-i18n-title="ability-share" name="act_share">
 					<!-- speech balloon -->
 					&#128172;
 				</button>
@@ -1974,210 +2080,234 @@
 			</div>
 		</fieldset>
 	</div>
+</div>
+<!-- Disclaimer -->
 <div class="disclaimer">
 	<span data-i18n="disclaimer"></span>
 </div>
+<!-- Power Roll Roll Template -->
 <rolltemplate class="sheet-rolltemplate-powerroll">
-	<div class="character-name">
-		{{charactername}}
-	</div>
-	<div class="header">
-		{{name}}
-	</div>
-	<div class="powerroll-2d10">
-		<label>2d10:</label> {{2d10}}
-	</div>
-	<div class="powerroll-characteristic">
-		<label><span data-i18n="{{characteristic}}"></span>:</label> {{characteristicValue}}
-	</div>
-	{{#rollTotal() computed::isDoubleEdge 1}}
-	<div class="powerroll-edge-bane" data-i18n="double-edge"></div>
-	{{/rollTotal() computed::isDoubleEdge 1}}
-	{{#rollGreater() edgeBane 0}}
-	<div class="powerroll-edge-bane" data-i18n="edge"></div>
-	{{/rollGreater() edgeBane 0}}
-	{{#rollLess() edgeBane 0}}
-	<div class="powerroll-edge-bane" data-i18n="bane"></div>
-	{{/rollLess() edgeBane 0}}
-	{{#rollTotal() computed::isDoubleBane 1}}
-	<div class="powerroll-edge-bane" data-i18n="double-bane"></div>
-	{{/rollTotal() computed::isDoubleBane 1}}
-	{{#rollGreater() bonus 0}}
-	<div class="powerroll-bonus-penalty">
-		<label><span data-i18n="bonus"></span>:</label> {{bonus}}
-	</div>
-	{{/rollGreater() bonus 0}}
-	{{#rollLess() bonus 0}}
-	<div class="powerroll-bonus-penalty">
-		<label><span data-i18n="penalty"></span>:</label> {{bonus}}
-	</div>
-	{{/rollLess() bonus 0}}
-	{{#rollGreater() 2d10 18}}
-		<div class="powerroll-crit" data-i18n="critical-hit"></div>
-	{{/rollGreater() 2d10 18}}
-	<div class="powerroll-total">
-		<label><span data-i18n="power-roll-total"></span>:</label> {{total}}
-	</div>
-	<div class="powerroll-tier">
-		<label><span data-i18n="tier"></span>:</label> {{computed::tier}}
+	<div class="sheet-roll-container">
+		<div class="character-name">
+			{{charactername}}
+		</div>
+		<div class="header">
+			{{name}}
+		</div>
+		<div class="powerroll-2d10">
+			<label>2d10:</label> {{2d10}}
+		</div>
+		<div class="powerroll-characteristic">
+			<label><span data-i18n="{{characteristic}}"></span>:</label> {{characteristicValue}}
+		</div>
+		{{#rollTotal() computed::isDoubleEdge 1}}
+		<div class="powerroll-edge-bane" data-i18n="double-edge"></div>
+		{{/rollTotal() computed::isDoubleEdge 1}}
+		{{#rollGreater() edgeBane 0}}
+		<div class="powerroll-edge-bane" data-i18n="edge"></div>
+		{{/rollGreater() edgeBane 0}}
+		{{#rollLess() edgeBane 0}}
+		<div class="powerroll-edge-bane" data-i18n="bane"></div>
+		{{/rollLess() edgeBane 0}}
+		{{#rollTotal() computed::isDoubleBane 1}}
+		<div class="powerroll-edge-bane" data-i18n="double-bane"></div>
+		{{/rollTotal() computed::isDoubleBane 1}}
+		{{#rollGreater() bonus 0}}
+		<div class="powerroll-bonus-penalty">
+			<label><span data-i18n="bonus"></span>:</label> {{bonus}}
+		</div>
+		{{/rollGreater() bonus 0}}
+		{{#rollLess() bonus 0}}
+		<div class="powerroll-bonus-penalty">
+			<label><span data-i18n="penalty"></span>:</label> {{bonus}}
+		</div>
+		{{/rollLess() bonus 0}}
+		{{#rollGreater() 2d10 18}}
+			<div class="powerroll-crit" data-i18n="critical-hit"></div>
+		{{/rollGreater() 2d10 18}}
+		<div class="powerroll-total">
+			<label><span data-i18n="power-roll-total"></span>:</label> {{total}}
+		</div>
+		<div class="powerroll-tier">
+			<label><span data-i18n="tier"></span>:</label> {{computed::tier}}
+		</div>
 	</div>
 </rolltemplate>
+<!-- Ability Roll Template -->
 <rolltemplate class="sheet-rolltemplate-ability">
-	<div class="header">{{name}}</div>
-	<div class="description">{{description}}</div>
-	<div class="meta-row">
-		<div class="keywords">{{keywords}}</div>
-		<div class="action-type">{{type}}</div>
+	<div class="sheet-roll-container">
+		<div class="header">{{name}}</div>
+		<div class="description">{{description}}</div>
+		<div class="meta-row">
+			<div class="keywords">{{keywords}}</div>
+			<div class="action-type">{{type}}</div>
+		</div>
+		<div class="action-row">
+			{{#rollTotal() hasDistance 1}}
+			<div class="distance">
+				<!-- triangle-ruler -->
+					&#128208;{{distance}}
+			</div>
+			{{/rollTotal() hasDistance 1}}
+			{{#rollTotal() hasTarget 1}}
+			<div class="target">
+				<!-- bullseye -->
+					&#127919;{{target}}
+			</div>
+			{{/rollTotal() hasTarget 1}}
+		</div>
+		{{#rollTotal() hasTrigger 1}}
+		<div class="effect-block">
+			<div class="effect-label"><span data-i18n="trigger"></span>:</div>
+			<div class="effect-text">{{trigger}}</div>
+		</div>
+		{{/rollTotal() hasTrigger 1}}
+		{{#rollTotal() hasPowerRoll 1}}
+		<div class="stat-row">
+			<div class="roll-label">{{powerRoll}}:</div>
+			<span class="roll-formula">2d10 + {{characteristic}}</span>
+		</div>
+		<div class="tiers">
+			<div class="tier">
+				<span class="range">≤ 11</span>
+				<span class="damage">{{tier1}}</span>
+			</div>
+			<div class="tier">
+				<span class="range">12–16</span>
+				<span class="damage">{{tier2}}</span>
+			</div>
+			<div class="tier">
+				<span class="range">17+</span>
+				<span class="damage">{{tier3}}</span>
+			</div>
+		</div>
+		{{/rollTotal() hasPowerRoll 1}}
+		{{#rollTotal() hasEffect 1}}
+		<div class="effect-block">
+			<div class="effect-label"><span data-i18n="effect"></span>:</div>
+			<div class="effect-text">{{effect}}</div>
+		</div>
+		{{/rollTotal() hasEffect 1}}
 	</div>
-	<div class="action-row">
-		{{#rollTotal() hasDistance 1}}
-		<div class="distance">
-			<!-- triangle-ruler -->
+</rolltemplate>
+<!-- Monster Ability Roll Template -->
+<rolltemplate class="sheet-rolltemplate-monsterability">
+	<div class="sheet-roll-container">
+		<div class="character-name">
+			{{charactername}}
+		</div>
+		<div class="header">
+			{{name}}
+		</div>
+		<div class="subtype">
+			{{subtype}}
+		</div>
+		<div class="section">
+			{{#description}}
+			<div class="description">
+				{{description}}
+			</div>
+			{{/description}}
+			{{#rollTotal() hasTrait 1}}
+			<div class="trait">
+				{{trait}}
+			</div>
+			{{/rollTotal() hasTrait 1}}
+			{{#rollTotal() hasSolo 1}}
+			<div class="effect-block">
+				<div class="effect-label">{{solo1name}}</span>:</div>
+				<div class="effect-text">{{solo1text}}</div>
+			</div>
+			<div class="effect-block">
+				<div class="effect-label">{{solo2name}}</span>:</div>
+				<div class="effect-text">{{solo2text}}</div>
+			</div>
+			{{/rollTotal() hasSolo 1}}
+		</div>
+		<div class="meta-row">
+			<div class="keywords">{{keywords}}</div>
+			<div class="action-type">{{type}}</div>
+		</div>
+		<div class="action-row">
+			<div class="distance">
+			{{#distance}}
+				<!-- triangle-ruler -->
 				&#128208;{{distance}}
+				{{/distance}}
+			</div>
+			<div class="target">
+				{{#target}}
+				<!-- bullseye -->
+					&#127919;{{target}}
+				{{/target}}
+			</div>
 		</div>
-		{{/rollTotal() hasDistance 1}}
-		{{#rollTotal() hasTarget 1}}
-		<div class="target">
-			<!-- bullseye -->
-				&#127919;{{target}}
+		{{#rollTotal() hasTrigger 1}}
+		<div class="effect-block">
+			<div class="effect-label"><span data-i18n="trigger"></span>:</div>
+			<div class="effect-text">{{trigger}}</div>
 		</div>
-		{{/rollTotal() hasTarget 1}}
-	</div>
-	{{#rollTotal() hasTrigger 1}}
-	<div class="effect-block">
-		<div class="effect-label"><span data-i18n="trigger"></span>:</div>
-		<div class="effect-text">{{trigger}}</div>
-	</div>
-	{{/rollTotal() hasTrigger 1}}
-	{{#rollTotal() hasPowerRoll 1}}
-	<div class="stat-row">
-		<div class="roll-label">{{powerRoll}}:</div>
-		<span class="roll-formula">2d10 + {{characteristic}}</span>
-	</div>
-	<div class="tiers">
-		<div class="tier">
+		{{/rollTotal() hasTrigger 1}}
+		{{#rollTotal() hasPowerRoll 1}}
+		<div class="stat-row">
+			<div class="roll-label">{{powerRoll}}:</div>
+			<span class="roll-formula">2d10 + {{characteristic}}</span>
+		</div>
+		<div class="tiers">
 			<span class="range">≤ 11</span>
 			<span class="damage">{{tier1}}</span>
-		</div>
-		<div class="tier">
 			<span class="range">12–16</span>
 			<span class="damage">{{tier2}}</span>
-		</div>
-		<div class="tier">
 			<span class="range">17+</span>
 			<span class="damage">{{tier3}}</span>
 		</div>
-	</div>
-	{{/rollTotal() hasPowerRoll 1}}
-	{{#rollTotal() hasEffect 1}}
-	<div class="effect-block">
-		<div class="effect-label"><span data-i18n="effect"></span>:</div>
-		<div class="effect-text">{{effect}}</div>
-	</div>
-	{{/rollTotal() hasEffect 1}}
-</rolltemplate>
-<rolltemplate class="sheet-rolltemplate-monsterability">
-	<div class="character-name">{{charactername}}</div>
-	<div class="header">{{name}}</div>
-	<div class="subtype">
-		{{subtype}}
-	</div>
-	<div class="section">
-		{{#rollTotal() hasTrait 1}}
-		<div class="trait">
-			{{trait}}
-		</div>
-		{{/rollTotal() hasTrait 1}}
-		{{#rollTotal() hasSolo 1}}
+		{{/rollTotal() hasPowerRoll 1}}
+		{{#rollTotal() hasSpecial 1}}
 		<div class="effect-block">
-			<div class="effect-label">{{solo1name}}</span>:</div>
-			<div class="effect-text">{{solo1text}}</div>
+			<div class="effect-label"><span data-i18n="special"></span>:</div>
+			<div class="effect-text">{{special}}</div>
 		</div>
+		{{/rollTotal() hasSpecial 1}}
+		{{#rollTotal() hasEffect 1}}
 		<div class="effect-block">
-			<div class="effect-label">{{solo2name}}</span>:</div>
-			<div class="effect-text">{{solo2text}}</div>
+			<div class="effect-label"><span data-i18n="effect"></span>:</div>
+			<div class="effect-text">{{effect}}</div>
 		</div>
-		{{/rollTotal() hasSolo 1}}
-	</div>
-	<div class="meta-row">
-		<div class="keywords">{{keywords}}</div>
-		<div class="action-type">{{type}}</div>
-	</div>
-	<div class="action-row">
-		<div class="distance">
-		{{#distance}}
-			<!-- triangle-ruler -->
-			&#128208;{{distance}}
-			{{/distance}}
-		</div>
-		<div class="target">
-			{{#target}}
-			<!-- bullseye -->
-				&#127919;{{target}}
-			{{/target}}
+		{{/rollTotal() hasEffect 1}}
+		{{#rollTotal() hasMalprop 1}}
+		<div class="effect-block">
+			<div class="effect-label">{{malpropcost}}&nbsp;<span data-i18n="malice"></span>:</div>
+			<div class="effect-text">{{malprop}}</div>
 		</div>
+		{{/rollTotal() hasMalprop 1}}
 	</div>
-	{{#rollTotal() hasTrigger 1}}
-	<div class="effect-block">
-		<div class="effect-label"><span data-i18n="trigger"></span>:</div>
-		<div class="effect-text">{{trigger}}</div>
-	</div>
-	{{/rollTotal() hasTrigger 1}}
-	{{#rollTotal() hasPowerRoll 1}}
-	<div class="stat-row">
-		<div class="roll-label">{{powerRoll}}:</div>
-		<span class="roll-formula">2d10 + {{characteristic}}</span>
-	</div>
-	<div class="tiers">
-		<span class="range">≤ 11</span>
-		<span class="damage">{{tier1}}</span>
-		<span class="range">12–16</span>
-		<span class="damage">{{tier2}}</span>
-		<span class="range">17+</span>
-		<span class="damage">{{tier3}}</span>
-	</div>
-	{{/rollTotal() hasPowerRoll 1}}
-	{{#rollTotal() hasSpecial 1}}
-	<div class="effect-block">
-		<div class="effect-label"><span data-i18n="special"></span>:</div>
-		<div class="effect-text">{{special}}</div>
-	</div>
-	{{/rollTotal() hasSpecial 1}}
-	{{#rollTotal() hasEffect 1}}
-	<div class="effect-block">
-		<div class="effect-label"><span data-i18n="effect"></span>:</div>
-		<div class="effect-text">{{effect}}</div>
-	</div>
-	{{/rollTotal() hasEffect 1}}
-	{{#rollTotal() hasMalprop 1}}
-	<div class="effect-block">
-		<div class="effect-label">{{malpropcost}}&nbsp;<span data-i18n="malice"></span>:</div>
-		<div class="effect-text">{{malprop}}</div>
-	</div>
-	{{/rollTotal() hasMalprop 1}}
 </rolltemplate>
+<!-- Ability Power Roll -->
 <rolltemplate class="sheet-rolltemplate-abilitypowerroll">
-	<div class="character-name">{{charactername}}</div>
-	<div class="header">
-		{{name}}
-	</div>
-	<div class="powerroll-2d10">
-		<label><span data-i18n="power-roll">:</label> {{roll}}
-	</div>
-	<div class="powerroll-tier">
-		<label><span data-i18n="tier"></span>
-		{{#rollLess() roll 12}}
-		<span>1 (&le;11)</span>
-		{{/rollLess() roll 12}}
-		{{#rollBetween() roll 12 16}}
-		<span>2 (12-16)</span>
-		{{/rollBetween() roll 12 16}}
-		{{#rollGreater() roll 16}}
-		<span>3 (17+)</span>
-		{{/rollGreater() roll 16}}
-		</label>
+	<div class="sheet-roll-container">
+		<div class="character-name">{{charactername}}</div>
+		<div class="header">
+			{{name}}
+		</div>
+		<div class="powerroll-2d10">
+			<label><span data-i18n="power-roll">:</label> {{roll}}
+		</div>
+		<div class="powerroll-tier">
+			<label><span data-i18n="tier"></span>
+			{{#rollLess() roll 12}}
+			<span>1 (&le;11)</span>
+			{{/rollLess() roll 12}}
+			{{#rollBetween() roll 12 16}}
+			<span>2 (12-16)</span>
+			{{/rollBetween() roll 12 16}}
+			{{#rollGreater() roll 16}}
+			<span>3 (17+)</span>
+			{{/rollGreater() roll 16}}
+			</label>
+		</div>
 	</div>
 </rolltemplate>
+<!-- Sheet Workers -->
 <script type="text/worker">
 	function setActiveCharacterId(id) {
 		const ocid = getActiveCharacterId();
@@ -2423,6 +2553,7 @@
 		let trait = '';
 		let hasTrait = 0;
 		let characteristic = '';
+		let description = '';
 		
 		if (prefix === 'repeating_npcabilities') {
 			// NPC Ability Logic
@@ -2437,7 +2568,7 @@
 					break;
 			}
 			characteristic = attrs[`${prefix}_${abilityPrefix}characteristic`] || '';
-			trait = attrs[`${prefix}_${abilityPrefix}trait`];
+			trait = attrs[`${prefix}_${abilityPrefix}trait`] || '';
 			hasTrait = attrs[`${prefix}_${abilityPrefix}subtype`].includes('trait') && trait ? 1 : 0;
 			hasEffect = attrs[`${prefix}_has_effect`] === 'on' ? 1 : 0;
 		} else {
@@ -2446,7 +2577,7 @@
 			const cost = attrs[`${prefix}_${abilityPrefix}cost`];
 			subtype = cost && cost !== '0' ? `(${cost} ${resourceName})` : '';
 			characteristic = attrs[`${prefix}_${abilityPrefix}characteristic`] ? getTranslationByKey(attrs[`${prefix}_${abilityPrefix}characteristic`]) || '' : '';
-			trait = attrs[`${prefix}_${abilityPrefix}description`];
+			description = attrs[`${prefix}_${abilityPrefix}description`] || '';
 			hasTrait = 1;
 			hasEffect = attrs[`${prefix}_${abilityPrefix}effect`] ? 1 : 0;
 		}
@@ -2458,7 +2589,8 @@
 		directMap = {
 			name: attrs[`${prefix}_${abilityPrefix}name`],
 			subtype: subtype,
-			trait: trait || '',
+			trait: trait,
+			description: description,
 			type: type, 
 			keywords: attrs[`${prefix}_${abilityPrefix}keywords`] || '',
 			distance: attrs[`${prefix}_${abilityPrefix}distance`] || '',
@@ -2585,6 +2717,17 @@
 		handleAbilityShare('escape_grab', '');
 	});
 
+/**
+** Escape Grab Power Roll
+**/
+	on('clicked:escape_grab_power_roll_share', async (event) => {
+		const attrs = await getAttrsAsync([
+			'escape_grab_name',
+			'escape_grab_characteristic',
+		]);
+		rollPower(attrs.escape_grab_characteristic, attrs.escape_grab_name);
+	});
+	
 /**
 **Claw Dirt Display
 **/
@@ -2766,19 +2909,6 @@
 		featureDisplay(attrs.repeating_titles_title_name, subtitle, attrs.repeating_titles_title_description);
 	});
 
-// Looking for Power Roll for Ability Card
-	on("change:repeating_abilities:has_power_roll", function(event) {
-		const repeatingId = event.sourceAttribute.match(/repeating_abilities_[^_]+/)[0];
-		const sourceAttr = `${repeatingId}_has_power_roll`;
-		const targetAttr = `${repeatingId}_show_power_roll`;
-		getAttrs([sourceAttr], function(values) {
-			const show = values[sourceAttr] === "on" ? "1" : "0";
-			setAttrs({
-				[targetAttr]: show
-			});
-		});
-	});
-
 /** 
 ** Event Listeners
 **/
@@ -2822,10 +2952,8 @@
 // Melee Free Strike Power Roll
 
 	on('clicked:melee_power_roll_share', async (event) => {
-	  	const attrs = await getAttrsAsync(['melee_free_strike_characteristic']);
-		const mfsTranslation = getTranslationByKey('melee-free-strike');
-		console.log(attrs);
-		rollPower(attrs.melee_free_strike_characteristic, mfsTranslation);
+	  	const attrs = await getAttrsAsync(['melee_free_strike_characteristic','melee_free_strike_name']);
+		rollPower(attrs.melee_free_strike_characteristic, attrs.melee_free_strike_name);
 	});
 
 // Ranged Free Strike Display
@@ -2835,10 +2963,8 @@
 
 // Ranged Free Strike Power Roll
 	on('clicked:ranged_power_roll_share', async (event) => {
-		const attrs = await getAttrsAsync(['ranged_free_strike_characteristic']);
-		const rfsTranslation = getTranslationByKey('ranged-free-strike');
-		console.log(attrs);
-		rollPower(attrs.ranged_free_strike_characteristic, rfsTranslation);
+		const attrs = await getAttrsAsync(['ranged_free_strike_characteristic','ranged_free_strike_name']);
+		rollPower(attrs.ranged_free_strike_characteristic, attrs.ranged_free_strike_name);
 	});
 
 // Share Class Features
@@ -2895,6 +3021,32 @@
 		});
 	});
 
+// Winded Calculation
+	on("change:stamina_max sheet:opened", function() {  
+		getAttrs(["stamina_max"], function(values) {
+			let staminaMax = parseInt(values.stamina_max)||0;
+			let winded = Math.floor(staminaMax/2);
+			let dead = winded * -1;
+			setAttrs({                            
+				"stamina_winded": winded,
+				"stamina_dead": dead,			
+			});
+		});
+	});
+
+// Surge Calculation
+	on("change:might change:agility change:reason change:intuition change:presence sheet:opened", function() {
+		getAttrs(["might", "agility", "reason", "intuition", "presence"], function(attrs) {
+			let highest = 0;
+			for(const val of Object.values(attrs)) {
+				const num = parseInt(val) || 0;
+				highest = Math.max(highest, num);
+			}
+			setAttrs({
+				"surge_damage": highest,
+			});
+		});
+	});
 
 /**
 ** Import from Forge Steel Start