diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 56cea5d75f..2bd073743b 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -6888,12 +6888,12 @@ make sure to enter what the spell is resisted with">
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spellrollmageeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Bonus}}{{val5_num=[[@{drainbonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Force|6}]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
-                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnoeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Level ?{Level|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{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=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
+                        <button type="roll" class="spellrollmage" name="roll_spellrollmageeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Drain Bonus}}{{val5_num=[[@{drainbonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Force|6}]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+@{drainbonus})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
+                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnoeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Level ?{Level|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{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=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spellrollmagefull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Bonus}}{{val5_num=[[@{drainbonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}+?{Increase Drain|0}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
-                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnofull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Level ?{Level|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{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=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
+                        <button type="roll" class="spellrollmage" name="roll_spellrollmagefull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Drain Bonus}}{{val5_num=[[@{drainbonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}+?{Increase Drain|0}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+@{drainbonus}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
+                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnofull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Level ?{Level|6}}}{{subheader=@{spellcategory} - @{spelltype} - @{spellrange} - @{spellduration}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{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=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+@{drainbonus}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}"></button>
                     </div>
                 </div>
             </fieldset>