diff --git a/AGE System/AGE System.css b/AGE System/AGE System.css
index 4368ba0dd7..e3419e135c 100644
--- a/AGE System/AGE System.css	
+++ b/AGE System/AGE System.css	
@@ -1319,6 +1319,10 @@ input.sheet-blue-rose-button:checked ~ .sheet-page .sheet-age-selected {
 		border-radius: 0px;
 }
 
+.sheet-tab6 .sheet-section select[name="attr_char-name-option"] {
+		width: 75px;
+}
+
 input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-noaim,
 input.sheet-aim-checkbox:checked ~ .sheet-page .sheet-attackroll-noaim::before
 {
diff --git a/AGE System/AGE System.html b/AGE System/AGE System.html
index 54ddb1f62a..f756aec558 100644
--- a/AGE System/AGE System.html	
+++ b/AGE System/AGE System.html	
@@ -162,7 +162,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -173,7 +173,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -185,7 +185,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -195,7 +195,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -207,7 +207,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -218,7 +218,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -230,7 +230,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -241,7 +241,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -253,7 +253,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -264,7 +264,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -276,7 +276,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -287,7 +287,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -299,7 +299,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -310,7 +310,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -322,7 +322,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -333,7 +333,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -345,7 +345,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -356,7 +356,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -368,7 +368,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -379,7 +379,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -391,7 +391,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="@{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>
+								<button class="abilities-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -402,7 +402,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="@{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>
+								<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -615,7 +615,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -641,7 +641,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -668,7 +668,7 @@
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
 							<div class="col repeatingcol">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -1097,7 +1097,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1115,7 +1115,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1133,7 +1133,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1151,7 +1151,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1171,7 +1171,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1189,7 +1189,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1207,7 +1207,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1225,7 +1225,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1243,7 +1243,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1263,7 +1263,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1281,7 +1281,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1299,7 +1299,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="@{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>
+							<button class="focus-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}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>
@@ -1498,7 +1498,7 @@
 								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -1587,7 +1587,7 @@
 								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>
 							<div class="row">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -1680,7 +1680,7 @@
 								<input type="number" placeholder="*" name="attr_spell-focus-bonus">
 							</div>	
 							<div class="row">
-								<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>
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{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>
@@ -1855,7 +1855,15 @@
 				</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 class="col whisper-rolls-text">
+					<span data-i18n="show-the-character-name-in-roll-results">Show the character name in roll results</span>
+				</div>
+				<div class="col">
+                    <select name="attr_char-name-option">
+                        <option value="@{character_name} &#124; " data-i18n="show">Show</option>
+                        <option value=" " data-i18n="hide">Hide</option>
+                    </select>
+				</div>
 			</div>
 		</div>
 		<div class="section larger-section">
@@ -2935,4 +2943,4 @@
 <!-- END OF OLD SHEET -->
 </div>
 <!-- END OF PC SHEET -->
-</div>
+</div>
\ No newline at end of file
diff --git a/AGE System/sheet.json b/AGE System/sheet.json
index b3d9fc60f4..ecf29fc8ac 100644
--- a/AGE System/sheet.json	
+++ b/AGE System/sheet.json	
@@ -4,7 +4,7 @@
    "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.",
+   "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 migration to this new sheet. An API script (TotalRolled for AGE) is also available to totals rolls and calculate stunt points.",
    "useroptions":[  
       {  
          "attribute":"game",
@@ -58,9 +58,24 @@
             "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.",
+         "description":"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":"char-name-option",
+         "displayname":"Show the character name in roll results",
+         "displaytranslationkey":"show-the-character-name-in-roll-results",
+         "type":"select",
+         "options":[  
+            "Show|@{character_name} &#124; ",
+            "Hide| "
+         ],
+         "optiontranslationkeys":[  
+            "show",
+            "hide"
+         ],
+         "default":"@{character_name} &#124; "
+      },
       {  
          "attribute":"aim-toggle",
          "displayname":"Prompt for Aim action when rolling attacks",
diff --git a/AGE System/translation.json b/AGE System/translation.json
index 4ae7f2ad26..da6a4f045e 100644
--- a/AGE System/translation.json	
+++ b/AGE System/translation.json	
@@ -114,7 +114,9 @@
    "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.",
+   "show-the-character-name-in-roll-results":"Show the character name in roll results",
+   "show":"Show",
+   "hide":"Hide",
    "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)",
@@ -133,7 +135,7 @@
    "color-selection":"Color Selection",
    "color-selection-info":"Select the color for the character sheet section headers and buttons.",
    "whisp-rolls-gm":"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.",
+   "whisp-rolls-gm-info":"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-toggle-default":"Prompt for Aim action when rolling attacks",
    "aim-value-default":"Aim Value",
    "aim-value-default-info":"The default value for the aim bonus when using the Aim prompt. It should be 1 unless a power or talent changes it.",