diff --git a/AGE System/AGE System.css b/AGE System/AGE System.css
index 2db060356d..47e9d8e616 100644
--- a/AGE System/AGE System.css	
+++ b/AGE System/AGE System.css	
@@ -6,7 +6,7 @@
 
 /* Configuration of Tabs */
 input.sheet-tab-button {
-		opacity: 0;	
+		opacity: 0;
 		position: absolute;
 		top: 92px;
 		right: 0px;
@@ -29,12 +29,12 @@ input.sheet-tab-button + span {
 		font-weight: bold;
 }
 
-input.sheet-tab-button:checked + span { 
+input.sheet-tab-button:checked + span {
 		color: #FFFFFF;
 		background-color: #000000;
 }
 
-.sheet-page { 
+.sheet-page {
 	display: none;
 }
 
@@ -46,12 +46,12 @@ input.sheet-tab-button.sheet-tab5:checked ~ .sheet-page.sheet-tab5,
 input.sheet-tab-button.sheet-tab6:checked ~ .sheet-page.sheet-tab6 { display: block; }
 
 button.sheet-floating-dice-roller {
-  border: none; 
+  border: none;
   background: transparent;
-  position: absolute; 
+  position: absolute;
   height: 24px;
   width: 24px;
-  top: 90px; 
+  top: 90px;
   left: 242px; }
 button.sheet-floating-dice-roller[type=roll]::before { font-size: 24px; }
 
@@ -137,9 +137,9 @@ input.sheet-tab-button.sheet-tab-whisper + span {
 }
 
 .sheet-header input[type=number]::-webkit-inner-spin-button,
-.sheet-header input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-header input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
 .sheet-header span {
@@ -275,7 +275,7 @@ input {
 }
 
 .repcontrol .repcontrol_edit:hover:after,
-.repcontrol .repcontrol_add:hover:before { 
+.repcontrol .repcontrol_add:hover:before {
     background-color: #EFEFEF;
 }
 
@@ -301,7 +301,7 @@ input {
     padding: 0px;
     height: 18px;
     width: 18px;
-} 
+}
 
 .sheet-container button[type=roll]::before {
 		content: 'Q';
@@ -316,7 +316,7 @@ input {
 .sheet-col-left-character-tab {
 	width: 325px;
 }
-	
+
 .sheet-col-right-character-tab {
 	width: 421px;
 }
@@ -332,14 +332,14 @@ input {
 		margin-bottom: 5px;
 }
 
-.sheet-left-ability-container { 
+.sheet-left-ability-container {
 		display: inline-block;
 		width: 267px;
 		border-right: 1px solid black;
 		min-height: 70px;
 }
 
-.sheet-ability-name { 
+.sheet-ability-name {
 		width: 250px;
 		display: inline-block;
 }
@@ -348,7 +348,7 @@ button.sheet-legacy-money-import-button,
 .sheet-autoconfig button[type=action],
 .sheet-initiative-section button[type=roll],
 .sheet-income-section button[type=roll],
-.sheet-ability-name button[type=roll] { 
+.sheet-ability-name button[type=roll] {
 		background-color: transparent;
 		color: white;
 		border: none;
@@ -377,7 +377,7 @@ button.sheet-legacy-money-import-button,
 .sheet-income-section button[type=roll]::before,
 .sheet-ability-name button[type=roll]::before,
 .sheet-ability-focus-list button[type=roll]::before,
-.sheet-spell-short-container button[type=roll]::before { 
+.sheet-spell-short-container button[type=roll]::before {
 		content: "";
 }
 
@@ -390,7 +390,7 @@ button.sheet-legacy-money-import-button,
 .sheet-ability-focus-list button[type=roll]:hover,
 .sheet-ability-focus-list button[type=roll]:hover *,
 .sheet-spell-short-container button[type=roll]:hover,
-.sheet-spell-short-container button[type=roll]:hover * { 
+.sheet-spell-short-container button[type=roll]:hover * {
 		color: #EC2127;
 }
 
@@ -402,7 +402,7 @@ button.sheet-legacy-money-import-button,
 .autoconfig { text-align: center; }
 
 .sheet-condition-checkbox,
-.sheet-primary-checkbox { 
+.sheet-primary-checkbox {
 		display: inline-block;
 		padding-bottom: 2px;
 }
@@ -457,8 +457,8 @@ button.sheet-legacy-money-import-button,
 
 .sheet-right-ability-container input[type=number]::-webkit-inner-spin-button,
 .sheet-right-ability-container input[type=number]::-webkit-outer-spin-button {
-		-webkit-appearance: none; 
-		margin: 0; 
+		-webkit-appearance: none;
+		margin: 0;
 }
 
 .sheet-right-ability-container input[type=number] {
@@ -591,7 +591,7 @@ button.sheet-legacy-money-import-button,
 		color: black;
 		font-size: 30px;
 		padding-right: 0px;
-		padding-left: 19px;	
+		padding-left: 19px;
 		padding-bottom: 0px;
 		padding-top: 7px;
 }
@@ -602,7 +602,7 @@ button.sheet-legacy-money-import-button,
 		padding-left: 10px;
 }
 
-.sheet-health .sheet-maximum-input span { 
+.sheet-health .sheet-maximum-input span {
 		height: 50px;
 		display: inline-block;
 		font-size: 10px;
@@ -615,7 +615,7 @@ button.sheet-legacy-money-import-button,
 		color: #A0A0A0;
 }
 
-.sheet-conviction-section .sheet-maximum-input span { 
+.sheet-conviction-section .sheet-maximum-input span {
 		height: 50px;
 		display: inline-block;
 		font-size: 10px;
@@ -630,7 +630,7 @@ button.sheet-legacy-money-import-button,
 
 .sheet-health input[name="attr_health"],
 .sheet-mana-section input[name="attr_mana"],
-.sheet-experience-points-section input[name="attr_experience-points"] { 
+.sheet-experience-points-section input[name="attr_experience-points"] {
 		display: inline-block;
 		width: 100%;
 		text-align: center;
@@ -644,12 +644,12 @@ button.sheet-legacy-money-import-button,
 		color: black;
 		font-size: 30px;
 		padding-right: 0px;
-		padding-left: 19px;	
+		padding-left: 19px;
 		padding-bottom: 0px;
 		padding-top: 7px;
 }
 
-.sheet-maximum-input span { 
+.sheet-maximum-input span {
 		height: 50px;
 		display: inline-block;
 		font-size: 10px;
@@ -662,7 +662,7 @@ button.sheet-legacy-money-import-button,
 		color: #A0A0A0;
 }
 
-.sheet-maximum-input input { 
+.sheet-maximum-input input {
 		display: inline-block;
 		border-bottom: 1px solid #B0B0B0;
 		border-top: 0px;
@@ -683,22 +683,22 @@ button.sheet-legacy-money-import-button,
 .sheet-maximum-input input[type=number]::-webkit-inner-spin-button,
 .sheet-maximum-input input[type=number]::-webkit-outer-spin-button,
 .sheet-experience-points-section input[type=number]::-webkit-inner-spin-button,
-.sheet-experience-points-section input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-experience-points-section input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
-.sheet-experience-points-section .sheet-maximum-input span { 
+.sheet-experience-points-section .sheet-maximum-input span {
 		margin-left: 62px;
 }
 
-.sheet-experience-points-section .sheet-maximum-input input { 
+.sheet-experience-points-section .sheet-maximum-input input {
 		width: 55px;
 }
 
 .sheet-health .sheet-maximum-input input[type=number],
 .sheet-mana-section .sheet-maximum-input input[type=number],
-.sheet-experience-points-section input[type=number] { 
+.sheet-experience-points-section input[type=number] {
 		-moz-appearance:textfield;
 }
 
@@ -706,7 +706,7 @@ button.sheet-legacy-money-import-button,
 		padding-right: 20px;
 }
 
-.sheet-sectionfull { 
+.sheet-sectionfull {
 		width: 419px;
 }
 
@@ -718,20 +718,20 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 .sheet-sdaat-container .sheet-sdaat-i { right: 92px; }
 .sheet-sdaat-container .sheet-sdaat-b { right: 6px; }
 
-.sheet-sdaat-container select { 
-                height: 20px; 
-                display: inline-block; 
-                background: transparent; 
-                border: none; 
+.sheet-sdaat-container select {
+                height: 20px;
+                display: inline-block;
+                background: transparent;
+                border: none;
                 font-size: 10px;
-                line-height: 9px; 
-                margin-left: 0; 
-                margin-right: 0; 
-                margin-top: 0; 
-                margin-right: 0; 
-                color: #A0A0A0; 
+                line-height: 9px;
+                margin-left: 0;
+                margin-right: 0;
+                margin-top: 0;
+                margin-right: 0;
+                color: #A0A0A0;
                 text-align: center;
-                width: 75px; 
+                width: 75px;
 }
 .sheet-sdaat-container .sheet-col-double { display: inline-block; width: 39%; }
 
@@ -768,11 +768,11 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 		margin-top: 2px;
 		margin-left: 2px;
 }
-.sheet-sdaat-container .sheet-sdaat-score input[name="attr_armor"], 
+.sheet-sdaat-container .sheet-sdaat-score input[name="attr_armor"],
 .sheet-sdaat-container .sheet-sdaat-score input[name="attr_toughness"],
-.sheet-sdaat-container .sheet-sdaat-score input[name="attr_armor-b"] { margin-left: 7.5px; }  
+.sheet-sdaat-container .sheet-sdaat-score input[name="attr_armor-b"] { margin-left: 7.5px; }
 .sheet-sdaat-container .sheet-col .sheet-maximum-input span { margin-left: 0; height: 24px; }
-.sheet-sdaat-container .sheet-col .sheet-maximum-input input { width: 35px; margin-left: 0; margin-top: -1px; height: 24px; } 
+.sheet-sdaat-container .sheet-col .sheet-maximum-input input { width: 35px; margin-left: 0; margin-top: -1px; height: 24px; }
 .sheet-sdaat-container .sheet-sdaat-score input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; }
 .sheet-sdaat-container .sheet-sdaat-score input[type=number] { -moz-appearance:textfield; }
 
@@ -786,7 +786,7 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 		width: 32.5%;
 }
 
-.sheet-speed-defense-score { 
+.sheet-speed-defense-score {
 		width: 100px;
 		height: 30px;
 		display: inline-block;
@@ -817,24 +817,24 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 		margin-left: 2px;
 }
 
-.sheet-speed-defense-score input[name="attr_armor"] { 
+.sheet-speed-defense-score input[name="attr_armor"] {
 		margin-left: 7.5px;
 }
 
 
-.sheet-speed-defense-armor-container .sheet-maximum-input span { 
+.sheet-speed-defense-armor-container .sheet-maximum-input span {
 		margin-left: 37px;
 }
 
 
 .sheet-speed-defense-armor-container .sheet-maximum-input input { width: 35px; margin-top: -1px; }
 .sheet-speed-defense-score input[type=number]::-webkit-inner-spin-button,
-.sheet-speed-defense-score input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-speed-defense-score input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
-.sheet-speed-defense-score input[type=number] { 
+.sheet-speed-defense-score input[type=number] {
 		-moz-appearance:textfield;
 }
 
@@ -843,7 +843,7 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 }
 
 .sheet-repeatingcol input,
-.sheet-col-weapon-groups input { 
+.sheet-col-weapon-groups input {
 		display: inline-block;
 		font-size: 12px;
 		border:none;
@@ -867,17 +867,17 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 .sheet-equipment-quantity input,
 .sheet-equipment-description input,
 .sheet-power-short-name input,
-.sheet-power-short-description input { 
+.sheet-power-short-description input {
 		width: 100%;
 }
 
-.sheet-col-attack-name { 
+.sheet-col-attack-name {
 		width: 158px;
 }
 
 .sheet-col-attack-range,
 .sheet-col-attack-reload,
-.sheet-col-attackdice { 
+.sheet-col-attackdice {
 		width: 55px;
 }
 
@@ -887,12 +887,12 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 }
 
 .sheet-col-ammo input[type=number]::-webkit-inner-spin-button,
-.sheet-col-ammo input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
+.sheet-col-ammo input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
 		margin: 0;
 }
 
-.sheet-money-score input[type=number] { 
+.sheet-money-score input[type=number] {
 		-moz-appearance:textfield;
 }
 
@@ -1017,7 +1017,7 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
                 margin-bottom: 0;
 }
 
-.sheet-money-section { 
+.sheet-money-section {
 		width: 100%;
 		border-top: 1px solid black;
 }
@@ -1025,7 +1025,7 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 .sheet-money-container { display: inline-block; height: 68px; width: 50px; }
 
 .sheet-legacy-money-section .sheet-money-score,
-.sheet-money-section .sheet-money-score { 
+.sheet-money-section .sheet-money-score {
 		display: inline-block;
 		border: 1px solid #666;
 		border-radius: 50%;
@@ -1063,7 +1063,7 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 .sheet-money-section .sheet-money-name input[type="text"] {
                 width: 100%;
                 font-size: 12px;
-                color: gray; 
+                color: gray;
                 border: none;
                 text-align: center;
                 box-shadow: none;
@@ -1074,12 +1074,12 @@ input.sheet-mana-section-checkbox:not(:checked) + input.sheet-exp-section-checkb
 .sheet-money-section fieldset + div > div { display: inline-block; }
 
 .sheet-money-score input[type=number]::-webkit-inner-spin-button,
-.sheet-money-score input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-money-score input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
-.sheet-money-score input[type=number] { 
+.sheet-money-score input[type=number] {
 		-moz-appearance:textfield;
 }
 
@@ -1191,46 +1191,46 @@ input.sheet-legacy-money-checkbox:checked ~ .sheet-page .sheet-legacy-money-sect
 */
 
 .sheet-row-shortpowerdescription textarea,
-.sheet-row-short-spell-description textarea { 
+.sheet-row-short-spell-description textarea {
 		height: 36px;
 }
 
 .sheet-row-fullpowerdescription textarea,
-.sheet-row-full-spell-description textarea { 
+.sheet-row-full-spell-description textarea {
 		height: 72px;
 }
 
 /* FOCUSES TAB */
-.sheet-tab4 .sheet-col { 
+.sheet-tab4 .sheet-col {
 		width: 247px;
 }
 
-.sheet-focus-section { 
+.sheet-focus-section {
 		display:inline-block;
 		width: 100%;
 }
 
-.sheet-focus-section-name { 
+.sheet-focus-section-name {
 		border: 1px solid black;
 }
 
-.sheet-focus-container span { 
+.sheet-focus-container span {
 		display: inline-block;
 		font-size: 12px;
 		font-weight: bold;
 }
 
-.sheet-focus-container input[name=attr_focusname] { 
+.sheet-focus-container input[name=attr_focusname] {
 		width: 158px;
 }
 
 .sheet-focus-container input[type=number]::-webkit-inner-spin-button,
-.sheet-focus-container input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-focus-container input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
-.sheet-focus-container input[type=number] { 
+.sheet-focus-container input[type=number] {
 		border-top: none;
 		border-left: none;
 		border-right: none;
@@ -1246,7 +1246,7 @@ input.sheet-legacy-money-checkbox:checked ~ .sheet-page .sheet-legacy-money-sect
 		-moz-appearance:textfield;
 }
 
-.sheet-focus-container textarea { 
+.sheet-focus-container textarea {
 		display: inline-block;
 		width: 247px;
 		height: 36px;
@@ -1259,7 +1259,7 @@ input.sheet-legacy-money-checkbox:checked ~ .sheet-page .sheet-legacy-money-sect
 
 /* MAGIC/ARCANA TAB */
 
-.sheet-spell-container { 
+.sheet-spell-container {
 		width: 748px;
 }
 
@@ -1279,21 +1279,21 @@ select.sheet-spell-method option { background-color: white; color: black; }
 
 .sheet-spell-container .sheet-spell-uses-fatigue input[type=text] { width: 132px; }
 
-.sheet-col-spell-stats { 
+.sheet-col-spell-stats {
 		width: 245px;
 }
 
-.sheet-col-spell-stats .sheet-row { 
+.sheet-col-spell-stats .sheet-row {
 		height: 20px;
 }
 
-.sheet-spell-stats span { 
+.sheet-spell-stats span {
 		font-size: 12px;
 		font-weight: bold;
 		margin: 0px;
 }
 
-.sheet-spell-stats input { 
+.sheet-spell-stats input {
 		width: 148px;
 		border-top: none;
 		border-left: none;
@@ -1315,9 +1315,9 @@ select.sheet-spell-method option { background-color: white; color: black; }
 }
 
 .sheet-spell-stats input[type=number]::-webkit-inner-spin-button,
-.sheet-spell-stats input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
-		margin: 0; 
+.sheet-spell-stats input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
 }
 
 .sheet-spell-stats button[type=roll] {
@@ -1354,7 +1354,7 @@ select.sheet-spell-method option { background-color: white; color: black; }
   width: 50px;
 }
 
-input[type=checkbox].sheet-hiddencheckbox  { 
+input[type=checkbox].sheet-hiddencheckbox  {
 		display:none
 }
 
@@ -1365,8 +1365,9 @@ input[type=checkbox].sheet-hiddencheckbox  {
 
 input.sheet-threefold-button:checked ~ .sheet-magic-tab-span,
 input.sheet-world-of-lazarus-button:checked ~ .sheet-magic-tab-span,
+input.sheet-the-expanse-button:checked ~ .sheet-magic-tab-span,
 input.sheet-modern-age-button:checked ~ .sheet-magic-tab-span,
-input.sheet-blue-rose-button:checked ~ .sheet-magic-tab-span { 
+input.sheet-blue-rose-button:checked ~ .sheet-magic-tab-span {
 		display: none;
 }
 
@@ -1435,7 +1436,7 @@ input.sheet-modern-age-button:checked ~ input.sheet-tab-button.sheet-tab4 + span
 }
 
 input.sheet-blue-rose-button:checked ~ .sheet-arcana-tab-span,
-input.sheet-blue-rose-button:checked ~ .sheet-tab-button.sheet-tab5 { 
+input.sheet-blue-rose-button:checked ~ .sheet-tab-button.sheet-tab5 {
 		display: block;
 		position: absolute;
 		top: 92px;
@@ -1458,7 +1459,7 @@ input.sheet-threefold-button:checked ~ .sheet-extraordinary-tab-span,
 input.sheet-modern-age-button:checked ~ .sheet-extraordinary-tab-span,
 input.sheet-threefold-button:checked ~ .sheet-tab-button.sheet-tab5,
 input.sheet-world-of-lazarus-button:checked ~ .sheet-tab-button.sheet-tab5,
-input.sheet-modern-age-button:checked ~ .sheet-tab-button.sheet-tab5 { 
+input.sheet-modern-age-button:checked ~ .sheet-tab-button.sheet-tab5 {
 		display: block;
 		position: absolute;
 		top: 92px;
@@ -1499,7 +1500,7 @@ input.sheet-black-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked
 input.sheet-red-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-red-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-red-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-red-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-red-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 		background-color: #810206;
 }
 
@@ -1507,7 +1508,7 @@ input.sheet-red-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-teal1-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-teal1-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-teal1-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-teal1-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-teal1-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 		background-color: #00576B;
 }
 
@@ -1523,7 +1524,7 @@ input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-blue1-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-blue1-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-blue1-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-blue1-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-blue1-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 		background-color: #007ab8;
 }
 
@@ -1531,7 +1532,7 @@ input.sheet-blue1-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-blue2-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-blue2-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-blue2-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-blue2-color-checkbox:checked ~ .sheet-page .sheet-section-name { 
+input.sheet-blue2-color-checkbox:checked ~ .sheet-page .sheet-section-name {
 		background-color: #006496;
 }
 
@@ -1539,7 +1540,7 @@ input.sheet-blue2-color-checkbox:checked ~ .sheet-page .sheet-section-name {
 input.sheet-orange-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-orange-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-orange-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-orange-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-orange-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: radial-gradient(ellipse at top, #bc610e, #431c00);
 }
 
@@ -1547,7 +1548,7 @@ input.sheet-orange-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-threefold-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-threefold-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-threefold-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-threefold-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-threefold-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: linear-gradient(135deg, #00658D, #2A828E, #87641B, #c79846, #851c07);
 }
 
@@ -1555,7 +1556,7 @@ input.sheet-threefold-color-checkbox:checked ~ .sheet-page .sheet-section-name
 input.sheet-rainbow-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-rainbow-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-rainbow-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-rainbow-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-rainbow-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: radial-gradient(circle at bottom left, mediumvioletred, firebrick, darkorange, darkkhaki, forestgreen, blue, darkviolet);
 }
 
@@ -1563,7 +1564,7 @@ input.sheet-rainbow-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-green-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-green-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-green-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-green-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-green-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: radial-gradient(circle at center, #1d8514, #1d8514, black);
 }
 
@@ -1572,7 +1573,7 @@ input.sheet-green-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-dragon-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-dragon-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-dragon-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-dragon-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-dragon-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: url("https://i.imgur.com/ZiUOVSE.jpg");
 }
 
@@ -1580,7 +1581,7 @@ input.sheet-dragon-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-lazarus-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-lazarus-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-lazarus-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-lazarus-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-lazarus-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: radial-gradient(circle at center, #3A8BCC, #124179);
 }
 
@@ -1588,25 +1589,25 @@ input.sheet-lazarus-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab-button:checked + span,
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span,
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab-button.sheet-tab5:checked + span + span + span,
-input.sheet-stars-color-checkbox:checked ~ .sheet-page .sheet-section-name  { 
+input.sheet-stars-color-checkbox:checked ~ .sheet-page .sheet-section-name  {
                 background-image: url("http://i.imgur.com/Xsnnevo.png");
 }
 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-strength .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-intelligence .sheet-section-name, 
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-strength .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-intelligence .sheet-section-name,
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-accuracy .sheet-section-name,
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-strength .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-fighting .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-communication .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-page .sheet-section:nth-child(odd) .sheet-section-name  { 
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-strength .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-fighting .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-communication .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-page .sheet-section:nth-child(odd) .sheet-section-name  {
                 background-image: url("http://i.imgur.com/CEij2yw.png");
 }
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-willpower .sheet-section-name,
 input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-dexterity .sheet-section-name,
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-communication .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-constitution .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-intelligence .sheet-section-name, 
-input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-willpower .sheet-section-name { 
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab4 .sheet-ability-communication .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-constitution .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-intelligence .sheet-section-name,
+input.sheet-stars-color-checkbox:checked ~ .sheet-tab1 .sheet-ability-willpower .sheet-section-name {
                 background-image: url("https://i.imgur.com/aRp1Jdz.png");
 }
 
@@ -1639,7 +1640,7 @@ input.sheet-teal2-color-checkbox:checked ~ button[type=roll].sheet-floating-dice
 input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-attack-container button[type=roll]::before,
 input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-spell-short-container button[type=roll]::before,
 input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-focus-container button[type=roll]::before,
-input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-spell-container button[type=roll]::before { 
+input.sheet-teal2-color-checkbox:checked ~ .sheet-page .sheet-spell-container button[type=roll]::before {
 		color: #1f7b92;
 }
 
@@ -1773,7 +1774,7 @@ input.sheet-threefold-button:checked        ~ .sheet-page .sheet-mod-selected,
 input.sheet-world-of-lazarus-button:checked ~ .sheet-page .sheet-mod-selected,
 input.sheet-fantasy-age-button:checked      ~ .sheet-page .sheet-second-gen-selected,
 input.sheet-titansgrave-button:checked      ~ .sheet-page .sheet-second-gen-selected,
-input.sheet-blue-rose-button:checked        ~ .sheet-page .sheet-second-gen-selected { 
+input.sheet-blue-rose-button:checked        ~ .sheet-page .sheet-second-gen-selected {
 		display: inline-block;
 }
 
@@ -1787,7 +1788,7 @@ input.sheet-dragon-age-button:checked ~ .sheet-page .sheet-blue-rose-selected,
 input.sheet-fantasy-age-button:checked ~ .sheet-page .sheet-blue-rose-selected,
 input.sheet-titansgrave-button:checked ~ .sheet-page .sheet-blue-rose-selected,
 input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-age-selected,
-input.sheet-the-expanse-button:checked ~ .sheet-page .sheet-blue-rose-selected { 
+input.sheet-the-expanse-button:checked ~ .sheet-page .sheet-blue-rose-selected {
 		display: none;
 }
 
@@ -1932,12 +1933,12 @@ input.sheet-ammo-col-checkbox:checked ~ .sheet-page .sheet-attack-container .she
 }
 
 .sheet-aim-value-field input[type=number]::-webkit-inner-spin-button,
-.sheet-aim-value-field input[type=number]::-webkit-outer-spin-button { 
-		-webkit-appearance: none; 
+.sheet-aim-value-field input[type=number]::-webkit-outer-spin-button {
+		-webkit-appearance: none;
 		margin: 0;
 }
 
-.sheet-aim-value-field input[type=number] { 
+.sheet-aim-value-field input[type=number] {
 		-moz-appearance:textfield;
 }
 
@@ -2030,4 +2031,3 @@ input.sheet-ammo-col-checkbox:checked ~ .sheet-page .sheet-attack-container .she
 .sheet-page select.sheet-color-select option[value=green] { background-color: white; color: #1d8514; font-weight: bold; }
 .sheet-page select.sheet-color-select option[value=rainbow] { background-color: white; color: blueviolet; font-weight: bold; }
 .sheet-page select.sheet-color-select option[value=dragon] { background-color: white; color: darkred; font-weight: bold; }
-
diff --git a/AGE System/AGE System.html b/AGE System/AGE System.html
index 0f8fccdaee..9a982f79f7 100644
--- a/AGE System/AGE System.html	
+++ b/AGE System/AGE System.html	
@@ -312,7 +312,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_accuracy-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_accuracy_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{accuracy} + @{focusbonus} - @{fatigue} + @{fear-accuracy}]] {{mod=@{accuracy}}} {{ability=@{accuracy_label}}} {{desc=@{accuracy_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{extramod2=[[@{fear-accuracy}]]}} {{extramod2-name=@{fear_label} @{fear}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -336,8 +336,8 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_communication-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
-                                                                <button class="focus-buttons" name="roll_communication_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{communication} + @{focusbonus} - @{fatigue}]] {{mod=@{communication}}} {{ability=@{communication_label}}} {{desc=@{communication_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span> 
+								<input type="hidden" name="attr_focusbonus" value="2">
+                                                                <button class="focus-buttons" name="roll_communication_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{communication} + @{focusbonus} - @{fatigue}]] {{mod=@{communication}}} {{ability=@{communication_label}}} {{desc=@{communication_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -350,7 +350,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-                                                                <button class="abilities-buttons" name="roll_constitution_check" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{constitution} - @{fatigue}]] {{mod=@{constitution}}} {{ability=@{constitution_label}}} {{desc=@{constitution_label}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}" data-i18n="constitution-u">CONSTITUTION</button>
+                                <button class="abilities-buttons" name="roll_constitution_check" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{constitution} - @{fatigue}]] {{mod=@{constitution}}} {{ability=@{constitution_label}}} {{desc=@{constitution_label}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}" data-i18n="constitution-u">CONSTITUTION</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_constitution"/><span></span>
@@ -359,9 +359,9 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_constitution-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
-                                                                <input type="hidden" name="attr_focusdescription">
-                                                                <button class="focus-buttons" name="roll_constitution_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{constitution} + @{focusbonus} - @{fatigue}]] {{mod=@{constitution}}} {{ability=@{constitution_label}}} {{desc=@{constitution_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
+								<input type="hidden" name="attr_focusbonus" value="2">
+                                    <input type="hidden" name="attr_focusdescription">
+                                        <button class="focus-buttons" name="roll_constitution_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{constitution} + @{focusbonus} - @{fatigue}]] {{mod=@{constitution}}} {{ability=@{constitution_label}}} {{desc=@{constitution_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -383,7 +383,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_cunning-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_cunning_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{cunning} + @{focusbonus} - @{fatigue}]] {{mod=@{cunning}}} {{ability=@{cunning_label}}} {{desc=@{cunning_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -407,7 +407,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_dexterity-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_dexterity_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{dexterity} + @{focusbonus} + @{armor-penalty-for-dex} - @{fatigue}]] {{mod=@{dexterity}}} {{ability=@{dexterity_label}}} {{desc=@{dexterity_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{extramod2=[[@{armor-penalty-for-dex}]]}} {{extramod2-name=@{armor_penalty}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -432,7 +432,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_fighting-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_fighting_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{fighting} + @{focusbonus} - @{fatigue} + @{fear-fighting}]] {{mod=@{fighting}}} {{ability=@{fighting_label}}} {{desc=@{fighting_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{extramod2=[[@{fear-fighting}]]}} {{extramod2-name=@{fear_label} @{fear}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -456,7 +456,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_intelligence-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_intelligence_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{intelligence} + @{focusbonus} - @{fatigue} + @{fear-intelligence}]] {{mod=@{intelligence}}} {{ability=@{intelligence_label}}} {{desc=@{intelligence_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{extramod2=[[@{fear-intelligence}]]}} {{extramod2-name=@{fear_label} @{fear}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -480,7 +480,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_magic-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_magic_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{magic} + @{focusbonus} - @{fatigue}]] {{mod=@{magic}}} {{ability=@{magic_label}}} {{desc=@{magic_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -504,7 +504,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_perception-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_perception_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{perception} + @{focusbonus} - @{fatigue} + @{fear-perception}]] {{mod=@{perception}}} {{ability=@{perception_label}}} {{desc=@{perception_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{extramod2=[[@{fear-perception}]]}} {{extramod2-name=@{fear_label} @{fear}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -528,7 +528,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_strength-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_strength_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{strength} + @{focusbonus} - @{fatigue}]] {{mod=@{strength}}} {{ability=@{strength_label}}} {{desc=@{strength_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -552,7 +552,7 @@
 						<div class="ability-focus-list">
 							<fieldset class="repeating_willpower-focus">
 								<input type="hidden" name="attr_focusname">
-								<input type="hidden" name="attr_focusbonus">
+								<input type="hidden" name="attr_focusbonus" value="2">
 								<input type="hidden" name="attr_focusdescription">
                                                                 <button class="focus-buttons" name="roll_willpower_focus" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{willpower} + @{focusbonus} - @{fatigue}]] {{mod=@{willpower}}} {{ability=@{willpower_label}}} {{desc=@{willpower_label} (@{focusname})}} {{extramod1=@{focusbonus}}} {{extramod1-name=@{focusname} @{focus}}} {{fatigue=[[@{fatigue}]]}} {{player=@{char-name-option}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"><span name="attr_focusname"></span><span> (</span><span name="attr_focusbonus"></span><span>)</span></button><span class="focus-comma">,</span>
 							</fieldset>
@@ -1073,8 +1073,8 @@
 						        </div>
 					        </div>
                                                 <div class="section-name">
-                                                        <button type="action" 
-                                                                class="legacy-money-import-button" 
+                                                        <button type="action"
+                                                                class="legacy-money-import-button"
                                                                 title="You have gold, silver, and copper from the original money system. Click this to import your coins into the new currency system"
                                                                 name="act_legacymoneyimport">
                                                                   <span data-i18n="import-to-currency-u">IMPORT TO CURRENCY</span>
@@ -2415,7 +2415,7 @@
 								</select>
 							</div>
 							<div class="row">
-								<input type="number" placeholder="*" name="attr_spell-focus-bonus" value="2">
+								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
                                                                 <span class="spell-uses-fatigue">
@@ -2434,7 +2434,7 @@
 				</div>
 			</fieldset>
 		</div>
-                
+
 		<div class="spell-container threefold-selected">
 			<fieldset class="repeating_spell">
                                 <input type="checkbox" value="points" name="attr_spell-method" class="hiddencheckbox spell-method-uses-points">
@@ -2492,8 +2492,8 @@
 								<input type="text" name="attr_spell-resistance">
 							</div>
 							<div class="row">
-                                                                <span class="spell-uses-fatigue"> 
-                                                                        <input type="text" name="attr_spell-fatigue"> 
+                                                                <span class="spell-uses-fatigue">
+                                                                        <input type="text" name="attr_spell-fatigue">
                                                                         <button class="spell-magic-buttons" name="roll_fatigue_check" type="roll" value="@{wtype}&{template:age-roller} {{color-@{color}=1}} [[ [[1d6]] + [[1d6]] + [[1d6]] + @{spell-focus-bonus} + @{willpower}  - @{fatigue}]] {{mod=@{willpower}}} {{ability=@{willpower_label}}} {{extramod1=@{spell-focus-bonus}}} {{extramod1-name=@{ability_focus}}} {{desc=@{fatigue_check_for} @{spell-name}}} {{fatigue=[[@{fatigue}]]}} {{note1=@{plus_one_tn}}} {{note1-name=@{each_fatiguing_spell}}} {{player=@{char-name-option}}} {{tn=@{spell-fatigue}}} {{die1=$[[0]]}} {{die2=$[[1]]}} {{drama=$[[2]]}} {{total=$[[3]]}}"></button>
                                                                 </span>
                                                                 <span class="spell-uses-points"> <input type="text" name="attr_spell-mp-cost"> </span>
@@ -2528,7 +2528,7 @@
 								</select>
 							</div>
 							<div class="row">
-								<input type="number" placeholder="*" name="attr_spell-focus-bonus" value="2">
+								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
                                                                         <div class="spell-uses-fatigue">
@@ -2968,9 +2968,9 @@
 				</div>
                                 <div class="section-name autoconfig">
                                         <div class="autoconfig">
-                                                <button type="action" 
-                                                        class="autoconfigure-button" 
-                                                        title="Auto-configure the settings above based on your game selection" 
+                                                <button type="action"
+                                                        class="autoconfigure-button"
+                                                        title="Auto-configure the settings above based on your game selection"
                                                         name="act_autoconfigure"><span data-i18n="auto-configure-all-u">AUTO-CONFIGURE ALL</span></button>
                                         </div>
                                 </div>
@@ -2988,7 +2988,7 @@
 
 <rolltemplate class="sheet-rolltemplate-age-roller">
         <div class="sheet-age-roller-container">
-         
+
                {{#color-black}} <div class="sheet-age-roller-title sheet-age-roller-color-black">{{#player}}{{player}}{{/player}}{{#desc}}{{desc}}{{/desc}} </div> {{/color-black}}
                {{#color-red}} <div class="sheet-age-roller-title sheet-age-roller-color-red">{{#player}}{{player}}{{/player}}{{#desc}}{{desc}}{{/desc}} </div> {{/color-red}}
                {{#color-blue1}} <div class="sheet-age-roller-title sheet-age-roller-color-blue1">{{#player}}{{player}}{{/player}}{{#desc}}{{desc}}{{/desc}} </div> {{/color-blue1}}
@@ -3147,7 +3147,7 @@
                        </div>
                {{/total}}
 
-               {{#tn}} 
+               {{#tn}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1" data-i18n="target_number">
                                        Target Number
@@ -3155,11 +3155,11 @@
                                <span class="sheet-age-roller-col2">
                                        {{tn}}
                                </span>
-          
-                       </div> 
+
+                       </div>
                {{/tn}}
 
-               {{#note1}} 
+               {{#note1}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                        {{note1-name}}
@@ -3167,11 +3167,11 @@
                                <span class="sheet-age-roller-col2">
                                        {{note1}}
                                </span>
-          
-                       </div> 
+
+                       </div>
                {{/note1}}
 
-               {{#note2}} 
+               {{#note2}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                        {{note2-name}}
@@ -3179,10 +3179,10 @@
                                <span class="sheet-age-roller-col2">
                                        {{note2}}
                                </span>
-                       </div> 
+                       </div>
                {{/note2}}
 
-               {{#note3}} 
+               {{#note3}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                        {{note3-name}}
@@ -3190,10 +3190,10 @@
                                <span class="sheet-age-roller-col2">
                                        {{note3}}
                                </span>
-                       </div> 
+                       </div>
                {{/note3}}
 
-               {{#note4}} 
+               {{#note4}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                        {{note4-name}}
@@ -3201,10 +3201,10 @@
                                <span class="sheet-age-roller-col2">
                                        {{note4}}
                                </span>
-                       </div> 
+                       </div>
                {{/note4}}
 
-               {{#note5}} 
+               {{#note5}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                       {{note5-name}}
@@ -3212,10 +3212,10 @@
                                <span class="sheet-age-roller-col2">
                                        {{note5}}
                                </span>
-                       </div> 
+                       </div>
                {{/note5}}
 
-               {{#note6}} 
+               {{#note6}}
                        <div class="sheet-age-roller-line sheet-age-roller-tn">
                                <span class="sheet-age-roller-col1">
                                       {{note6-name}}
@@ -3223,24 +3223,24 @@
                                <span class="sheet-age-roller-col2">
                                        {{note6}}
                                </span>
-                       </div> 
+                       </div>
                {{/note6}}
 
                {{#rollTotal() die1 die2}}
                         <div class="sheet-age-roller-line sheet-age-roller-stunt">
-                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>        
+                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>
                         </div>
                {{/rollTotal() die1 die2}}
 
                {{#rollTotal() die1 drama}}
                         <div class="sheet-age-roller-line sheet-age-roller-stunt">
-                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>        
+                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>
                         </div>
                {{/rollTotal() die1 drama}}
 
                {{#rollTotal() die2 drama}}
                         <div class="sheet-age-roller-line sheet-age-roller-stunt">
-                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>        
+                               <span class="sheet-age-roller-stunt-dice-label sheet-age-roller-col1" data-i18n="stunt_points">Stunt Points</span><span class="sheet-age-roller-stunt-dice sheet-age-roller-col2">{{drama}}</span>
                         </div>
                {{/rollTotal() die2 drama}}
 
@@ -3339,8 +3339,8 @@ on("sheet:opened", function(eventInfo){
 			attack_bonus_label: getTranslationByKey("attack_bonus_label"),
 			magic_arcana_focus: getTranslationByKey("magic_arcana_focus"),
 			spellpower_label: getTranslationByKey("spellpower_label")
-		});     
-		
+		});
+
 });
 
 on("change:fear", function(event) {
@@ -3371,7 +3371,7 @@ on("change:fear", function(event) {
           "fear-intelligence": -1,
           "fear-initiative": 1,
           "fear-accuracy": -1,
-          "fear-fighting": -1 
+          "fear-fighting": -1
         }); // setAttrs
         break;
       case "3":
@@ -3430,7 +3430,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "red"
          }); // setAttrs
-        break; 
+        break;
       case "fantasy-age":
         setAttrs({
           "mana-toggle": 1,
@@ -3438,7 +3438,7 @@ on("clicked:autoconfigure", function(event) {
           "fatigue-toggle": 0,
           "fear-toggle": 0,
           "horror-toggle": 0,
-          "exp-toggle": 0, 
+          "exp-toggle": 0,
           "conviction-toggle": 0,
           "corruption-toggle": 0,
           "ammo-toggle": 1,
@@ -3450,7 +3450,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "green"
          }); // setAttrs
-        break; 
+        break;
       case "titansgrave":
         setAttrs({
           "mana-toggle": 1,
@@ -3470,7 +3470,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "teal1"
          }); // setAttrs
-        break; 
+        break;
       case "blue-rose":
         setAttrs({
           "mana-toggle": 0,
@@ -3478,7 +3478,7 @@ on("clicked:autoconfigure", function(event) {
           "fatigue-toggle": 1,
           "fear-toggle": 0,
           "horror-toggle": 0,
-          "exp-toggle": 0, 
+          "exp-toggle": 0,
           "conviction-toggle": 1,
           "corruption-toggle": 1,
           "ammo-toggle": 0,
@@ -3490,7 +3490,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "blue2"
          }); // setAttrs
-        break; 
+        break;
       case "the-expanse":
         setAttrs({
           "mana-toggle": 0,
@@ -3510,7 +3510,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 1,
           color: "stars"
          }); // setAttrs
-        break; 
+        break;
       case "modern-age":
         setAttrs({
           "mana-toggle": 1,
@@ -3518,7 +3518,7 @@ on("clicked:autoconfigure", function(event) {
           "fatigue-toggle": 1,
           "fear-toggle": 0,
           "horror-toggle": 0,
-          "exp-toggle": 1, 
+          "exp-toggle": 1,
           "conviction-toggle": 0,
           "corruption-toggle": 0,
           "ammo-toggle": 1,
@@ -3530,7 +3530,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "orange"
          }); // setAttrs
-        break; 
+        break;
       case "world-of-lazarus":
         setAttrs({
           "mana-toggle": 0,
@@ -3538,7 +3538,7 @@ on("clicked:autoconfigure", function(event) {
           "fatigue-toggle": 0,
           "fear-toggle": 0,
           "horror-toggle": 0,
-          "exp-toggle": 1, 
+          "exp-toggle": 1,
           "conviction-toggle": 0,
           "corruption-toggle": 0,
           "ammo-toggle": 1,
@@ -3550,7 +3550,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "lazarus"
          }); // setAttrs
-        break; 
+        break;
       case "threefold":
         setAttrs({
           "mana-toggle": 1,
@@ -3558,7 +3558,7 @@ on("clicked:autoconfigure", function(event) {
           "fatigue-toggle": 1,
           "fear-toggle": 0,
           "horror-toggle": 0,
-          "exp-toggle": 1, 
+          "exp-toggle": 1,
           "conviction-toggle": 0,
           "corruption-toggle": 0,
           "ammo-toggle": 1,
@@ -3570,7 +3570,7 @@ on("clicked:autoconfigure", function(event) {
           "conditions-toggle": 0,
           color: "threefold"
          }); // setAttrs
-        break; 
+        break;
       default:
         console.log("wait what happened");
     }; // case
@@ -3589,7 +3589,7 @@ on("sheet:opened", function(event) {
     } // if
   }); // getAttrs
 }); // sheet opened
-    
+
 on("clicked:legacymoneyimport", function(event) {
   console.log("Clicked!");
   getAttrs(["cp", "sp", "gp"], function(v) {