From ddcb8e984d99f2c418b771a51a2c6200cd1a9719 Mon Sep 17 00:00:00 2001
From: Ghost Matter <geno44@gmail.com>
Date: Sun, 13 Aug 2017 22:35:09 -0400
Subject: [PATCH] Update 1.1

- Added ammo column
- Added option to show/hide more sections individually instead of per-system
- Added Aim option
- Added option to whisper rolls
- Added Sheet Default Settings, with translation strings.
---
 AGE System/AGE System.css   | 139 ++++++++++++----
 AGE System/AGE System.html  | 305 ++++++++++++++++++++++++------------
 AGE System/sheet.json       | 174 +++++++++++++++++++-
 AGE System/translation.json | 265 ++++++++++++++++++-------------
 4 files changed, 637 insertions(+), 246 deletions(-)

diff --git a/AGE System/AGE System.css b/AGE System/AGE System.css
index 4f8e1e0114..c60433da60 100644
--- a/AGE System/AGE System.css	
+++ b/AGE System/AGE System.css	
@@ -456,16 +456,25 @@ input {
 
 	/* Right column */
 .sheet-sectionfourth {
-		width:  100.8px;
+		width: calc(25% - 4.71px);
 		height: 92px;
 }
 
 .sheet-sectiontwofourths {
-		width:  206.1px;
+		width:  calc(50% - 3.79px);
 		height: 92px;
 }
 
-.sheet-fatigue select {
+.sheet-mana-section,
+.sheet-experience-points-section,
+.sheet-fatigue-section,
+.sheet-conviction-section,
+.sheet-corruption-section,
+.sheet-money-section {
+		display: none;
+}
+
+.sheet-fatigue-section select {
 		display: inline-block;
 		font-size: 9px;
 		line-height: 9px;
@@ -483,7 +492,7 @@ input {
 }
 
 .sheet-health input[name="attr_health"],
-.sheet-fatigue input,
+.sheet-fatigue-section input,
 .sheet-conviction-section input[name="attr_conviction"],
 .sheet-corruption-section input {
 		display: inline-block;
@@ -504,7 +513,7 @@ input {
 		padding-top: 7px;
 }
 
-.sheet-fatigue input {
+.sheet-fatigue-section input {
 		padding-left: 10px;
 }
 
@@ -714,10 +723,6 @@ input {
 		border-bottom: 1px solid #B0B0B0;
 }
 
-.sheet-sectionfull .repitem:last-child {
-		border-bottom: none;
-}
-
 .sheet-repeatingcol input,
 .sheet-col-weapon-groups input { 
 		display: inline-block;
@@ -738,6 +743,7 @@ input {
 .sheet-col-attack-name input,
 .sheet-col-attack-range input,
 .sheet-col-attack-reload input,
+.sheet-col-ammo input[type=number],
 .sheet-equipment-name input,
 .sheet-equipment-quantity input,
 .sheet-equipment-description input,
@@ -747,20 +753,40 @@ input {
 }
 
 .sheet-col-attack-name { 
-		width: 141px;
+		width: 158px;
 }
 
 .sheet-col-attack-range,
 .sheet-col-attack-reload,
-.sheet-col-attack-attackdice { 
-		width: 60px;
+.sheet-col-attackdice { 
+		width: 55px;
 }
 
-.sheet-col-attack-attackdice input {
+.sheet-attack-container .sheet-col-ammo {
+		width: 30px;
+		display: none;
+}
+
+.sheet-col-ammo input[type=number]::-webkit-inner-spin-button,
+.sheet-col-ammo input[type=number]::-webkit-outer-spin-button { 
+		-webkit-appearance: none; 
+		margin: 0;
+}
+
+.sheet-money-score input[type=number] { 
+		-moz-appearance:textfield;
+}
+
+.sheet-col-attackdice input {
 		width: 38px;
 		margin-left: 5px;
 }
 
+.sheet-col-attackdice .sheet-attackroll-withaim,
+.sheet-col-attackdice .sheet-attackroll-withaim::before {
+		display: none;
+}
+
 .sheet-col-attack-damage {
 		width: 80px;
 }
@@ -772,7 +798,6 @@ input {
 
 .sheet-repeatingcol button[type=roll],
 .sheet-focus-container button[type=roll] {
-		display: inline-block;
 		border: none;
 		background: none;
 		box-shadow: none;
@@ -831,14 +856,6 @@ input {
 	width: 265px;
 }
 
-input.sheet-power-list-checkbox:checked ~ div.sheet-power-short-container  {
-	display: none;
-}
-
-input.sheet-spell-list-checkbox:checked ~ div.sheet-spell-spell-short-divtohide  {
-	display: none;
-}
-
 .sheet-power-short-container .repcontrol,
 .sheet-spell-short-container .repcontrol {
 	display: none;
@@ -861,7 +878,7 @@ input.sheet-spell-list-checkbox:checked ~ div.sheet-spell-spell-short-divtohide
 		margin-top: 10px;
 }
 
-.sheet-money { 
+.sheet-money-section { 
 		width: 100%;
 		border-top: 1px solid black;
 }
@@ -1146,6 +1163,8 @@ input.sheet-spell-list-checkbox:checked ~ div.sheet-spell-spell-short-divtohide
 		margin-top: 5px;
 }
 
+
+
 /* OPTIONS TAB */
 
 input[type=checkbox].sheet-hiddencheckbox  { 
@@ -1298,29 +1317,81 @@ input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-age-selected {
 		display: none;
 }
 
-input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-fatigue,
-input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-conviction-section,
-input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-corruption-section { 
-		width:  100.45px;
+.sheet-tab6 .sheet-row {
+		float: right;
 }
 
-.sheet-list-toggle-container {
-		float: right;
-		margin-bottom: 3px;
+.sheet-small-section {
+		width: 160px;
+}
+
+.sheet-larger-section {
+		width: 325px;
 }
 
 .sheet-list-toggle-text {
-		margin-top: 1px;
+		margin-top: 2px;
 		margin-right: 7px;
-}	
+		margin-bottom: 3px;
+}
+
+.sheet-whisper-rolls-text {
+		margin-top: 5px;
+}
 
 .sheet-list-toggle-container input[type="checkbox"] + span::before {
 		margin-right: none;
 }
 
-.sheet-tab6 select {
+.sheet-tab6 .sheet-section select {
 		float: right;
-		width: 140px;
+		width: 150px;
+		border: none;
+}
+
+input.sheet-power-list-checkbox:checked ~ .sheet-page .sheet-power-short-container,
+input.sheet-spell-list-checkbox:checked ~ .sheet-page .sheet-spell-spell-short-divtohide,
+input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-noaim,
+input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-noaim::before
+{
+		display: none;
+}
+
+input.sheet-mana-section-checkbox:checked ~ .sheet-page .sheet-mana-section,
+input.sheet-exp-section-checkbox:checked ~ .sheet-page .sheet-experience-points-section,
+input.sheet-fatigue-section-checkbox:checked ~ .sheet-page .sheet-fatigue-section,
+input.sheet-conviction-section-checkbox:checked ~ .sheet-page .sheet-conviction-section,
+input.sheet-corruption-section-checkbox:checked ~ .sheet-page .sheet-corruption-section,
+input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-withaim,
+input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-withaim::before,
+input.sheet-ammo-col-checkbox:checked ~ .sheet-page .sheet-attack-container .sheet-col-ammo,
+input.sheet-money-section-checkbox:checked ~ .sheet-page .sheet-money-section  {
+		display: inline-block;
+}
+
+input.sheet-ammo-col-checkbox:checked ~ .sheet-page .sheet-attack-container .sheet-col-attack-name {
+		width: 125px;
+}
+
+.sheet-aim-value-field input[type=number] {
+		text-align: center;
+		width: 18px;
+		border: none;
+		background: none;
+		box-shadow: none;
+		border-radius: 0px;
+		margin-right: 3px;
+		margin-top: -2px;
+}
+
+.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; 
+		margin: 0;
+}
+
+.sheet-aim-value-field input[type=number] { 
+		-moz-appearance:textfield;
 }
 
 /* ROLL TEMPLATES */
diff --git a/AGE System/AGE System.html b/AGE System/AGE System.html
index a177863a4e..0a696202a9 100644
--- a/AGE System/AGE System.html	
+++ b/AGE System/AGE System.html	
@@ -11,6 +11,17 @@
 <input class="hiddencheckbox teal2-color-checkbox" type="checkbox" name="attr_color" value="teal2">
 <input class="hiddencheckbox blue-color-checkbox" type="checkbox" name="attr_color" value="blue">
 
+<input type="checkbox" class="hiddencheckbox mana-section-checkbox" name="attr_mana-toggle" checked="checked">
+<input type="checkbox" class="hiddencheckbox exp-section-checkbox" name="attr_exp-toggle" checked="checked">
+<input type="checkbox" class="hiddencheckbox fatigue-section-checkbox" name="attr_fatigue-toggle">
+<input type="checkbox" class="hiddencheckbox conviction-section-checkbox" name="attr_conviction-toggle">
+<input type="checkbox" class="hiddencheckbox corruption-section-checkbox" name="attr_corruption-toggle">
+<input type="checkbox" class="hiddencheckbox power-list-checkbox" name="attr_power-list-toggle">
+<input type="checkbox" class="hiddencheckbox spell-list-checkbox" name="attr_spell-list-toggle">
+<input type="checkbox" class="hiddencheckbox ammo-col-checkbox" name="attr_ammo-toggle" checked="checked">
+<input type="checkbox" class="hiddencheckbox money-section-checkbox" name="attr_money-toggle" checked="checked">
+<input type="checkbox" class="hiddencheckbox aim-checkbox" name="attr_aim-toggle">
+
 <input class="tab-button tab1" type="radio" name="attr_tab" value="1" checked="checked"><span data-i18n="character-u">CHARACTER</span>
 <input class="tab-button tab2" type="radio" name="attr_tab" value="2"><span data-i18n="persona-u">PERSONA</span>
 <input class="tab-button tab3" type="radio" name="attr_tab" value="3"><span data-i18n="powers-u">POWERS</span>
@@ -150,7 +161,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Accuracy}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ + [[@{accuracy}]]}}" name="roll_accuracy_check" data-i18n="accuracy-u">ACCURACY</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Accuracy}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{accuracy}]]}}" name="roll_accuracy_check" data-i18n="accuracy-u">ACCURACY</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_accuracy"/><span></span>
@@ -161,7 +172,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Accuracy (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{accuracy}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_accuracy_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Accuracy (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{accuracy}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_accuracy_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -173,7 +184,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Communication}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}" name="roll_communication_check" data-i18n="communication-u">COMMUNICATION</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Communication}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}" name="roll_communication_check" data-i18n="communication-u">COMMUNICATION</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_communication"/><span></span>
@@ -183,7 +194,7 @@
 							<fieldset class="repeating_communication-focus">
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Communication (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_communication_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Communication (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_communication_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -195,7 +206,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Constitution}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}" name="roll_constitution_check" data-i18n="constitution-u">CONSTITUTION</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Constitution}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}" name="roll_constitution_check" data-i18n="constitution-u">CONSTITUTION</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_constitution"/><span></span>
@@ -206,7 +217,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Constitution (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_constitution_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Constitution (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_constitution_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -218,7 +229,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Cunning}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}" name="roll_cunning_check" data-i18n="cunning-u">CUNNING</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Cunning}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}" name="roll_cunning_check" data-i18n="cunning-u">CUNNING</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_cunning"/><span></span>
@@ -229,7 +240,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Cunning (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_cunning_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Cunning (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_cunning_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -241,7 +252,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Dexterity}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}" data-i18n="dexterity-u">DEXTERITY</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Dexterity}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}" data-i18n="dexterity-u">DEXTERITY</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_dexterity"/><span></span>
@@ -252,7 +263,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Dexterity (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_dexterity_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Dexterity (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_dexterity_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -264,7 +275,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Fighting}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}" name="roll_fighting_check" data-i18n="fighting-u">FIGHTING</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Fighting}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}" name="roll_fighting_check" data-i18n="fighting-u">FIGHTING</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_fighting"/><span></span>
@@ -275,7 +286,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Fighting (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_fighting_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Fighting (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_fighting_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -287,7 +298,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Intelligence}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{Intelligence}]]}}" name="roll_intelligence_check" data-i18n="intelligence-u">INTELLIGENCE</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Intelligence}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{Intelligence}]]}}" name="roll_intelligence_check" data-i18n="intelligence-u">INTELLIGENCE</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_intelligence"/><span></span>
@@ -298,7 +309,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Intelligence (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_intelligence_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Intelligence (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_intelligence_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -310,7 +321,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Magic}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}" name="roll_magic_check" data-i18n="magic-u">MAGIC</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Magic}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}" name="roll_magic_check" data-i18n="magic-u">MAGIC</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_magic"/><span></span>
@@ -321,7 +332,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Magic (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_magic_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Magic (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_magic_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -333,7 +344,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Perception}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}" name="roll_perception_check" data-i18n="perception-u">PERCEPTION</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Perception}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}" name="roll_perception_check" data-i18n="perception-u">PERCEPTION</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_perception"/><span></span>
@@ -344,7 +355,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -356,7 +367,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Strength}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}" name="roll_strength_check" data-i18n="strength-u">STRENGTH</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Strength}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}" name="roll_strength_check" data-i18n="strength-u">STRENGTH</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_strength"/><span></span>
@@ -367,7 +378,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Strength (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_strength_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Strength (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_strength_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -379,7 +390,7 @@
 					<div class="col left-ability-container">
 						<div class="section-name focuses-section">
 							<div class="col ability-name">
-								<button class="abilities-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Willpower}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}" name="roll_willpower_check" data-i18n="willpower-u">WILLPOWER</button>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Willpower}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}" name="roll_willpower_check" data-i18n="willpower-u">WILLPOWER</button>
 							</div>
 							<div class="col primary-checkbox">
 								<input type="checkbox" name="attr_primary_willpower"/><span></span>
@@ -390,7 +401,7 @@
 								<input type="hidden" name="attr_focusname">
 								<input type="hidden" name="attr_focusbonus">
 								<input type="hidden" name="attr_focusdescription">
-								<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Willpower (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_willpower_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Willpower (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_willpower_focus"><span name="attr_focusname"></span></button><span class="focus-comma">,</span>
 							</fieldset>
 						</div>
 					</div>
@@ -412,7 +423,30 @@
 						<input type="number" name="attr_health_max">
 					</div>
 				</div>
-				<div class="section sectionfourth blue-rose-selected fatigue">
+				<div class="section sectionfourth mana-section">
+					<div class="section-name dragon-age-selected character-section-name">
+						<span data-i18n="mana-u">MANA</span>
+					</div>
+					<div class="section-name second-gen-selected character-section-name">
+						<span data-i18n="magic-points-u">MAGIC POINTS</span>
+					</div>
+					<input type="number" name="attr_mana">
+					<div class="maximum-input">
+						<span data-i18n="max">Max</span>
+						<input type="number" name="attr_mana_max">
+					</div>
+				</div>
+				<div class="section sectiontwofourths experience-points-section">
+					<div class="section-name character-section-name">
+						<span data-i18n="experience-points-u">EXPERIENCE POINTS</span>
+					</div>
+					<input type="number" name="attr_experience-points">
+					<div class="maximum-input">
+						<span data-i18n="next">Next</span>
+						<input type="number" name="attr_experience-points-next">
+					</div>
+				</div>
+				<div class="section sectionfourth fatigue-section">
 					<div class="section-name character-section-name">
 						<span data-i18n="fatigue-u">FATIGUE</span>
 					</div>
@@ -427,7 +461,7 @@
 						</select>
 					</div>
 				</div>
-				<div class="section sectionfourth blue-rose-selected conviction-section">
+				<div class="section sectionfourth conviction-section">
 					<div class="section-name character-section-name">
 						<span data-i18n="conviction-u">CONVICTION</span>
 					</div>
@@ -437,32 +471,12 @@
 						<input type="number" name="attr_conviction_max" value="3" title="@{conviction_max}">
 					</div>
 				</div>
-				<div class="section sectionfourth blue-rose-selected corruption-section">
+				<div class="section sectionfourth corruption-section">
 					<div class="section-name character-section-name">
 						<span data-i18n="corruption-u">CORRUPTION</span>
 					</div>
 					<input type="number" name="attr_corruption">
 				</div>
-				<div class="section sectionfourth age-selected mana-section">
-					<div class="section-name character-section-name">
-						<span data-i18n="mana-u">MANA</span>
-					</div>
-					<input type="number" name="attr_mana">
-					<div class="maximum-input">
-						<span data-i18n="max">Max</span>
-						<input type="number" name="attr_mana_max">
-					</div>
-				</div>
-				<div class="section sectiontwofourths age-selected experience-points-section">
-					<div class="section-name character-section-name">
-						<span data-i18n="experience-points-u">EXPERIENCE POINTS</span>
-					</div>
-					<input type="number" name="attr_experience-points">
-					<div class="maximum-input">
-						<span data-i18n="next">Next</span>
-						<input type="number" name="attr_experience-points-next">
-					</div>
-				</div>
 			</div>
 			<div class="row">
 				<div class="section sectionfull speed-defense-armor-container">
@@ -520,7 +534,10 @@
 						<div class="col repeatingcol col-attack-reload">
 							<span data-i18n="reload-u">RELOAD</span>
 						</div>
-						<div class="col repeatingcol col-attack-attackdice">
+						<div class="col repeatingcol col-ammo">
+							<span>#</span>
+						</div>
+						<div class="col repeatingcol col-attackdice">
 							<span data-i18n="roll-u">ROLL</span>
 						</div>
 						<div class="col repeatingcol col-attack-damage">
@@ -536,14 +553,18 @@
 						</div>
 						<div class="col repeatingcol col-attack-reload">
 							<input type="text" name="attr_reload">
-						</div>	
-						<div class="col repeatingcol col-attack-attackdice">
+						</div>
+						<div class="col repeatingcol col-ammo">
+							<input type="number" name="attr_ammo">
+						</div>
+						<div class="col repeatingcol col-attackdice">
 							<input type="text" placeholder="1" name="attr_attackroll">
-							<button type="roll" value="&{template:default} {{name=@{character_name} | @{attack-name}}}{{Range=@{range}}}{{Reload=@{reload}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}" name="roll_attackdice"></button>
+							<button type="roll" class="attackroll-noaim" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
+							<button type="roll" class="attackroll-withaim" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Aim=[[?{Using the Aim action|Yes, @{aim-value}|No, 0}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
 						</div>
 						<div class="col repeatingcol col-attack-damage">
 							<input type="text" placeholder="2d6+1" name="attr_attack-damage">
-							<button type="roll" value="&{template:default} {{name=@{character_name} | @{attack-name}}}{{Damage=[[@{attack-damage}]]}}" name="roll_weapondamage"></button>
+							<button type="roll" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Damage=[[@{attack-damage}]]}}" name="roll_weapondamage"></button>
 						</div>
 					</fieldset>
 					<div class="col-weapon-groups">
@@ -552,7 +573,6 @@
 				</div>
 			</div>
 			<div class="row">
-				<input type="checkbox" class="power-list-checkbox" name="attr_power-list-toggle" style="display: none;">
 				<div class="section sectionfull power-short-container">
 					<div class="section-name">
 						<div class="col repeatingcol power-short-name">
@@ -573,7 +593,6 @@
 				</div>
 			</div>
 			<div class="row">
-				<input type="checkbox" class="spell-list-checkbox" name="attr_spell-list-toggle" style="display: none;">
 				<div class="spell-spell-short-divtohide">
 					<div class="section sectionfull spell-short-container dragon-age-selected">
 						<div class="section-name dragon-age-selected">
@@ -584,7 +603,6 @@
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
 							<div class="col repeatingcol spell-short-roll">
-								
 							</div>
 						</div>
 						<fieldset class="repeating_spell">
@@ -598,7 +616,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
 							</div>
 						</fieldset>
 					</div>
@@ -611,7 +629,6 @@
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
 							<div class="col repeatingcol spell-short-roll">
-								
 							</div>
 						</div>
 						<fieldset class="repeating_spell">
@@ -625,7 +642,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
 							</div>
 						</fieldset>
 					</div>
@@ -638,7 +655,6 @@
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
 							<div class="col repeatingcol spell-short-roll">
-								
 							</div>
 						</div>
 						<fieldset class="repeating_spell">
@@ -653,7 +669,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ + [[@{spell-ability-score}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{spell-ability-score}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"></button>
 							</div>
 						</fieldset>
 					</div>
@@ -683,7 +699,7 @@
 							<textarea name="attr_equipment-description"></textarea>
 						</div>
 					</fieldset>
-					<div class="money age-selected">
+					<div class="money-section">
 						<div class="money-score">
 							<input type="number" name="attr_cp" placeholder="CP" title="CP">
 						</div>
@@ -700,7 +716,7 @@
 	</div>
 </div>
 
-<!-- PERSONA TAB -->	
+<!-- PERSONA TAB -->
 <div class="page tab2">
 	<div class="header">
 		<div class="name-container dragon-age-selected">
@@ -1082,7 +1098,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Accuracy (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{accuracy}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_accuracy_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Accuracy (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{accuracy}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_accuracy_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1100,7 +1116,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Communication (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_communication_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Communication (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{communication}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_communication_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1118,7 +1134,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Constitution (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_constitution_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Constitution (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{constitution}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_constitution_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1136,7 +1152,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Cunning (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_cunning_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Cunning (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{cunning}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_cunning_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1156,7 +1172,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Dexterity (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_dexterity_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Dexterity (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{dexterity}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_dexterity_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1174,7 +1190,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Fighting (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_fighting_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Fighting (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_fighting_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1192,7 +1208,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Intelligence (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_intelligence_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Intelligence (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{fighting}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_intelligence_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1210,7 +1226,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Magic (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_magic_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Magic (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{magic}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_magic_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1228,7 +1244,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1248,7 +1264,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Perception (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{perception}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_perception_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1266,7 +1282,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Strength (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_strength_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Strength (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{strength}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_strength_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1284,7 +1300,7 @@
 							<span data-i18n="focus:-u">FOCUS:</span>
 							<input type="text" title="Focus name"  name="attr_focusname">
 							<input type="number" placeholder="2" title="Focus bonus (0, 2, 3, etc.) MUST have a value for the buttons to work."  name="attr_focusbonus">
-							<button class="focus-buttons" type="roll" value="&{template:default} {{name=@{character_name} : Willpower (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_willpower_focus"></button>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; Willpower (@{focusname})}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{willpower}]]}}{{Focus=+ [[@{focusbonus}]]}}" name="roll_willpower_focus"></button>
 						</div>
 						<div class="row">
 							<textarea name="attr_focusdescription" placeholder="Description" title="Description"></textarea>
@@ -1456,7 +1472,7 @@
 								<input type="text" name="attr_spell-cast-time">
 							</div>
 							<div class="row">
-								<input type="number" name="attr_spell-tn">
+								<input type="text" name="attr_spell-tn">
 							</div>
 							<div class="row">
 								<input type="text" name="attr_spell-test">
@@ -1477,13 +1493,13 @@
 						</div>
 						<div class="col">
 							<div class="row">
-								<input type="number" name="attr_spell-spellpower">
+								<input type="text" name="attr_spell-spellpower">
 							</div>
 							<div class="row">
-								<input type="number" value="0" name="attr_spell-focus-bonus">
+								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
 							</div>
 						</div>
 					</div>
@@ -1545,7 +1561,7 @@
 								<input type="text" name="attr_spell-cast-time">
 							</div>
 							<div class="row">
-								<input type="number" name="attr_spell-tn">
+								<input type="text" name="attr_spell-tn">
 							</div>
 							<div class="row">
 								<input type="text" name="attr_spell-test">
@@ -1566,13 +1582,13 @@
 						</div>
 						<div class="col">
 							<div class="row">
-								<input type="number" name="attr_spell-spellpower">
+								<input type="text" name="attr_spell-spellpower">
 							</div>
 							<div class="row">
-								<input type="number" value="0" name="attr_spell-focus-bonus">
+								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
 							</div>
 						</div>
 					</div>
@@ -1613,7 +1629,7 @@
 								<input type="text" name="attr_spell-time">
 							</div>
 							<div class="row">
-								<input type="number" name="attr_spell-tn">
+								<input type="text" name="attr_spell-tn">
 							</div>
 						</div>
 					</div>
@@ -1637,7 +1653,7 @@
 								<input type="text" name="attr_spell-resistance">
 							</div>
 							<div class="row">
-								<input type="number" name="attr_spell-fatigue">
+								<input type="text" name="attr_spell-fatigue">
 							</div>
 						</div>
 					</div>
@@ -1662,10 +1678,10 @@
 								</select>
 							</div>	
 							<div class="row">
-								<input type="number" value="0" name="attr_spell-focus-bonus">
+								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>	
 							<div class="row">
-								<button class="spell-magic-buttons" type="roll" value="&{template:default} {{name=@{character_name} : @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{spell-ability-score}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"</button>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{character_name} &#124; @{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{spell-ability-score}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"></button>
 							</div>
 						</div>
 					</div>
@@ -1796,8 +1812,8 @@
 		</div>
 	</div>
 	<div class="body">
-		<div class="section">
-			<div class="section-name game-system-name">
+		<div class="section small-section">
+			<div class="section-name">
 				<span data-i18n="game-system-u">GAME SYSTEM</span>
 			</div>
 			<div>
@@ -1809,21 +1825,62 @@
 				</select>
 			</div>
 		</div>
-		<div class="section">
-			<div class="section-name color-name">
+		<div class="section small-section">
+			<div class="section-name">
 				<span data-i18n="color-selection-u">COLOR SELECTION</span>
 			</div>
 			<div>
 				<select class="color-select" name="attr_color">
-					<option value="black">Black</option>
-					<option value="red">Red</option>
-					<option value="teal1">Teal 1</option>
-					<option value="teal2">Teal 2</option>
-					<option value="blue">Blue</option>
+					<option value="black" data-i18n="black">Black</option>
+					<option value="red" data-i18n="red">Red</option>
+					<option value="teal1" data-i18n="teal-1">Teal 1</option>
+					<option value="teal2" data-i18n="teal-2">Teal 2</option>
+					<option value="blue" data-i18n="blue">Blue</option>
 				</select>
 			</div>
 		</div>
-		<div class="section">
+		<div class="section larger-section">
+			<div class="section-name">
+				<span data-i18n="rolls-u">ROLLS</span>
+			</div>
+			<div class="row">
+				<div class="col whisper-rolls-text">
+					<span data-i18n="whisper-rolls-to-gm">Whisper rolls to GM</span>
+				</div>
+				<div class="col">
+                    <select name="attr_wtype">
+                        <option value="" data-i18n="never-whisper-roll">Never Whisper Rolls</option>
+                        <option value="?{Whisper?|Public Roll,|Whisper Roll,/w gm }" data-i18n="query-whisper-roll">Query Whisper</option>
+                        <option value="/w gm " data-i18n="always-whisper-roll">Always Whisper Rolls</option>
+                    </select>
+				</div>
+			</div>
+			<div class="row">
+				<span data-i18n="whisper-rolls-to-gm-warning">Does not work with API script yet, the Summary will not be whispered to the GM.</span>
+			</div>
+		</div>
+		<div class="section larger-section">
+			<div class="section-name">
+				<span data-i18n="options-u">OPTIONS</span>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="prompt-for-aim-action-when-rolling-attacks">Prompt for Aim action when rolling attacks</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_aim-toggle"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="aim-value-a-value-must-be-entered-here">Aim value (a number MUST be entered here)</span>
+				</div>
+				<div class="col aim-value-field">
+					<input type="number" name="attr_aim-value" placeholder="1">
+				</div>
+			</div>
+		</div>
+		<div class="section larger-section">
 			<div class="section-name">
 				<span data-i18n="sections-u">SECTIONS</span>
 			</div>	
@@ -1837,12 +1894,68 @@
 			</div>
 			<div class="row list-toggle-container">
 				<div class="col list-toggle-text">
-					<span data-i18n="hide-the-spell/arcana-in-the-character-tab">Hide the Spell/Arcana list in the Character tab</span>
+					<span data-i18n="hide-the-spell-list-in-the-character-tab">Hide the spell list in the Character tab</span>
 				</div>
 				<div class="col list-toggle-checkbox">
 					<input type="checkbox" class="list-checkbox" name="attr_spell-list-toggle"><span></span>
 				</div>
 			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-mana/magic-points-section">Show the Mana/Magic Points section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_mana-toggle" checked="checked"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-experience-points-section">Show the Experience Points section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_exp-toggle" checked="checked"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-fatigue-section">Show the Fatigue section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_fatigue-toggle"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-conviction-section">Show the Conviction section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_conviction-toggle"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-corruption-section">Show the Corruption section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_corruption-toggle"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-ammo-column">Show the Ammo column</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_ammo-toggle" checked="checked"><span></span>
+				</div>
+			</div>
+			<div class="row list-toggle-container">
+				<div class="col list-toggle-text">
+					<span data-i18n="show-the-money/currency-section">Show the Money/Currency section</span>
+				</div>
+				<div class="col list-toggle-checkbox">
+					<input type="checkbox" class="list-checkbox" name="attr_money-toggle" checked="checked"><span></span>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
@@ -2415,7 +2528,7 @@
 	</div>
 <!-- 1st Tab End -->
 
-	<!-- Grimioire -->
+	<!-- Grimoire -->
 	<table class='sheet-spelltable'>
 		<tr>
 			<td class='sheet-blackbox_alternate' colspan='5'>MAGIC FOCUSES</td>
diff --git a/AGE System/sheet.json b/AGE System/sheet.json
index d72d48d922..7fae056659 100644
--- a/AGE System/sheet.json	
+++ b/AGE System/sheet.json	
@@ -1,8 +1,166 @@
-{
-    "html": "AGE System.html",
-    "css": "AGE System.css",
-    "authors": "Olivier L.-L.",
-    "roll20userid": "594486",
-    "preview": "AGE System.png",
-    "instructions": "A sheet made for the AGE family of games: Dragon Age, Fantasy AGE, Titansgrave and Blue Rose. A tab with the data from the old sheets will be available for the near-future, allowing copy and paste of character data into this new sheet. An API script is also available to totals rolls and calculate stunt points."
-}
+{  
+   "html":"AGE System.html",
+   "css":"AGE System.css",
+   "authors":"Olivier L.-L.",
+   "roll20userid":"594486",
+   "preview":"AGE System.png",
+   "instructions":"A sheet made for the AGE family of games: Dragon Age, Fantasy AGE, Titansgrave and Blue Rose. A tab with the data from the old sheets will be available until the end of 2017, allowing copy and paste of character data into this new sheet. An API script is also available to totals rolls and calculate stunt points.",
+   "useroptions":[  
+      {  
+         "attribute":"game",
+         "displayname":"GAME SYSTEM",
+         "displaytranslationkey":"game-system-u",
+         "type":"select",
+         "options":[  
+            "Dragon Age|dragon-age",
+            "Fantasy AGE|fantasy-age",
+            "Titansgrave|titansgrabe",
+            "Blue Rose|blue-rose"
+         ],
+         "default":"Dragon Age",
+         "description":"Select the game system.",
+         "descriptiontranslationkey":"select-game-system-info"
+      },
+      {  
+         "attribute":"color",
+         "displayname":"COLOR",
+         "displaytranslationkey":"color-u",
+         "type":"select",
+         "options":[  
+            "Black|black",
+            "Red|red",
+            "Teal 1|teal1",
+            "Teal 2|teal2",
+            "Blue|blue"
+         ],
+         "optiontranslationkeys":[  
+            "black",
+            "red",
+            "teal-1",
+            "teal-2",
+            "blue"
+         ],
+         "default":"Black",
+         "description":"Select the color for character sheets.",
+         "descriptiontranslationkey":"select-color-info"
+      },
+      {  
+         "attribute":"wtype",
+         "displayname":"WHISPER ROLLS TO GM",
+         "displaytranslationkey":"whisp-rolls-gm-u",
+         "type":"select",
+         "options":[  
+            "Never Whisper Rolls|",
+            "Query Whisper|?{Whisper?|Public Roll,|Whisper Roll,/w gm }",
+            "Always Whisper Rolls|/w gm "
+         ],
+         "optiontranslationkeys":[  
+            "never-whisper-roll",
+            "query-whisper-roll",
+            "always-whisper-roll"
+         ],
+         "default":"",
+         "description":"DOES NOT WORK WITH THE API SCRIPT YET, THE SUMMARY WILL NOT WHISPERED TO THE GM. All sheet rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Rolls will send all rolls only to yourself and the GM.",
+         "descriptiontranslationkey":"whisp-rolls-gm-info"
+      },
+      {  
+         "attribute":"aim-toggle",
+         "displayname":"AIM",
+         "displaytranslationkey":"aim-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Prompt for Aim action when rolling attacks.",
+         "descriptiontranslationkey":"aim-toggle-info"
+      },
+      {  
+         "attribute":"aim-value",
+         "displayname":"AIM VALUE",
+         "displaytranslationkey":"aim-value-u",
+         "type":"number",
+         "value":"1",
+         "description":"The default value for the aim bonus when using the Aim prompt.",
+         "descriptiontranslationkey":"aim-value-info"
+      },
+      {  
+         "attribute":"power-list-toggle",
+         "displayname":"HIDE THE POWER LIST IN THE CHARACTER TAB",
+         "displaytranslationkey":"hide-the-power-list-in-the-character-tab-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Hide the Power list in the Character tab.",
+         "descriptiontranslationkey":"hide-the-power-list-in-the-character-tab-info"
+      },
+      {  
+         "attribute":"spell-list-toggle",
+         "displayname":"HIDE THE SPELL/ARCANA LIST IN THE CHARACTER TAB",
+         "displaytranslationkey":"hide-the-spell-list-in-the-character-tab-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Hide the spell list in the Character tab.",
+         "descriptiontranslationkey":"hide-the-spell-list-in-the-character-tab-info"
+      },
+      {  
+         "attribute":"mana-toggle",
+         "displayname":"SHOW THE MANA/MAGIC POINTS SECTION",
+         "displaytranslationkey":"show-the-mana/magic-points-section-u",
+         "type":"checkbox",
+         "value":"1",
+         "description":"Show the Mana/Magic Points section.",
+         "descriptiontranslationkey":"show-the-mana/magic-points-section-info"
+      },
+      {  
+         "attribute":"exp-toggle",
+         "displayname":"SHOW THE EXPERIENCE POINTS SECTION",
+         "displaytranslationkey":"show-the-experience-points-section-u",
+         "type":"checkbox",
+         "value":"1",
+         "description":"Show the Experience Points section.",
+         "descriptiontranslationkey":"show-the-experience-points-section-info"
+      },
+      {  
+         "attribute":"fatigue-toggle",
+         "displayname":"SHOW THE FATIGUE SECTION",
+         "displaytranslationkey":"show-the-fatigue-section-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Show the Fatigue section. This should be shown for Blue Rose.",
+         "descriptiontranslationkey":"show-the-fatigue-section-info"
+      },
+      {  
+         "attribute":"conviction-toggle",
+         "displayname":"SHOW THE CONVICTION SECTION",
+         "displaytranslationkey":"show-the-conviction-section-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Show the Conviction section. This should be shown for Blue Rose.",
+         "descriptiontranslationkey":"show-the-conviction-section-info"
+      },
+      {  
+         "attribute":"corruption-toggle",
+         "displayname":"SHOW THE CORRUPTION SECTION",
+         "displaytranslationkey":"show-the-corruption-section-u",
+         "type":"checkbox",
+         "value":"0",
+         "description":"Show the Corruption section. This can be shown for Blue Rose.",
+         "descriptiontranslationkey":"show-the-corruption-section-info"
+      },
+      {  
+         "attribute":"ammo-toggle",
+         "displayname":"SHOW THE AMMO COLUMN",
+         "displaytranslationkey":"show-the-ammo-column-u",
+         "type":"checkbox",
+         "value":"1",
+         "description":"Show the Ammo column. This can be hidden for Blue Rose.",
+         "descriptiontranslationkey":"show-the-ammo-column-info"
+      },
+      {  
+         "attribute":"money-toggle",
+         "displayname":"SHOW THE MONEY/CURRENCY SECTION",
+         "displaytranslationkey":"show-the-money/currency-section-u",
+         "type":"checkbox",
+         "value":"1",
+         "description":"Show the Money/Currency section. This can be hidden for Blue Rose.",
+         "descriptiontranslationkey":"show-the-money/currency-section-info"
+      }
+   ]
+}
\ No newline at end of file
diff --git a/AGE System/translation.json b/AGE System/translation.json
index 92e92c1aa8..8bc403836d 100644
--- a/AGE System/translation.json	
+++ b/AGE System/translation.json	
@@ -1,109 +1,158 @@
-{
-	"character-u": "CHARACTER",
-	"persona-u": "PERSONA",
-	"powers-u": "POWERS",
-	"focuses-u": "FOCUSES",
-	"magic-u": "MAGIC",
-	"arcana-u": "ARCANA",
-	"old-u": "OLD",
-	"char-name-u": "CHARACTER NAME",
-	"mage": "Mage",
-	"rogue": "Rogue",
-	"warrior": "Warrior",
-	"class-u": "CLASS",
-	"level-u": "LEVEL",
-	"race-u": "RACE",
-	"background-u": "BACKGROUND",
-	"social-class-u": "SOCIAL CLASS",
-	"adept": "Adept",
-	"expert": "Expert",
-	"age-u": "AGE",
-	"genger-u": "GENDER",
-	"height-u": "HEIGHT",
-	"weight-u": "WEIGHT",
-	"calling-u": "CALLING",
-	"destiny-u": "DESTINY",
-	"fate-u": "FATE",
-	"accuracy-u": "ACCURACY",
-	"communication-u": "COMMUNICATION",
-	"constitution-u": "CONSTITUTION",
-	"cunning-u": "CUNNING",
-	"dexterity-u": "DEXTERITY",
-	"fighting-u": "FIGHTING",
-	"intelligence-u": "INTELLIGENCE",
-	"perception-u": "PERCEPTION",
-	"strength-u": "STRENGTH",
-	"willpower-u": "WILLPOWER",
-	"health-u": "HEALTH",
-	"max": "Max",
-	"fatigue-u": "FATIGUE",
-	"none": "None",
-	"winded": "Winded",
-	"fatigued": "Fatigued",
-	"exhausted": "Exhausted",
-	"dying": "Dying",
-	"conviction-u": "CONVICTION",
-	"corruption-u": "CORRUPTION",
-	"mana-u": "MANA",
-	"experience-points-u": "EXPERIENCE POINTS",
-	"next": "Next",
-	"speed-u": "SPEED",
-	"defense-u": "DEFENSE",
-	"armor-u": "ARMOR",
-	"base": "Base",
-	"shield": "Shield",
-	"Penalty": "Penalty",
-	"attack-u": "ATTACK",
-	"range-u": "RANGE",
-	"reload-u": "RELOAD",
-	"roll-u": "ROLL",
-	"damage-u": "DAMAGE",
-	"power-name-u": "POWER NAME",
-	"short-description-u": "SHORT DESCRIPTION",
-	"spell-name-u": "SPELL NAME",
-	"arcanum-name-u": "ARCANUM NAME",
-	"equipment-name-u": "EQUIPMENT NAME",
-	"quantity-u": "QUANTITY",
-	"description-u": "DESCRIPTION",
-	"eye-u": "EYES",
-	"skin-u": "SKIN",
-	"hair-u": "HAIR",
-	"languages-u": "LANGUAGES",
-	"goals-u": "GOALS",
-	"honorifics-titles-and-memberships-u": "HONORIFICS, TITLES AND MEMBERSHIPS",
-	"relationships-u": "RELATIONSHIPS",
-	"character-appearance-u": "CHARACTER APPEARANCE",
-	"char-notes-u": "CHARACTER NOTES",
-	"specialization1-u": "SPECIALIZATION 1",
-	"specialization1-degree-u": "DEGREE",
-	"specialization2-u": "SPECIALIZATION 2",
-	"type-or-level:-u": "TYPE OR LEVEL:",
-	"SOURCE:-u": "SOURCE:",
-	"short-desc.:-u": "SHORT DESC.:",
-	"description:-u": "DESCRIPTION:",
-	"focus:-u": "FOCUS:",
-	"school:-u": "SCHOOL:",
-	"type:-u": "TYPE:",
-	"mana-cost:-u": "MANA COST:",
-	"cast-time:-u": "CAST TIME:",
-	"tn:-u": "TN:",
-	"test:-u": "TEST:",
-	"spellpower:-u": "SPELLPOWER:",
-	"focus-bonus:-u": "FOCUS BONUS:",
-	"cast-spell:-u": "CAST SPELL:",
-	"arcana:-u": "ARCANA:",
-	"mp-cost:-u": "MP COST:",
-	"talent:-u": "TALENT:",
-	"time:-u": "TIME:",
-	"resistance:-u": "RESISTANCE:",
-	"fatigue-tn:-u": "FATIGUE TN:",
-	"ability:-u": "ABILITY:",
-	"communication": "Communication",
-	"intelligence": "Intelligence",
-	"Perception": "Perception",
-	"game-system-u": "GAME SYSTEM",
-	"color-selection-u": "COLOR SELECTION",
-	"sections-u": "SECTIONS",
-	"hide-the-power-list-in-the-character-tab": "Hide the Power list in the Character tab",
-	"hide-the-spell/arcana-in-the-character-tab": "Hide the Spell/Arcana list in the Character tab"
+{  
+   "character-u":"CHARACTER",
+   "persona-u":"PERSONA",
+   "powers-u":"POWERS",
+   "focuses-u":"FOCUSES",
+   "magic-u":"MAGIC",
+   "arcana-u":"ARCANA",
+   "old-u":"OLD",
+   "char-name-u":"CHARACTER NAME",
+   "mage":"Mage",
+   "rogue":"Rogue",
+   "warrior":"Warrior",
+   "class-u":"CLASS",
+   "level-u":"LEVEL",
+   "race-u":"RACE",
+   "background-u":"BACKGROUND",
+   "social-class-u":"SOCIAL CLASS",
+   "adept":"Adept",
+   "expert":"Expert",
+   "age-u":"AGE",
+   "genger-u":"GENDER",
+   "height-u":"HEIGHT",
+   "weight-u":"WEIGHT",
+   "calling-u":"CALLING",
+   "destiny-u":"DESTINY",
+   "fate-u":"FATE",
+   "accuracy-u":"ACCURACY",
+   "communication-u":"COMMUNICATION",
+   "constitution-u":"CONSTITUTION",
+   "cunning-u":"CUNNING",
+   "dexterity-u":"DEXTERITY",
+   "fighting-u":"FIGHTING",
+   "intelligence-u":"INTELLIGENCE",
+   "perception-u":"PERCEPTION",
+   "strength-u":"STRENGTH",
+   "willpower-u":"WILLPOWER",
+   "health-u":"HEALTH",
+   "max":"Max",
+   "mana-u":"MANA",
+   "magic-points-u":"MAGIC POINTS",
+   "experience-points-u":"EXPERIENCE POINTS",
+   "next":"Next",
+   "fatigue-u":"FATIGUE",
+   "none":"None",
+   "winded":"Winded",
+   "fatigued":"Fatigued",
+   "exhausted":"Exhausted",
+   "dying":"Dying",
+   "conviction-u":"CONVICTION",
+   "corruption-u":"CORRUPTION",
+   "speed-u":"SPEED",
+   "defense-u":"DEFENSE",
+   "armor-u":"ARMOR",
+   "base":"Base",
+   "shield":"Shield",
+   "Penalty":"Penalty",
+   "attack-u":"ATTACK",
+   "range-u":"RANGE",
+   "reload-u":"RELOAD",
+   "roll-u":"ROLL",
+   "damage-u":"DAMAGE",
+   "power-name-u":"POWER NAME",
+   "short-description-u":"SHORT DESCRIPTION",
+   "spell-name-u":"SPELL NAME",
+   "arcanum-name-u":"ARCANUM NAME",
+   "equipment-name-u":"EQUIPMENT NAME",
+   "quantity-u":"QUANTITY",
+   "description-u":"DESCRIPTION",
+   "eye-u":"EYES",
+   "skin-u":"SKIN",
+   "hair-u":"HAIR",
+   "languages-u":"LANGUAGES",
+   "goals-u":"GOALS",
+   "honorifics-titles-and-memberships-u":"HONORIFICS, TITLES AND MEMBERSHIPS",
+   "relationships-u":"RELATIONSHIPS",
+   "character-appearance-u":"CHARACTER APPEARANCE",
+   "char-notes-u":"CHARACTER NOTES",
+   "specialization1-u":"SPECIALIZATION 1",
+   "specialization1-degree-u":"DEGREE",
+   "specialization2-u":"SPECIALIZATION 2",
+   "type-or-level:-u":"TYPE OR LEVEL:",
+   "SOURCE:-u":"SOURCE:",
+   "short-desc.:-u":"SHORT DESC.:",
+   "description:-u":"DESCRIPTION:",
+   "focus:-u":"FOCUS:",
+   "school:-u":"SCHOOL:",
+   "type:-u":"TYPE:",
+   "mana-cost:-u":"MANA COST:",
+   "cast-time:-u":"CAST TIME:",
+   "tn:-u":"TN:",
+   "test:-u":"TEST:",
+   "spellpower:-u":"SPELLPOWER:",
+   "focus-bonus:-u":"FOCUS BONUS:",
+   "cast-spell:-u":"CAST SPELL:",
+   "arcana:-u":"ARCANA:",
+   "mp-cost:-u":"MP COST:",
+   "talent:-u":"TALENT:",
+   "time:-u":"TIME:",
+   "resistance:-u":"RESISTANCE:",
+   "fatigue-tn:-u":"FATIGUE TN:",
+   "ability:-u":"ABILITY:",
+   "communication":"Communication",
+   "intelligence":"Intelligence",
+   "Perception":"Perception",
+   "game-system-u":"GAME SYSTEM",
+   "color-selection-u":"COLOR SELECTION",
+   "black":"Black",
+   "red":"Red",
+   "teal-1":"Teal 1",
+   "teal-2":"Teal 2",
+   "blue":"Blue",
+   "rolls-u":"ROLLS",
+   "whisper-rolls-to-gm":"Whisper rolls to GM",
+   "never-whisper-roll":"Never Whisper Rolls",
+   "query-whisper-roll":"Query Whisper",
+   "always-whisper-roll":"Always Whisper Rolls",
+   "whisper-rolls-to-gm-warning":"Does not work with API script yet, the Summary will not be whispered to the GM.",
+   "options-u":"OPTIONS",
+   "prompt-for-aim-action-when-rolling-attacks":"Prompt for Aim action when rolling attacks",
+   "aim-value-a-value-must-be-entered-here":"Aim value (a number MUST be entered here)",
+   "sections-u":"SECTIONS",
+   "hide-the-power-list-in-the-character-tab":"Hide the Power list in the Character tab",
+   "hide-the-spell-list-in-the-character-tab":"Hide the spell list in the Character tab",
+   "show-the-mana/magic-points-section":"Show the Mana/Magic Points section",
+   "show-the-experience-points-section":"Show the Experience Points section",
+   "show-the-fatigue-section":"Show the Fatigue section",
+   "show-the-conviction-section":"Show the Conviction section",
+   "show-the-corruption-section":"Show the Corruption section",
+   "show-the-ammo-column":"Show the Ammo column",
+   "show-the-money/currency-section":"Show the Money/Currency section",
+   "select-game-system-info":"Select the game system.",
+   "color-u":"COLOR",
+   "select-color-info":"Select the color for character sheets.",
+   "whisp-rolls-gm-u":"WHISPER ROLLS TO GM",
+   "whisp-rolls-gm-info":"DOES NOT WORK WITH THE API SCRIPT YET, THE SUMMARY WILL NOT WHISPERED TO THE GM. All sheet rolls are sent to all players in chat by default. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Rolls will send all rolls only to yourself and the GM.",
+   "aim-u":"AIM",
+   "aim-toggle-info":"Prompt for Aim action when rolling attacks.",
+   "aim-value-u":"AIM VALUE",
+   "aim-value-info":"The default value for the aim bonus when using the Aim prompt.",
+   "hide-the-power-list-in-the-character-tab-u":"HIDE THE POWER LIST IN THE CHARACTER TAB",
+   "hide-the-power-list-in-the-character-tab-info":"Hide the Power list in the Character tab.",
+   "hide-the-spell-list-in-the-character-tab-u":"HIDE THE SPELL/ARCANA LIST IN THE CHARACTER TAB",
+   "hide-the-spell-list-in-the-character-tab-info":"Hide the spell list in the Character tab.",
+   "show-the-mana/magic-points-section-u":"SHOW THE MANA/MAGIC POINTS SECTION",
+   "show-the-mana/magic-points-section-info":"Show the Mana/Magic Points section.",
+   "show-the-experience-points-section-u":"SHOW THE EXPERIENCE POINTS SECTION",
+   "show-the-experience-points-section-info":"Show the Experience Points section.",
+   "show-the-fatigue-section-u":"SHOW THE FATIGUE SECTION",
+   "show-the-fatigue-section-info":"Show the Fatigue section. This should be shown for Blue Rose.",
+   "show-the-conviction-section-u":"SHOW THE CONVICTION SECTION",
+   "show-the-conviction-section-info":"Show the Conviction section. This should be shown for Blue Rose.",
+   "show-the-corruption-section-u":"SHOW THE CORRUPTION SECTION",
+   "show-the-corruption-section-info":"Show the Corruption section. This can be shown for Blue Rose.",
+   "show-the-ammo-column-u":"SHOW THE AMMO COLUMN",
+   "show-the-ammo-column-info":"Show the Ammo column. This can be hidden for Blue Rose.",
+   "show-the-money/currency-section-u":"SHOW THE MONEY/CURRENCY SECTION",
+   "show-the-money/currency-section-info":"Show the Money/Currency section. This can be hidden for Blue Rose."
 }
\ No newline at end of file