diff --git a/Pokeymanz/Pokeymanz.html b/Pokeymanz/Pokeymanz.html
index 9fcbd4d82b..dc85c7f312 100644
--- a/Pokeymanz/Pokeymanz.html
+++ b/Pokeymanz/Pokeymanz.html
@@ -563,51 +563,51 @@
         
             <div class="sm-prop sm-roll" style="left: 162px; top: 293px; width: 34px; height: 34px;">
                 <button name="roll_mov1roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov1name}*}}{{subtitle=@{mov1cat} | @{mov1type}}}{{Move and Wild=[[@{mov1die}+0+@{mov1bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov1desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov1name}*}}{{subtitle=@{mov1cat} | @{mov1type}}}{{Move and Wild=[[@{mov1die}+@{mov1bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov1desc}}}"
                     data-sm-id="79" type="roll" class="sheet-pokeball"></button>
                 </div>
         
             <div class="sm-prop sm-roll" style="left: 451px; top: 293px; width: 34px; height: 34px;">            
                 <button name="roll_mov2roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov2name}*}}{{subtitle=@{mov2cat} | @{mov2type}}}{{Move and Wild=[[@{mov2die}+0+@{mov2bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov2desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov2name}*}}{{subtitle=@{mov2cat} | @{mov2type}}}{{Move and Wild=[[@{mov2die}+@{mov2bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov2desc}}}"
                     data-sm-id="80" type="roll" class="sheet-pokeball"></button>
                 </div>
         
             <div class="sm-prop sm-roll" style="left: 162px; top: 456px; width: 34px; height: 34px;">            
                 <button name="roll_mov3roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov3name}*}}{{subtitle=@{mov3cat} | @{mov3type}}}{{Move and Wild=[[@{mov3die}+0+@{mov3bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov3desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov3name}*}}{{subtitle=@{mov3cat} | @{mov3type}}}{{Move and Wild=[[@{mov3die}+@{mov3bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov3desc}}}"
                     data-sm-id="81" type="roll" class="sheet-pokeball"></button>
                 </div>
         
             <div class="sm-prop sm-roll" style="left: 451px; top: 456px; width: 34px; height: 34px;">            
                 <button name="roll_mov4roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov4name}*}}{{subtitle=@{mov4cat} | @{mov4type}}}{{Move and Wild=[[@{mov4die}+0+@{mov4bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov4desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov4name}*}}{{subtitle=@{mov4cat} | @{mov4type}}}{{Move and Wild=[[@{mov4die}+@{mov4bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov4desc}}}"
                     data-sm-id="82" type="roll" class="sheet-pokeball"></button>
                 </div>
         
             <div class="sm-prop sm-roll" style="left: 162px; top: 618px; width: 34px; height: 34px;">
                 <button name="roll_mov5roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov5name}*}}{{subtitle=@{mov5cat} | @{mov5type}}}{{Move and Wild=[[@{mov5die}+0+@{mov5bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov5desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov5name}*}}{{subtitle=@{mov5cat} | @{mov5type}}}{{Move and Wild=[[@{mov5die}+@{mov5bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov5desc}}}"
                     data-sm-id="83" type="roll" class="sheet-pokeball"></button>
                 </div>
         
             <div class="sm-prop sm-roll" style="left: 451px; top: 618px; width: 34px; height: 34px;">            
             <button name="roll_mov6roll"
-                    value="&{template:custom} {{title=@{character_name} used *@{mov6name}*}}{{subtitle=@{mov6cat} | @{mov6type}}}{{Move and Wild=[[@{mov6die}+0+@{mov6bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov6desc}}}"
+                    value="&{template:custom} {{title=@{character_name} used *@{mov6name}*}}{{subtitle=@{mov6cat} | @{mov6type}}}{{Move and Wild=[[@{mov6die}+@{mov6bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov6desc}}}"
                     data-sm-id="84" type="roll" class="sheet-pokeball"></button>
             </div>
         
