diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html
index 9c6e29a78b..d9131efe3f 100644
--- a/ShadowbaneInquisition/Shadowbane.html
+++ b/ShadowbaneInquisition/Shadowbane.html
@@ -963,7 +963,7 @@
 						<input name='attr_skill_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_skill_r_focus' type='hidden' value=''>
 						<input name='attr_skill_r_unnat' type='hidden' value=''>
-						<button type='roll' name='skill_Roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{skill_r_name}}} {{dos=[[[[1+floor(abs([[{{ {@{skill_r_total}+@{inlinemod-toggle}}, {@{skill_r_focus}-@{limiter}}}kh1, {@{skill_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{skill_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'
+						<button type='roll' name='skill_Roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{skill_name}}} {{dos=[[[[1+floor(abs([[{{ {@{skill_r_total}+@{inlinemod-toggle}}, {@{skill_r_focus}-@{limiter}}}kh1, {@{skill_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{skill_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'
 						  class='clear'><input name='attr_skill_r_total' value='@{skill_r_focus}+@{skill_r_mod2}+[[@{skill_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>
@@ -994,7 +994,7 @@
 					<input name='attr_linguistics_mod3' type='checkbox' value='50' class='skills_item' />
 					<input name='attr_linguistics_focus' type='hidden' value=''>
 					<input name='attr_linguistics_unnat' type='hidden' value=''>
