diff --git a/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html b/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
index 07a630d15e..7f0dbb0526 100644
--- a/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
+++ b/Shadowrun5e-Gerdofal/Shadowrun5e-Gerdofal.html
@@ -1317,12 +1317,12 @@ Changes in this version:
             <input type="text" name="attr_spelldesc" />
           </div>
           <div class="sheet-item sheet-puny">
-            <button type="roll" name="roll_spellroll" value="@{gmonlyrolls}&{template:@{templatechoice}}{{shownotes=@{configshownotes}}}{{name=@{name}}}{{roll_header=@{spellname}}}{{v1=Force}} {{v1_num=?{Force?|0}}}{{v2=Willpower}} {{v2_num=@{willpower}}}{{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v8=Drain Modifier}} {{v8_num=?{Drain Modifiers?|0}}}{{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{result3_label=Drain Resisted}} {{limit=?{Force?|0}}}{{result3=[[(@{willpower}+@{drainfadeattribute}+?{Drain Modifiers?|0}+@{initsubgrade})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
+            <button type="roll" name="roll_spellroll" value="@{gmonlyrolls}&{template:@{templatechoice}}{{shownotes=@{configshownotes}}}{{name=@{name}}}{{roll_header=@{spellname}}}{{v1=Force}} {{v1_num=?{Force?|0}}}{{v2=Willpower}} {{v2_num=@{willpower}}}{{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Spell Drain}} {{v6_num=F@{spelldrain}}} {{v7=Misc}} {{v7_num=@{spellmisc}}} {{v8=Drain Modifier}} {{v8_num=?{Drain Modifiers?|0}}}{{v9=Situational Modifier}} {{v9_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{result3_label=Drain Resisted}} {{limit=?{Force?|0}}}{{result3=[[(@{willpower}+@{drainfadeattribute}+?{Drain Modifiers?|0})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
             <input type="number" name="attr_spellrollshow" value="(@{spellsoftskillvalue}+@{magicresonance})" disabled="true" />
             </button>
           </div>
           <div class="sheet-item sheet-puny">
-            <button type="roll" name="roll_spellspecroll" value="@{gmonlyrolls}&{template:@{templatechoice}} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Specialized}} {{v6_num=2}} {{v7=Spell Drain}} {{v7_num=F@{spelldrain}}} {{v8=Misc}} {{v8_num=@{spellmisc}}} {{v9=Drain Modifier}} {{v9_num=?{Drain Modifiers?|0}}} {{v10=Situational Modifier}} {{v10_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+2+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{limit=?{Force?|0}}} {{result3_label=Drain Resisted}} {{result3=[[(@{willpower}+@{drainfadeattribute}+?{Drain Modifiers?|0}+@{initsubgrade})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
+            <button type="roll" name="roll_spellspecroll" value="@{gmonlyrolls}&{template:@{templatechoice}} {{shownotes=@{configshownotes}}} {{name=@{name}}} {{roll_header=@{spellname}}} {{v1=Force}} {{v1_num=?{Force?|0}}} {{v2=Willpower}} {{v2_num=@{willpower}}} {{v3=Drain Attribute}} {{v3_num=@{drainfadeattribute}}} {{v4=Magic/Resonance}} {{v4_num=@{magicresonance}}} {{v5=Skill}} {{v5_num=@{spellsoftskillvalue}}} {{v6=Specialized}} {{v6_num=2}} {{v7=Spell Drain}} {{v7_num=F@{spelldrain}}} {{v8=Misc}} {{v8_num=@{spellmisc}}} {{v9=Drain Modifier}} {{v9_num=?{Drain Modifiers?|0}}} {{v10=Situational Modifier}} {{v10_num=?{Situational Modifiers?|0}}} {{woundpenalty=[[@{calcwoundmod}]]}} {{result1_label=Casting Success}} {{result1=[[(@{spellsoftskillvalue}+@{spellmisc}+@{magicresonance}-@{calcwoundmod}+2+?{Situational Modifiers?|0})d6>5sk?{Force?|0}]]}} {{result2_label=Incoming Drain (min 2)}} {{result2=[[(?{Force?|0}+@{spelldrain})]]}} {{limit=?{Force?|0}}} {{result3_label=Drain Resisted}} {{result3=[[(@{willpower}+@{drainfadeattribute}+?{Drain Modifiers?|0})d6>5s]]}} {{description=@{spelldesc}}}" title="Spell Roll" />
             <input type="number" name="attr_spellspecrollshow" value="(@{spellsoftskillvalue}+2+@{magicresonance})" disabled="true" />
             </button>
           </div>
@@ -1824,7 +1824,7 @@ Changes in this version:
         </div>
       </div>
       <div class="sheet-row">
-        <div class="sheet-item sheet-tiny"> temnplatechoice </div>
+        <div class="sheet-item sheet-tiny"> templatechoice </div>
         <div class="sheet-item sheet-tiny">
           <select name="attr_templatechoice">
             <option value="sr1">Template 1</option>