-            <input type="hidden" class="sm-prop" name="attr_mov1roll" value="&{template:custom} {{title=@{character_name} used *@{mov1name}*}}{{subtitle=@{mov1cat} | @{mov1type}}}{{Move and Wild=[[@{mov1die}+0+@{mov1bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov1desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov1roll" value="&{template:custom} {{title=@{character_name} used *@{mov1name}*}}{{subtitle=@{mov1cat} | @{mov1type}}}{{Move and Wild=[[@{mov1die}+@{mov1bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov1desc}}}">
 
-            <input type="hidden" class="sm-prop" name="attr_mov2roll" value="&{template:custom} {{title=@{character_name} used *@{mov2name}*}}{{subtitle=@{mov2cat} | @{mov2type}}}{{Move and Wild=[[@{mov2die}+0+@{mov2bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov2desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov2roll" value="&{template:custom} {{title=@{character_name} used *@{mov2name}*}}{{subtitle=@{mov2cat} | @{mov2type}}}{{Move and Wild=[[@{mov2die}+@{mov2bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov2desc}}}">
 
-            <input type="hidden" class="sm-prop" name="attr_mov3roll" value="&{template:custom} {{title=@{character_name} used *@{mov3name}*}}{{subtitle=@{mov3cat} | @{mov3type}}}{{Move and Wild=[[@{mov3die}+0+@{mov3bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov3desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov3roll" value="&{template:custom} {{title=@{character_name} used *@{mov3name}*}}{{subtitle=@{mov3cat} | @{mov3type}}}{{Move and Wild=[[@{mov3die}+@{mov3bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov3desc}}}">
 
-            <input type="hidden" class="sm-prop" name="attr_mov4roll" value="&{template:custom} {{title=@{character_name} used *@{mov4name}*}}{{subtitle=@{mov4cat} | @{mov4type}}}{{Move and Wild=[[@{mov4die}+0+@{mov4bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov4desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov4roll" value="&{template:custom} {{title=@{character_name} used *@{mov4name}*}}{{subtitle=@{mov4cat} | @{mov4type}}}{{Move and Wild=[[@{mov4die}+@{mov4bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov4desc}}}">
 
-            <input type="hidden" class="sm-prop" name="attr_mov5roll" value="&{template:custom} {{title=@{character_name} used *@{mov5name}*}}{{subtitle=@{mov5cat} | @{mov5type}}}{{Move and Wild=[[@{mov5die}+0+@{mov5bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov5desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov5roll" value="&{template:custom} {{title=@{character_name} used *@{mov5name}*}}{{subtitle=@{mov5cat} | @{mov5type}}}{{Move and Wild=[[@{mov5die}+@{mov5bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov5desc}}}">
 
-            <input type="hidden" class="sm-prop" name="attr_mov6roll" value="&{template:custom} {{title=@{character_name} used *@{mov6name}*}}{{subtitle=@{mov6cat} | @{mov6type}}}{{Move and Wild=[[@{mov6die}+0+@{mov6bonus}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov6desc}}}">
+            <input type="hidden" class="sm-prop" name="attr_mov6roll" value="&{template:custom} {{title=@{character_name} used *@{mov6name}*}}{{subtitle=@{mov6cat} | @{mov6type}}}{{Move and Wild=[[@{mov6die}+@{mov6bonus}+?{Bonus|0}]]|[[?{Wild Die|Tactics,@{tactics}+0|Heart,@{heart}+0|Fitness,@{fitness}+0|Research,@{research}+0|Other,@{other}+0|No,0}+?{Extra|0}]]}}{{Mastery=[[@{mastery}+0]] uses avaiable.}}{{desc=@{mov6desc}}}">
 
         </div>
 
@@ -2476,4 +2476,4 @@ Dropdown Backups
     <button name="roll_sheettitle" value="" data-sm-id="88" type="roll" class="sm-prop sm-roll"
                         style="left: 35px; top: 20px; width: 103px; height: 50px;"></button>
 
----->
\ No newline at end of file
+---->