-					<button name='linguistics_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_total}+@{inlinemod-toggle}}, {@{linguistics_focus}-@{limiter}}}kh1, {@{linguistics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+					<button name='linguistics_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Linguistics: @{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_total}+@{inlinemod-toggle}}, {@{linguistics_focus}-@{limiter}}}kh1, {@{linguistics_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 						<input name='attr_linguistics_total' value='@{linguistics_focus}+@{linguistics_mod2}+@{linguistics_mod3}-20' class='input_background' disabled /></button>
 				</div>
 				<fieldset name='linguistics' class='repeating_linguistics'>
@@ -1011,7 +1011,7 @@
 						<input name='attr_linguistics_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_linguistics_r_focus' type='hidden' value=''>
 						<input name='attr_linguistics_r_unnat' type='hidden' value=''>
-						<button name='linguistics_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_r_total}+@{inlinemod-toggle}}, {@{linguistics_r_focus}-@{limiter}}}kh1, {@{linguistics_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+						<button name='linguistics_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Linguistics: @{linguistics_name} }} {{dos=[[[[1+floor(abs([[{{ {@{linguistics_r_total}+@{inlinemod-toggle}}, {@{linguistics_r_focus}-@{limiter}}}kh1, {@{linguistics_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{linguistics_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 							<input name='attr_linguistics_r_total' value='@{linguistics_r_focus}+@{linguistics_r_mod2}+@{linguistics_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>
@@ -1042,7 +1042,7 @@
 					<input name='attr_common-lore_mod3' type='checkbox' value='50' class='skills_item' />
 					<input name='attr_common-lore_focus' type='hidden' value=''>
 					<input name='attr_common-lore_unnat' type='hidden' value=''>
-					<button name='common-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_total}+@{inlinemod-toggle}}, {@{common-lore_focus}-@{limiter}}}kh1, {@{common-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+					<button name='common-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Common-Lore: @{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_total}+@{inlinemod-toggle}}, {@{common-lore_focus}-@{limiter}}}kh1, {@{common-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 						<input name='attr_common-lore_total' value='@{common-lore_focus}+@{common-lore_mod2}+@{common-lore_mod3}-20' class='input_background' disabled /></button>
 				</div>
 				<fieldset name='common-lore' class='repeating_common-lore'>
@@ -1059,7 +1059,7 @@
 						<input name='attr_common-lore_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_common-lore_r_focus' type='hidden' value=''>
 						<input name='attr_common-lore_r_unnat' type='hidden' value=''>
-						<button name='common-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_r_total}+@{inlinemod-toggle}}, {@{common-lore_r_focus}-@{limiter}}}kh1, {@{common-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+						<button name='common-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Common-Lore: @{common-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{common-lore_r_total}+@{inlinemod-toggle}}, {@{common-lore_r_focus}-@{limiter}}}kh1, {@{common-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{common-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 							<input name='attr_common-lore_r_total' value='@{common-lore_r_focus}+@{common-lore_r_mod2}+@{common-lore_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>
@@ -1090,7 +1090,7 @@
 					<input name='attr_scholastic-lore_mod3' type='checkbox' value='50' class='skills_item' />
 					<input name='attr_scholastic-lore_focus' type='hidden' value=''>
 					<input name='attr_scholastic-lore_unnat' type='hidden' value=''>
-					<button name='scholastic-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_total}+@{inlinemod-toggle}}, {@{scholastic-lore_focus}-@{limiter}}}kh1, {@{scholastic-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+					<button name='scholastic-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scholastic-Lore: @{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_total}+@{inlinemod-toggle}}, {@{scholastic-lore_focus}-@{limiter}}}kh1, {@{scholastic-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 						<input name='attr_scholastic-lore_total' value='@{scholastic-lore_focus}+@{scholastic-lore_mod2}+@{scholastic-lore_mod3}-20' class='input_background' disabled /></button>
 				</div>
 				<fieldset name='scholastic-lore' class='repeating_scholastic-lore'>
@@ -1107,7 +1107,7 @@
 						<input name='attr_scholastic-lore_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_scholastic-lore_r_focus' type='hidden' value=''>
 						<input name='attr_scholastic-lore_r_unnat' type='hidden' value=''>
-						<button name='scholastic-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_r_total}+@{inlinemod-toggle}}, {@{scholastic-lore_r_focus}-@{limiter}}}kh1, {@{scholastic-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+						<button name='scholastic-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Scholastic-Lore: @{scholastic-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{scholastic-lore_r_total}+@{inlinemod-toggle}}, {@{scholastic-lore_r_focus}-@{limiter}}}kh1, {@{scholastic-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{scholastic-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 							<input name='attr_scholastic-lore_r_total' value='@{scholastic-lore_r_focus}+@{scholastic-lore_r_mod2}+@{scholastic-lore_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>
@@ -1138,7 +1138,7 @@
 					<input name='attr_forbidden-lore_mod3' type='checkbox' value='50' class='skills_item' />
 					<input name='attr_forbidden-lore_focus' type='hidden' value=''>
 					<input name='attr_forbidden-lore_unnat' type='hidden' value=''>
-					<button name='forbidden-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_total}+@{inlinemod-toggle}}, {@{forbidden-lore_focus}-@{limiter}}}kh1, {@{forbidden-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+					<button name='forbidden-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Forbidden-Lore: @{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_total}+@{inlinemod-toggle}}, {@{forbidden-lore_focus}-@{limiter}}}kh1, {@{forbidden-lore_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 						<input name='attr_forbidden-lore_total' value='@{forbidden-lore_focus}+@{forbidden-lore_mod2}+@{forbidden-lore_mod3}-20' class='input_background' disabled /></button>
 				</div>
 				<fieldset name='forbidden-lore' class='repeating_forbidden-lore'>
@@ -1155,7 +1155,7 @@
 						<input name='attr_forbidden-lore_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_forbidden-lore_r_focus' type='hidden' value=''>
 						<input name='attr_forbidden-lore_r_unnat' type='hidden' value=''>
-						<button name='forbidden-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_r_total}+@{inlinemod-toggle}}, {@{forbidden-lore_r_focus}-@{limiter}}}kh1, {@{forbidden-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+						<button name='forbidden-lore_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Forbidden-Lore: @{forbidden-lore_name} }} {{dos=[[[[1+floor(abs([[{{ {@{forbidden-lore_r_total}+@{inlinemod-toggle}}, {@{forbidden-lore_r_focus}-@{limiter}}}kh1, {@{forbidden-lore_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{forbidden-lore_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 							<input name='attr_forbidden-lore_r_total' value='@{forbidden-lore_r_focus}+@{forbidden-lore_r_mod2}+@{forbidden-lore_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>
@@ -1187,7 +1187,7 @@
 					<input name='attr_trade_mod3' type='checkbox' value='50' class='skills_item' />
 					<input name='attr_trade_focus' type='hidden' value=''>
 					<input name='attr_trade_unnat' type='hidden' value=''>
-					<button name='trade_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_total}+@{inlinemod-toggle}}, {@{trade_focus}-@{limiter}}}kh1, {@{trade_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+					<button name='trade_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Trade: @{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_total}+@{inlinemod-toggle}}, {@{trade_focus}-@{limiter}}}kh1, {@{trade_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 						<input name='attr_trade_total' value='@{trade_focus}+@{trade_mod2}+@{trade_mod3}-20' class='input_background' disabled /></button>
 				</div>
 				<fieldset name='trade' class='repeating_trade'>
@@ -1205,7 +1205,7 @@
 						<input name='attr_trade_r_mod3' type='checkbox' value='50' class='skills_item' />
 						<input name='attr_trade_r_focus' type='hidden' value=''>
 						<input name='attr_trade_r_unnat' type='hidden' value=''>
-						<button name='trade_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=@{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_r_total}+@{inlinemod-toggle}}, {@{trade_r_focus}-@{limiter}}}kh1, {@{trade_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
+						<button name='trade_roll' type='roll' class='clear' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{roll-name=Trade: @{trade_name} }} {{dos=[[[[1+floor(abs([[{{ {@{trade_r_total}+@{inlinemod-toggle}}, {@{trade_r_focus}-@{limiter}}}kh1, {@{trade_r_focus}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{trade_r_unnat}/2)]]}} {{target=$[[0]]}} {{roll=$[[1]]}} {{dof=$[[2]]}}'>
 							<input name='attr_trade_r_total' value='@{trade_r_focus}+@{trade_r_mod2}+@{trade_r_mod3}-20' class='input_background' disabled /></button>
 					</div>
 				</fieldset>