diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index db57d7a9a4..b1264a8f3f 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -8597,10 +8597,10 @@ make sure to enter what the spell is resisted with">
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="action" class="spellrolltechno" name="act_roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{prefix-spellname} - Level ?{Level|6}}}{{subheader=@{prefix-spellcategory} - @{prefix-spelltype} - @{prefix-spellrange} - @{prefix-spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{prefix-spellschool_name}}}{{val2_num=[[@{prefix-spellschool}+@{prefix-spellspecialized}+@{prefix-spellbonus}-(@{mag_total})]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{prefix-spellschool}+@{prefix-spellspecialized}+@{prefix-spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{prefix-spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{prefix-spelldescription}}}"></button>
+                        <button type="action" class="spellrolltechno" name="act_roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{prefix-spellname} - Level ?{Level|6}}}{{subheader=@{prefix-spellcategory} - @{prefix-spelltype} - @{prefix-spellrange} - @{prefix-spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{prefix-spellschool_name}}}{{val2_num=[[[[@{prefix-spellschool}]]+[[@{prefix-spellspecialized}[Spec]]]+@{prefix-spellbonus}-([[@{skillattr_value42}]])]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[([[[[@{prefix-spellschool}]]+[[@{prefix-spellspecialized}[Spec]]]+@{prefix-spellbonus}-([[@{skillattr_value42}]])]]+[[@{mag_total}[Resonance]]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{prefix-spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[ ( @{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0} )@{standardroll} ]]}}{{description=@{prefix-spelldescription}}}"></button>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="action" class="spellrolltechno" name="act_roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{prefix-spellname} - Level ?{Level|6}}}{{subheader=@{prefix-spellcategory} - @{prefix-spelltype} - @{prefix-spellrange} - @{prefix-spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{prefix-spellschool_name}}}{{val2_num=[[@{prefix-spellschool}+@{prefix-spellspecialized}+@{prefix-spellbonus}-(@{mag_total})]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{prefix-spellschool}+@{prefix-spellspecialized}+@{prefix-spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{prefix-spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{prefix-spelldescription}}}"></button>
+                        <button type="action" class="spellrolltechno" name="act_roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{prefix-spellname} - Level ?{Level|6}}}{{subheader=@{prefix-spellcategory} - @{prefix-spelltype} - @{prefix-spellrange} - @{prefix-spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{prefix-spellschool_name}}}{{val2_num=[[[[@{prefix-spellschool}]]+[[@{prefix-spellspecialized}[Spec]]]+@{prefix-spellbonus}-([[@{skillattr_value42}]])]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[([[[[@{prefix-spellschool}]]+[[@{prefix-spellspecialized}[Spec]]]+@{prefix-spellbonus}-([[@{skillattr_value42}]])]]+[[@{mag_total}[Resonance]]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{prefix-spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[ ( @{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0} )@{standardroll} ]]}}{{description=@{prefix-spelldescription}}}"></button>
                     </div>
                 </div>
             </fieldset>