diff --git a/Sigil-Shadow/sigil-shadow.html b/Sigil-Shadow/sigil-shadow.html
index 30faa0af60..c3e8bb97ba 100644
--- a/Sigil-Shadow/sigil-shadow.html
+++ b/Sigil-Shadow/sigil-shadow.html
@@ -50,7 +50,7 @@
                 <input type='number' name='attr_dexterity' value='0' min='0'/> <b>%</b>
                 <button type='roll' value='&{template:default} {{name=Logic Check}} {{Success Value = [[@{logic} + ?{Modifier|0}]]}} {{Roll=[[1d100]]}}' name='roll_logic'></button><b>Logic</b>
                 <input type='number' name='attr_logic' value='0' min='0'/> <b>%</b>
-                <button type='roll' value='&{template:default} {{name=Wllpower Check}} {{Success Value = [[@{willpower} + ?{Modifier|0}]]}} {{Roll=[[1d100]]}}' name='roll_willpower'></button><b>Willpower</b>
+                <button type='roll' value='&{template:default} {{name=Willpower Check}} {{Success Value = [[@{willpower} + ?{Modifier|0}]]}} {{Roll=[[1d100]]}}' name='roll_willpower'></button><b>Willpower</b>
                 <input type='number' name='attr_willpower' value='0' min='0'/> <b>%</b>
                 
 	        </div>
@@ -122,7 +122,7 @@
                     
             <fieldset class='repeating_combatfocus'>
                         
-            <button type='roll' value='&{template:default} {{name=@{combatfocus} Check}} {{Success Value = [[?{Ability | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} | Willpower, @{willpower}  }} + @{combatfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_combatfocus'></button>
+            <button type='roll' value='&{template:default} {{name=@{combatfocus} Check}} {{Success Value = [[?{Ability | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} | Willpower, @{willpower}} + @{combatfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_combatfocus'></button>
             <input type='text' name='attr_combatfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_combatfocus_trained' value='1'> 
             <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_combatfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_combatfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
@@ -141,7 +141,7 @@
                     
             <fieldset class='repeating_educationfocus'>
                             
-           <button type='roll' value='&{template:default} {{name=@{educationfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{educationfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_educationfocus'></button>
+           <button type='roll' value='&{template:default} {{name=@{educationfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity}} + @{educationfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_educationfocus'></button>
             <input type='text' name='attr_educationfocus' style='width:75px'placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_educationfocus_trained' value='1'> 
             <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_educationfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_educationfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
@@ -189,7 +189,7 @@
                     
             <fieldset class='repeating_socialfocus'>
                             
-            <button type='roll' value='&{template:default} {{name=@{socialfocus} Check}} {{Success Value = [[?{Ability | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic} }} + @{socialfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_socialfocus'></button>
+            <button type='roll' value='&{template:default} {{name=@{socialfocus} Check}} {{Success Value = [[?{Ability | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} | Logic, @{logic}} + @{socialfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_socialfocus'></button>
             <input type='text' name='attr_socialfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_socialfocus_trained' value='1'> 
             <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_socialfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_socialfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>
@@ -214,7 +214,7 @@
                     
             <fieldset class='repeating_technicalfocus'>
                             
-            <button type='roll' value='&{template:default} {{name=@{technicalfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity} }} + @{technicalfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_technicalfocus'></button>
+            <button type='roll' value='&{template:default} {{name=@{technicalfocus} Check}} {{Success Value = [[?{Ability | Logic, @{logic} | Willpower, @{willpower} | Strength, @{strength} | Dexterity, @{dexterity}} + @{technicalfocusscore} + ?{Modifier|0} ]]}} {{Roll=[[1d100]]}}' name='roll_technicalfocus'></button>
             <input type='text' name='attr_technicalfocus' style='width:75px' placeholder='Add Focus'></b>&nbsp; &nbsp;</b><b>Trained?&nbsp;</b><input type='checkbox' name='attr_technicalfocus_trained' value='1'> 
             <b>&nbsp;&nbsp;&nbsp;Lvl&nbsp;</b><input type='number' name='attr_technicalfocuslevel' value='0' min='0' max='5'/>
             <b>Score&nbsp;</b><input type='number' name='attr_technicalfocusscore' value='0' min='-100'/><b>&nbsp;%</b><br>