diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index dc45d689f9..5e761255ac 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -925,6 +925,17 @@ input.technomancycheckbox:checked ~ div.technomancer{
     text-align:center;
 }
 
+.magiciandrainattribute input[type=number] {
+    vertical-align:top;
+    background-color:#444444;
+    color:inherit;
+    border:none;
+    box-shadow:none;
+    box-sizing:border-box;
+    margin:0px;
+    text-align:center;
+}
+
 .wrapper textarea{
     text-align:left !important;
 }
@@ -1301,7 +1312,7 @@ input[disabled="true"]{
 
 .magiciandrainattribute{
     display:inline-block;
-    width:30%;
+    width:50%;
     margin-bottom:0.3em;
     vertical-align:top;
     margin-left:30%;
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index d56bb7c770..fb85fbdd34 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -6614,9 +6614,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
             <input class="technomancycheckbox" type="checkbox"  name="attr_istechnomancer" value="1">
             <h2>Spells</h2>
             <div class="magiciandrainattribute">
-                <button class="spellrollmage btn" type="roll" title="Click to roll custom drain" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for drain resist}}{{val1=Drain Attribute}}{{val1_num=[[@{drainattribute}]]}}{{val2=@{wil_name}}}{{val2_num=[[@{wil_total}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{drain=Drain}}{{drain_num=[[?{Drain|2}]]}}">Drain-Attribute</button>
+                <button class="spellrollmage btn" type="roll" title="Click to roll custom drain" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for drain resist}}{{val1=Drain Attribute}}{{val1_num=[[@{drainattribute}]]}}{{val2=@{wil_name}}}{{val2_num=[[@{wil_total}]]}}{{val3=Bonus}}{{val3_num=[[@{drainbonus}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{drain=Drain}}{{drain_num=[[?{Drain|2}]]}}">Drain-Attribute</button>
                 <div>
-                    <select name="attr_drainattribute">
+                    <select name="attr_drainattribute" title="Attribute depends on tradition">
                         <option value="@{log_total}">LOG</option>
                         <option value="@{int_total}">INT</option>
                         <option value="@{cha_total}">CHA</option>
@@ -6625,6 +6625,7 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                         <option value="@{wil_total}">WILL</option>
                     </select>
                 </div>
+                <input class="spellrollmage" type="number" name="attr_drainbonus" value="0" title="Bonus dice to drain resist">
             </div>
             <div class="spelllabels">
                 <div class="spellnamewrapper">
@@ -6712,11 +6713,11 @@ 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}}}{{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}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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="spellrollmage" name="roll_spellrollmageeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{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}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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}}}{{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}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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>
                     </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}}}{{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}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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="spellrollmage" name="roll_spellrollmagefull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname} - Force ?{Force|6}}}{{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}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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}}}{{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}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{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>
                     </div>
                 </div>
@@ -13100,44 +13101,60 @@ on("change:repeating_knowledge:knowledgeattr", function() {
         </tr>
         {{/val2}}
         {{#val3}}
-        <tr>
-             <td>> {{val3}}({{val3_num}})</td>
-        </tr>
+            {{#rollGreater() val3_num 0}}
+            <tr>
+                <td>> {{val3}}({{val3_num}})</td>
+            </tr>
+            {{/rollGreater() val3_num 0}}
         {{/val3}}
         {{#val4}}
-        <tr>
-             <td>> {{val4}}({{val4_num}})</td>
-        </tr>
+            {{#rollGreater() val4_num 0}}
+            <tr>
+                 <td>> {{val4}}({{val4_num}})</td>
+            </tr>
+            {{/rollGreater() val4_num 0}}
         {{/val4}}
         {{#val5}}
-        <tr>
-             <td>> {{val5}}({{val5_num}})</td>
-        </tr>
+            {{#rollGreater() val5_num 0}}
+            <tr>
+                <td>> {{val5}}({{val5_num}})</td>
+            </tr>
+            {{/rollGreater() val5_num 0}}
         {{/val5}}
         {{#val6}}
-        <tr>
-             <td>> {{val6}}({{val6_num}})</td>
-        </tr>
+            {{#rollGreater() val6_num 0}}
+            <tr>
+                 <td>> {{val6}}({{val6_num}})</td>
+            </tr>
+            {{/rollGreater() val6_num 0}}
         {{/val6}}
         {{#val7}}
-        <tr>
-             <td>> {{val7}}({{val7_num}})</td>
-        </tr>
+            {{#rollGreater() val7_num 0}}
+            <tr>
+                 <td>> {{val7}}({{val7_num}})</td>
+            </tr>
+            {{/rollGreater() val7_num 0}}
         {{/val7}}
         {{#val8}}
-        <tr>
-             <td>> {{val8}}({{val8_num}})</td>
-        </tr>
+            {{#rollGreater() val8_num 0}}
+            <tr>
+                 <td>> {{val8}}({{val8_num}})</td>
+            </tr>
+            {{/rollGreater() val8_num 0}}
         {{/val8}}
         {{#mod_num}}
-        <tr>
-              <td>> Modifiers({{mod_num}})</td>
-        </tr>
+            {{#rollGreater() mod_num 0}}
+            <tr>
+                  <td>> Modifiers({{mod_num}})</td>
+            </tr>
+            {{/rollGreater() mod_num 0}}
         {{/mod_num}}
         {{#wounds_num}}
-        <tr>
-             <td>>  Woundpenalty({{wounds_num}})</td>
-        </tr>
+            {{#rollGreater() wounds_num 0}}
+            <tr>
+                 <td>>  Woundpenalty({{wounds_num}})</td>
+            </tr>
+            {{#rollGreater() wounds_num 0}}
         {{/wounds_num}}
         {{#edge}}
         <tr><td><div class="sheet-rolltemplate-spacer"> </div></td></tr>