diff --git a/MythicD6/mythicd6.css b/MythicD6/mythicd6.css
index 0a83812d81..ee0d7a4097 100644
--- a/MythicD6/mythicd6.css
+++ b/MythicD6/mythicd6.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /**
  * CONTENTS
  *
@@ -200,6 +199,9 @@
   align-items: center;
   justify-content: center;
 }
+.charsheet .gap {
+  gap: 10px;
+}
 .charsheet .section {
   padding: 5px;
   min-height: 90%;
@@ -560,16 +562,16 @@
 .charsheet div.rules {
   grid-area: rules;
 }
-.charsheet div.pg2 textarea {
+.charsheet main.pg2 textarea {
   height: 140px;
 }
-.charsheet div.pg3 input[type=number] {
+.charsheet main.pg3 input[type=number] {
   height: 24px;
 }
-.charsheet div.pg3 span.dice {
+.charsheet main.pg3 span.dice {
   margin-top: 5px;
 }
-.charsheet div.pg1 {
+.charsheet main.pg1 {
   display: grid;
   grid-gap: 4px;
   grid-template-columns: 13fr 5fr 4fr;
@@ -579,22 +581,22 @@
   height: 1300px;
   position: relative;
 }
-.charsheet div.pg2 {
+.charsheet main.pg2 {
   display: grid;
   width: 750px;
   position: relative;
 }
-.charsheet div.pg3 {
+.charsheet main.pg3 {
   display: grid;
   width: 750px;
   position: relative;
 }
-.charsheet div.tab-content {
+.charsheet main.tab-content {
   display: none;
 }
-.charsheet input.tab1:checked ~ div.tab1,
-.charsheet input.tab2:checked ~ div.tab2,
-.charsheet input.tab3:checked ~ div.tab3 {
+.charsheet input.tab1:checked ~ main.tab1,
+.charsheet input.tab2:checked ~ main.tab2,
+.charsheet input.tab3:checked ~ main.tab3 {
   display: grid;
 }
 .charsheet input.tab {
@@ -682,7 +684,7 @@
     /*new die changes die roller to d6*/
     content: "";
   }
-  .charsheet div.pg1 {
+  .charsheet main.pg1 {
     display: grid;
     grid-gap: 4px;
     grid-template-columns: 13fr 9fr;
diff --git a/MythicD6/mythicd6.html b/MythicD6/mythicd6.html
index c242cc4a9e..621d55cac3 100644
--- a/MythicD6/mythicd6.html
+++ b/MythicD6/mythicd6.html
@@ -6,7 +6,7 @@
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ------------------------------------------------- PAGE 1 -------------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
-<div class="tab-content tab1 pg1">
+<main class="tab-content tab1 pg1">
 <!--  Common section -->
 
   <div class="common section rowflex nowrap spaced">
@@ -86,7 +86,7 @@
     <div class="rowflex nowrap middle center spaced">
 
      <div class="columnflex nowrap">
-        <button name="roll_coo" title="Coordination %{coo}" type="roll" value="&{template:mythicd6} {{title=Coordination}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{coordination} -1)d6>3cf0cs0 + 1d6>3cf1cs6! ]]}} {{ Pip = @{_pip_rest} }}" class="txt-btn d6-dice red">Coo</button>
+        <button name="roll_coo" title="Coordination %{coo}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Coordination}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{coordination} -1)d6>3cf0cs0 + 1d6>3cf1cs6! ]]}} {{ Pip = @{_pip_rest} }}" class="txt-btn d6-dice red">Coo</button>
         <div class="rowflex nowrap">
           <input name="attr_coordination" title="@{coordination}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -95,7 +95,7 @@
      </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_kno" title="Knowledge %{kno}" type="roll" value="&{template:mythicd6} {{title=knowledge}} {{subtitle=@{character_name} }} {{ Successes = [[(@{knowledge} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{knowledge_pip}}}" class="txt-btn d6-dice red">Kno</button>
+        <button name="roll_kno" title="Knowledge %{kno}" type="roll" value="@{whisper}&{template:mythicd6} {{title=knowledge}} {{subtitle=@{character_name} }} {{ Successes = [[(@{knowledge} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{knowledge_pip}}}" class="txt-btn d6-dice red">Kno</button>
         <div class="rowflex nowrap">
           <input name="attr_knowledge" title="@{knowledge}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -104,7 +104,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_per" title="Perception %{per}" type="roll" value="&{template:mythicd6} {{title=perception}} {{subtitle=@{character_name} }} {{ Successes = [[(@{perception} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{perception_pip}}}" class="txt-btn d6-dice red">Per</button>
+        <button name="roll_per" title="Perception %{per}" type="roll" value="@{whisper}&{template:mythicd6} {{title=perception}} {{subtitle=@{character_name} }} {{ Successes = [[(@{perception} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{perception_pip}}}" class="txt-btn d6-dice red">Per</button>
         <div class="rowflex nowrap">
           <input name="attr_perception" title="@{perception}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -113,7 +113,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_phy" title="Physique %{phy}" type="roll" value="&{template:mythicd6} {{title=physique}} {{subtitle=@{character_name} }} {{ Successes = [[(@{physique} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{physique_pip}}}" class="txt-btn d6-dice red">Phy</button>
+        <button name="roll_phy" title="Physique %{phy}" type="roll" value="@{whisper}&{template:mythicd6} {{title=physique}} {{subtitle=@{character_name} }} {{ Successes = [[(@{physique} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{physique_pip}}}" class="txt-btn d6-dice red">Phy</button>
         <div class="rowflex nowrap">
           <input name="attr_physique" title="@{physique}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -122,7 +122,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_pre" title="Presence %{pre}" type="roll" value="&{template:mythicd6} {{title=presence}} {{subtitle=@{character_name} }} {{ Successes = [[(@{presence} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{presence_pip}}}" class="txt-btn d6-dice red">Pre</button>
+        <button name="roll_pre" title="Presence %{pre}" type="roll" value="@{whisper}&{template:mythicd6} {{title=presence}} {{subtitle=@{character_name} }} {{ Successes = [[(@{presence} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{presence_pip}}}" class="txt-btn d6-dice red">Pre</button>
         <div class="rowflex nowrap">
           <input name="attr_presence" title="@{presence}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -131,7 +131,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_ref" title="%{ref} Reflexes" type="roll" value="&{template:mythicd6} {{title=reflexes}} {{subtitle=@{character_name} }} {{ Successes = [[(@{reflexes} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{reflexes_pip}}}" class="txt-btn d6-dice red">Ref</button>
+        <button name="roll_ref" title="%{ref} Reflexes" type="roll" value="@{whisper}&{template:mythicd6} {{title=reflexes}} {{subtitle=@{character_name} }} {{ Successes = [[(@{reflexes} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{reflexes_pip}}}" class="txt-btn d6-dice red">Ref</button>
         <div class="rowflex nowrap">
           <input name="attr_reflexes" title="@{reflexes}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -149,14 +149,14 @@
     
     <div class="rowflex spaced">
       <label class="title">Skills</label>
-      <button name="roll_init" title="%{init} Go to Settings-page to adjust init-modifiers" type="roll" value="&{template:mythicd6} {{title=Initiative}} {{subtitle=@{character_name} }} {{color=@{initcolor} }} {{Successes = [[(@{perception} + @{initiative}  -1)d6>3cf0cs0[PERCEPTION] + (@{intuition} + 0)d6>3cf0cs0[INTUITION] + 1d6>3cf1cs6![WILDDIE] +@{initiative_pip_boost}d6>3cf0cs0[PIP BOOST] &{tracker} ]]}} {{ Pip = @{initiative_pip_rest} }}" class="txt-btn d6-dice red">Initiative</button>
+      <button name="roll_init" title="%{init} Go to Settings-page to adjust init-modifiers" type="roll" value="@{whisper}&{template:mythicd6} {{title=Initiative}} {{subtitle=@{character_name} }} {{color=@{initcolor} }} {{Successes = [[(@{perception} + @{initiative}  -1)d6>3cf0cs0[PERCEPTION] + (@{intuition} + 0)d6>3cf0cs0[INTUITION] + 1d6>3cf1cs6![WILDDIE] +@{initiative_pip_boost}d6>3cf0cs0[PIP BOOST] &{tracker} ]]}} {{ Pip = @{initiative_pip_rest} }}" class="txt-btn d6-dice red">Initiative</button>
     </div>
 
 
     <div class="skillgrid">
 
         <div class="rowflex nowrap">
-          <button name="roll_athletics" title="%{athletics}" type="roll" value="&{template:mythicd6} {{title=Athletics}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{athletics}+0)d6>3cf0cs0[SKILL] + (@{athletics_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{athletics_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = [[@{athletics_pip_rest}]] }}" class="skills">athletics</button>
+          <button name="roll_athletics" title="%{athletics}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Athletics}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{athletics}+0)d6>3cf0cs0[SKILL] + (@{athletics_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{athletics_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = [[@{athletics_pip_rest}]] }}" class="skills">athletics</button>
           <select name="attr_athletics_attr" title="@{athletics_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -177,7 +177,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_knowhow" title="%{knowhow}" type="roll" value="&{template:mythicd6} {{title=Know-How}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{knowhow}+0)d6>3cf0cs0[SKILL] + (@{knowhow_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{knowhow_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{knowhow_pip_rest} }}" class="skills">know-how</button>
+          <button name="roll_knowhow" title="%{knowhow}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Know-How}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{knowhow}+0)d6>3cf0cs0[SKILL] + (@{knowhow_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{knowhow_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{knowhow_pip_rest} }}" class="skills">know-how</button>
           <select name="attr_knowhow_attr" title="@{knowhow_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -197,7 +197,7 @@
         </div>
 
         <div class="rowflex nowrap">
-          <button name="roll_resistance" title="%{resistance}" type="roll" value="&{template:mythicd6} {{title=Resistance}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{resistance}+0)d6>3cf0cs0[SKILL]  + (@{resistance_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{resistance_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pips = @{resistance_pip_rest} }}" class="skills">resistance</button>
+          <button name="roll_resistance" title="%{resistance}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Resistance}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{resistance}+0)d6>3cf0cs0[SKILL]  + (@{resistance_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{resistance_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pips = @{resistance_pip_rest} }}" class="skills">resistance</button>
           <select name="attr_resistance_attr" title="@{resistance_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -218,7 +218,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_evasion" title="%{evasion}" type="roll" value="&{template:mythicd6} {{title=evasion}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{evasion}+0)d6>3cf0cs0[SKILL] + (@{evasion_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{evasion_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{evasion_pip_rest} }}" class="skills">evasion</button>
+          <button name="roll_evasion" title="%{evasion}" type="roll" value="@{whisper}&{template:mythicd6} {{title=evasion}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{evasion}+0)d6>3cf0cs0[SKILL] + (@{evasion_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{evasion_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{evasion_pip_rest} }}" class="skills">evasion</button>
           <select name="attr_evasion_attr" title="@{evasion_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -238,7 +238,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_language" title="%{language}" type="roll" value="&{template:mythicd6} {{title=language}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{language}+0)d6>3cf0cs0[SKILL] + (@{language_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{language_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{language_pip_rest} }}" class="skills">language</button>
+          <button name="roll_language" title="%{language}" type="roll" value="@{whisper}&{template:mythicd6} {{title=language}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{language}+0)d6>3cf0cs0[SKILL] + (@{language_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{language_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{language_pip_rest} }}" class="skills">language</button>
           <select name="attr_language_attr" title="@{language_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -258,7 +258,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_scholar" title="%{scholar}" type="roll" value="&{template:mythicd6} {{title=scholar}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{scholar}+0)d6>3cf0cs0[SKILL] + (@{scholar_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{scholar_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{scholar_pip_rest} }}" class="skills">scholar</button>
+          <button name="roll_scholar" title="%{scholar}" type="roll" value="@{whisper}&{template:mythicd6} {{title=scholar}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{scholar}+0)d6>3cf0cs0[SKILL] + (@{scholar_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{scholar_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{scholar_pip_rest} }}" class="skills">scholar</button>
           <select name="attr_scholar_attr" title="@{scholar_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -279,7 +279,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_fighting" title="%{fighting}" type="roll" value="&{template:mythicd6} {{title=fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{fighting}+0)d6>3cf0cs0[SKILL] + (@{fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{fighting_pip_rest} }}" class="skills">fighting</button>
+          <button name="roll_fighting" title="%{fighting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{fighting}+0)d6>3cf0cs0[SKILL] + (@{fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{fighting_pip_rest} }}" class="skills">fighting</button>
           <select name="attr_fighting_attr" title="@{fighting_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -299,7 +299,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_movement" title="%{movement}" type="roll" value="&{template:mythicd6} {{title=movement}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{movement}+0)d6>3cf0cs0[SKILL] + (@{movement_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{movement_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{movement_pip_rest}} }}" class="skills">movement</button>
+          <button name="roll_movement" title="%{movement}" type="roll" value="@{whisper}&{template:mythicd6} {{title=movement}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{movement}+0)d6>3cf0cs0[SKILL] + (@{movement_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{movement_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{movement_pip_rest}} }}" class="skills">movement</button>
           <select name="attr_movement_attr" title="@{movement_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -319,7 +319,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_sneak" title="%{sneak}" type="roll" value="&{template:mythicd6} {{title=sneak}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{sneak}+0)d6>3cf0cs0[SKILL] + (@{sneak_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{sneak_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{sneak_pip_rest} }}" class="skills">sneak</button>
+          <button name="roll_sneak" title="%{sneak}" type="roll" value="@{whisper}&{template:mythicd6} {{title=sneak}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{sneak}+0)d6>3cf0cs0[SKILL] + (@{sneak_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{sneak_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{sneak_pip_rest} }}" class="skills">sneak</button>
           <select name="attr_sneak_attr" title="@{sneak_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -340,7 +340,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_influence" title="%{influence}" type="roll" value="&{template:mythicd6} {{title=influence}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{influence}+0)d6>3cf0cs0[SKILL] + (@{influence_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{influence_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{influence_pip_rest} }}" class="skills">influence</button>
+          <button name="roll_influence" title="%{influence}" type="roll" value="@{whisper}&{template:mythicd6} {{title=influence}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{influence}+0)d6>3cf0cs0[SKILL] + (@{influence_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{influence_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{influence_pip_rest} }}" class="skills">influence</button>
           <select name="attr_influence_attr" title="@{influence_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -360,7 +360,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_perform" title="%{perform}" type="roll" value="&{template:mythicd6} {{title=perform}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{perform}+0)d6>3cf0cs0[SKILL] + (@{perform_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{perform_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{perform_pip_rest} }}" class="skills">perform</button>
+          <button name="roll_perform" title="%{perform}" type="roll" value="@{whisper}&{template:mythicd6} {{title=perform}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{perform}+0)d6>3cf0cs0[SKILL] + (@{perform_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{perform_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{perform_pip_rest} }}" class="skills">perform</button>
           <select name="attr_perform_attr" title="@{perform_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -380,7 +380,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_technical" title="%{technical}" type="roll" value="&{template:mythicd6} {{title=technical}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{technical}+0)d6>3cf0cs0[SKILL] + (@{technical_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{technical_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{technical_pip_rest} }}" class="skills">technical</button>
+          <button name="roll_technical" title="%{technical}" type="roll" value="@{whisper}&{template:mythicd6} {{title=technical}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{technical}+0)d6>3cf0cs0[SKILL] + (@{technical_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{technical_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{technical_pip_rest} }}" class="skills">technical</button>
           <select name="attr_technical_attr" title="@{technical_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -401,7 +401,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_intuition" title="%{intuition}" type="roll" value="&{template:mythicd6} {{title=intuition}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{intuition}+0)d6>3cf0cs0[SKILL] + (@{intuition_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{intuition_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{intuition_pip_rest} }}" class="skills">intuition</button>
+          <button name="roll_intuition" title="%{intuition}" type="roll" value="@{whisper}&{template:mythicd6} {{title=intuition}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{intuition}+0)d6>3cf0cs0[SKILL] + (@{intuition_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{intuition_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{intuition_pip_rest} }}" class="skills">intuition</button>
           <select name="attr_intuition_attr" title="@{intuition_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -421,7 +421,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_piloting" title="%{piloting}" type="roll" value="&{template:mythicd6} {{title=piloting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{piloting}+0)d6>3cf0cs0[SKILL] + (@{piloting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{piloting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{piloting_pip_rest} }}" class="skills">piloting</button>
+          <button name="roll_piloting" title="%{piloting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=piloting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{piloting}+0)d6>3cf0cs0[SKILL] + (@{piloting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{piloting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{piloting_pip_rest} }}" class="skills">piloting</button>
           <select name="attr_piloting_attr" title="@{piloting_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -441,7 +441,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_thievery" title="%{thievery}" type="roll" value="&{template:mythicd6} {{title=thievery}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{thievery}+0)d6>3cf0cs0[SKILL] + (@{thievery_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{thievery_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{thievery_pip_rest} }}" class="skills">thievery</button>
+          <button name="roll_thievery" title="%{thievery}" type="roll" value="@{whisper}&{template:mythicd6} {{title=thievery}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{thievery}+0)d6>3cf0cs0[SKILL] + (@{thievery_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{thievery_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{thievery_pip_rest} }}" class="skills">thievery</button>
           <select name="attr_thievery_attr" title="@{thievery_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -462,7 +462,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_investigation" title="%{investigation}" type="roll" value="&{template:mythicd6} {{title=investigation}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{investigation}+0)d6>3cf0cs0[SKILL] + (@{investigation_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{investigation_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{investigation_pip_rest} }}" class="skills">investigation</button>
+          <button name="roll_investigation" title="%{investigation}" type="roll" value="@{whisper}&{template:mythicd6} {{title=investigation}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{investigation}+0)d6>3cf0cs0[SKILL] + (@{investigation_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{investigation_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{investigation_pip_rest} }}" class="skills">investigation</button>
           <select name="attr_investigation_attr" title="@{investigation_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -482,7 +482,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_ranged_fighting" title="%{ranged_fighting}" type="roll" value="&{template:mythicd6} {{title=Ranged Fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{ranged_fighting}+0)d6>3cf0cs0[SKILL] + (@{ranged_fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{ranged_fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{ranged_fighting_pip_rest} }}" class="skills">Rg. Fighting</button>
+          <button name="roll_ranged_fighting" title="%{ranged_fighting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Ranged Fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{ranged_fighting}+0)d6>3cf0cs0[SKILL] + (@{ranged_fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{ranged_fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{ranged_fighting_pip_rest} }}" class="skills">Rg. Fighting</button>
           <select name="attr_ranged_fighting_attr" title="@{ranged_fighting_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -502,7 +502,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_willpower" title="%{willpower}" type="roll" value="&{template:mythicd6} {{title=willpower}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{willpower}+0)d6>3cf0cs0[SKILL] + (@{willpower_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{willpower_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{willpower_pip_rest} }}" class="skills">willpower</button>
+          <button name="roll_willpower" title="%{willpower}" type="roll" value="@{whisper}&{template:mythicd6} {{title=willpower}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{willpower}+0)d6>3cf0cs0[SKILL] + (@{willpower_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{willpower_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{willpower_pip_rest} }}" class="skills">willpower</button>
           <select name="attr_willpower_attr" title="@{willpower_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -524,7 +524,7 @@
     <!-- Specializations -->
         <span class="rowflex nowrap">
           <input name="attr_specialization1name" title="@{specialization1name}" type="text" placeholder="specialization">
-          <button name="roll_spec1" title="%{spec1}" type="roll" value="&{template:mythicd6} {{title=@{specialization1name} }}  {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec1}-1)d6>3cf0cs0[@{specialization1name}] + (@{spec1_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec1_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec1_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec1" title="%{spec1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization1name} }}  {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec1}-1)d6>3cf0cs0[@{specialization1name}] + (@{spec1_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec1_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec1_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec1_attr" title="@{spec1_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -546,7 +546,7 @@
         
         <span class="rowflex nowrap">
           <input name="attr_specialization2name" title="@{specialization2name}" type="text" placeholder="specialization">
-          <button name="roll_spec2" title="%{spec2}" type="roll" value="&{template:mythicd6} {{title=@{specialization2name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec2}-1)d6>3cf0cs0[@{specialization2name}] + (@{spec2_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec2_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec2_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec2" title="%{spec2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization2name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec2}-1)d6>3cf0cs0[@{specialization2name}] + (@{spec2_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec2_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec2_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec2_attr" title="@{spec2_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -567,7 +567,7 @@
         
         <span class="rowflex nowrap">
           <input name="attr_specialization3name" title="@{specialization3name}" type="text" placeholder="specialization">
-          <button name="roll_spec3" title="%{spec3}" type="roll" value="&{template:mythicd6} {{title=@{specialization3name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec3}-1)d6>3cf0cs0[@{specialization3name}] + (@{spec3_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec3_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec3_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec3" title="%{spec3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization3name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec3}-1)d6>3cf0cs0[@{specialization3name}] + (@{spec3_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec3_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec3_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec3_attr" title="@{spec3_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -637,7 +637,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power1" title="%{power1}" type="roll" value="&{template:mythicd6} {{title=Power: @{power1name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power1rank}** }} {{desc= @{power1desc} }}" class="sendtext"></button>
+      <button name="roll_power1" title="%{power1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power1name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power1rank}** }} {{desc= @{power1desc} }}" class="sendtext"></button>
       <input name="attr_power1name" title="@{power1name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power1desc" title="@{power1desc}" placeholder="desc" type="text">
       <input name="attr_power1rank" title="@{power1rank}" type="number" value="" placeholder="1">
@@ -645,7 +645,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power2" title="%{power2}" type="roll" value="&{template:mythicd6} {{title=Power: @{power2name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power2rank}** }} {{desc= @{power2desc} }}" class="sendtext"></button>
+      <button name="roll_power2" title="%{power2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power2name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power2rank}** }} {{desc= @{power2desc} }}" class="sendtext"></button>
       <input name="attr_power2name" title="@{power2name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power2desc" title="@{power2desc}" placeholder="desc" type="text">
       <input name="attr_power2rank" title="@{power2rank}" type="number" value="" placeholder="1">
@@ -653,7 +653,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power3" title="%{power3}" type="roll" value="&{template:mythicd6} {{title=Power: @{power3name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power3rank}** }} {{desc= @{power3desc} }}" class="sendtext"></button>
+      <button name="roll_power3" title="%{power3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power3name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power3rank}** }} {{desc= @{power3desc} }}" class="sendtext"></button>
       <input name="attr_power3name" title="@{power3name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power3desc" title="@{power3desc}" placeholder="desc" type="text">
       <input name="attr_power3rank" title="@{power3rank}" type="number" value="" placeholder="1">
@@ -661,7 +661,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power4" title="%{power4}" type="roll" value="&{template:mythicd6} {{title=Power: @{power4name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power4rank}** }} {{desc= @{power4desc} }}" class="sendtext"></button>
+      <button name="roll_power4" title="%{power4}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power4name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power4rank}** }} {{desc= @{power4desc} }}" class="sendtext"></button>
       <input name="attr_power4name" title="@{power4name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power4desc" title="@{power4desc}" placeholder="desc" type="text">
       <input name="attr_power4rank" title="@{power4rank}" type="number" value="" placeholder="1">
@@ -719,7 +719,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon1" title="%{weapon1}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon1} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon1acc} +@{weapon1skilldie}-1)d6>3cf0cs0[@{weapon1skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon1skillpd}[pd] + @{weapon1bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon1" title="%{weapon1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon1} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon1acc} +@{weapon1skilldie}-1)d6>3cf0cs0[@{weapon1skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon1skillpd}[pd] + @{weapon1bdv}[bdv] ]] }}" class="d6-dice"></button>
 
     <input name="attr_weapon2" title="@{weapon2}" type="text">
     <input name="attr_weapon2acc" title="@{weapon2acc}" class="txtfield" type="number" value="">
@@ -736,7 +736,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon2" title="%{weapon2}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon2} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon2acc} +@{weapon2skilldie}-1)d6>3cf0cs0[@{weapon2skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon2skillpd}[pd] + @{weapon2bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon2" title="%{weapon2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon2} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon2acc} +@{weapon2skilldie}-1)d6>3cf0cs0[@{weapon2skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon2skillpd}[pd] + @{weapon2bdv}[bdv] ]] }}" class="d6-dice"></button>
 
     <input name="attr_weapon3" title="@{weapon3}" type="text">
     <input name="attr_weapon3acc" title="@{weapon3acc}" class="txtfield" type="number" value="">
@@ -753,7 +753,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon3" title="%{weapon3}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon3} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon3acc} +@{weapon3skilldie}-1)d6>3cf0cs0[@{weapon3skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon3skillpd}[pd] + @{weapon3bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon3" title="%{weapon3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon3} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon3acc} +@{weapon3skilldie}-1)d6>3cf0cs0[@{weapon3skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon3skillpd}[pd] + @{weapon3bdv}[bdv] ]] }}" class="d6-dice"></button>
 
   </div>
 
@@ -798,12 +798,12 @@
   </div>
 
 
-</div>
+</main>
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ----------------------------------------------------- PAGE 2 ---------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 
-<div class="tab-content tab2 pg2">-
+<main class="tab-content tab2 pg2">-
 
   <div class="section columnflex nowrap">
 
@@ -823,13 +823,13 @@
     </div>
   </div>  
 
-</div>
+</main>
 
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ----------------------------------------------------- PAGE 3 ---------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 
-<div class="tab-content tab3 pg3">-
+<main class="tab-content tab3 pg3">-
 
   <div class="section columnflex nowrap">
     <span class="bold">Pregen Character Template(changing will overwrite your stats):</span>
@@ -853,6 +853,11 @@
     </select>
   </div>
 
+  <div class="section rowflex nowrap gap">
+    <span title="@{whisper}">Whisper rolls to GM?</span>
+    <input name="attr_whisper" title="@{whisper}" type="checkbox" value="/w gm">
+  </div>
+
   <div class="section columnflex nowrap">
     <span>Skill Roll color</span>
     <select name="attr_skillcolor" title="skillcolor">
@@ -901,7 +906,7 @@
     </select>
   </div>
 
-</div>
+</main>
 
 <input type="hidden" name="attr_weapon1skillpd" value="0"/>
 <input type="hidden" name="attr_weapon1skilldie" value="1"/>
diff --git a/MythicD6/sheet.json b/MythicD6/sheet.json
index 4663bdf1b2..0ce5d02aef 100644
--- a/MythicD6/sheet.json
+++ b/MythicD6/sheet.json
@@ -4,6 +4,6 @@
     "authors": "Andreas J.",
     "roll20userid": "1223200",
     "preview": "MythicD6-preview.png",
-    "instructions": "This is the Official character sheet for **MYTHIC D6**, by Khepera Publishing.\n\n* [MYTHIC D6 Revised & Expanded](https://www.drivethrurpg.com/product/243769/MYTHIC-D6-Revised--Expanded) rulebook on DriveThruRPG\n* [MYTHIC D6 Quickstart](https://kheperapublishing.files.wordpress.com/2018/06/mythicd6_khp034-quickstart.pdf)",
+    "instructions": "This is the Official character sheet for **MYTHIC D6**, by Khepera Publishing. See [Roll20 Wiki](https://wiki.roll20.net/MythicD6) for further sheet instructions.\n\n* [MYTHIC D6 Revised & Expanded](https://www.drivethrurpg.com/product/243769/MYTHIC-D6-Revised--Expanded) rulebook on DriveThruRPG\n* [MYTHIC D6 Quickstart](https://kheperapublishing.files.wordpress.com/2018/06/mythicd6_khp034-quickstart.pdf)",
     "legacy": false
 }
diff --git a/MythicD6/src/_core.scss b/MythicD6/src/_core.scss
index d4ddf8be5d..1aee40d284 100644
--- a/MythicD6/src/_core.scss
+++ b/MythicD6/src/_core.scss
@@ -218,6 +218,10 @@
     justify-content: center;
   }
 
+  .gap{
+    gap: 10px;
+  }
+
   .section {
       padding: 5px;
       min-height: 90%;
@@ -659,17 +663,17 @@
 
   /* -------------------------- Page 2 ----------------------- */
 
-  div.pg2 textarea{
+  main.pg2 textarea{
     height: 140px;
   }
 
   /* -------------------------- Page 3 ----------------------- */
 
-  div.pg3 input[type="number"]{
+  main.pg3 input[type="number"]{
     height: 24px;
   }
 
-  div.pg3 span.dice{
+  main.pg3 span.dice{
     margin-top: 5px;
   }
 
@@ -682,7 +686,7 @@
 
   /* Defines core layout of each page */
 
-  div.pg1 {
+  main.pg1 {
     display: grid;
     grid-gap: 4px;
     grid-template-columns: 13fr 5fr 4fr;
@@ -700,7 +704,7 @@
     position: relative;
   }
 
-  div.pg2 {
+  main.pg2 {
     display: grid;
     width: 750px;
     position: relative;
@@ -708,21 +712,21 @@
 
 
 
-  div.pg3 {
+  main.pg3 {
     display: grid;
     width: 750px;
     position: relative;
   }
 
-  div.tab-content { display: none; }
+  main.tab-content { display: none; }
 
 
 
   /* styling/position tab button */
 
-  input.tab1:checked ~ div.tab1,
-  input.tab2:checked ~ div.tab2,
-  input.tab3:checked ~ div.tab3
+  input.tab1:checked ~ main.tab1,
+  input.tab2:checked ~ main.tab2,
+  input.tab3:checked ~ main.tab3
   {
       display: grid;
   }
@@ -848,7 +852,7 @@
       content: '';
     }
 
-    div.pg1 {
+    main.pg1 {
       display: grid;
       grid-gap: 4px;
       grid-template-columns: 13fr 9fr;
@@ -894,24 +898,26 @@
       }
     }
 
-    div.skills div.rowflex{
-      flex-direction: column;
+    div.skills {
+
+      div.rowflex{
+        flex-direction: column;
+      }
+
+      div.skillgrid{
+        display: grid;
+        padding: 5px;
+        grid-template-rows: repeat(21, 1fr);
+        grid-template-columns: 3fr 2fr;
+        width: 400px;
+        height: 800px;
+      }
+
+
+      button[type="roll"].red{
+        width: 170px;
+      }
     }
-
-    div.skills div.skillgrid{
-      display: grid;
-      padding: 5px;
-      grid-template-rows: repeat(21, 1fr);
-      grid-template-columns: 3fr 2fr;
-      width: 400px;
-      height: 800px;
-    }
-
-
-    div.skills button[type="roll"].red{
-      width: 170px;
-    }
-
     button[type="roll"].skills{
       font-size: 14px;
       padding: 0px;
diff --git a/MythicD6/src/core.html b/MythicD6/src/core.html
index 29b7082b78..00f824e654 100644
--- a/MythicD6/src/core.html
+++ b/MythicD6/src/core.html
@@ -6,7 +6,7 @@
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ------------------------------------------------- PAGE 1 -------------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
-<div class="tab-content tab1 pg1">
+<main class="tab-content tab1 pg1">
 <!--  Common section -->
 
   <div class="common section rowflex nowrap spaced">
@@ -86,7 +86,7 @@
     <div class="rowflex nowrap middle center spaced">
 
      <div class="columnflex nowrap">
-        <button name="roll_coo" title="Coordination %{coo}" type="roll" value="&{template:mythicd6} {{title=Coordination}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{coordination} -1)d6>3cf0cs0 + 1d6>3cf1cs6! ]]}} {{ Pip = @{_pip_rest} }}" class="txt-btn d6-dice red">Coo</button>
+        <button name="roll_coo" title="Coordination %{coo}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Coordination}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{coordination} -1)d6>3cf0cs0 + 1d6>3cf1cs6! ]]}} {{ Pip = @{_pip_rest} }}" class="txt-btn d6-dice red">Coo</button>
         <div class="rowflex nowrap">
           <input name="attr_coordination" title="@{coordination}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -95,7 +95,7 @@
      </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_kno" title="Knowledge %{kno}" type="roll" value="&{template:mythicd6} {{title=knowledge}} {{subtitle=@{character_name} }} {{ Successes = [[(@{knowledge} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{knowledge_pip}}}" class="txt-btn d6-dice red">Kno</button>
+        <button name="roll_kno" title="Knowledge %{kno}" type="roll" value="@{whisper}&{template:mythicd6} {{title=knowledge}} {{subtitle=@{character_name} }} {{ Successes = [[(@{knowledge} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{knowledge_pip}}}" class="txt-btn d6-dice red">Kno</button>
         <div class="rowflex nowrap">
           <input name="attr_knowledge" title="@{knowledge}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -104,7 +104,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_per" title="Perception %{per}" type="roll" value="&{template:mythicd6} {{title=perception}} {{subtitle=@{character_name} }} {{ Successes = [[(@{perception} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{perception_pip}}}" class="txt-btn d6-dice red">Per</button>
+        <button name="roll_per" title="Perception %{per}" type="roll" value="@{whisper}&{template:mythicd6} {{title=perception}} {{subtitle=@{character_name} }} {{ Successes = [[(@{perception} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{perception_pip}}}" class="txt-btn d6-dice red">Per</button>
         <div class="rowflex nowrap">
           <input name="attr_perception" title="@{perception}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -113,7 +113,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_phy" title="Physique %{phy}" type="roll" value="&{template:mythicd6} {{title=physique}} {{subtitle=@{character_name} }} {{ Successes = [[(@{physique} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{physique_pip}}}" class="txt-btn d6-dice red">Phy</button>
+        <button name="roll_phy" title="Physique %{phy}" type="roll" value="@{whisper}&{template:mythicd6} {{title=physique}} {{subtitle=@{character_name} }} {{ Successes = [[(@{physique} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{physique_pip}}}" class="txt-btn d6-dice red">Phy</button>
         <div class="rowflex nowrap">
           <input name="attr_physique" title="@{physique}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -122,7 +122,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_pre" title="Presence %{pre}" type="roll" value="&{template:mythicd6} {{title=presence}} {{subtitle=@{character_name} }} {{ Successes = [[(@{presence} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{presence_pip}}}" class="txt-btn d6-dice red">Pre</button>
+        <button name="roll_pre" title="Presence %{pre}" type="roll" value="@{whisper}&{template:mythicd6} {{title=presence}} {{subtitle=@{character_name} }} {{ Successes = [[(@{presence} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{presence_pip}}}" class="txt-btn d6-dice red">Pre</button>
         <div class="rowflex nowrap">
           <input name="attr_presence" title="@{presence}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -131,7 +131,7 @@
       </div>
 
       <div class="columnflex nowrap">
-        <button name="roll_ref" title="%{ref} Reflexes" type="roll" value="&{template:mythicd6} {{title=reflexes}} {{subtitle=@{character_name} }} {{ Successes = [[(@{reflexes} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{reflexes_pip}}}" class="txt-btn d6-dice red">Ref</button>
+        <button name="roll_ref" title="%{ref} Reflexes" type="roll" value="@{whisper}&{template:mythicd6} {{title=reflexes}} {{subtitle=@{character_name} }} {{ Successes = [[(@{reflexes} -1)d6>3cf0cs0 + 1d6>3cf1cs6!]]}} {{ Pip = @{reflexes_pip}}}" class="txt-btn d6-dice red">Ref</button>
         <div class="rowflex nowrap">
           <input name="attr_reflexes" title="@{reflexes}" type="number" placeholder="1">
           <span class="dice">D+</span>
@@ -149,14 +149,14 @@
     
     <div class="rowflex spaced">
       <label class="title">Skills</label>
-      <button name="roll_init" title="%{init} Go to Settings-page to adjust init-modifiers" type="roll" value="&{template:mythicd6} {{title=Initiative}} {{subtitle=@{character_name} }} {{color=@{initcolor} }} {{Successes = [[(@{perception} + @{initiative}  -1)d6>3cf0cs0[PERCEPTION] + (@{intuition} + 0)d6>3cf0cs0[INTUITION] + 1d6>3cf1cs6![WILDDIE] +@{initiative_pip_boost}d6>3cf0cs0[PIP BOOST] &{tracker} ]]}} {{ Pip = @{initiative_pip_rest} }}" class="txt-btn d6-dice red">Initiative</button>
+      <button name="roll_init" title="%{init} Go to Settings-page to adjust init-modifiers" type="roll" value="@{whisper}&{template:mythicd6} {{title=Initiative}} {{subtitle=@{character_name} }} {{color=@{initcolor} }} {{Successes = [[(@{perception} + @{initiative}  -1)d6>3cf0cs0[PERCEPTION] + (@{intuition} + 0)d6>3cf0cs0[INTUITION] + 1d6>3cf1cs6![WILDDIE] +@{initiative_pip_boost}d6>3cf0cs0[PIP BOOST] &{tracker} ]]}} {{ Pip = @{initiative_pip_rest} }}" class="txt-btn d6-dice red">Initiative</button>
     </div>
 
 
     <div class="skillgrid">
 
         <div class="rowflex nowrap">
-          <button name="roll_athletics" title="%{athletics}" type="roll" value="&{template:mythicd6} {{title=Athletics}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{athletics}+0)d6>3cf0cs0[SKILL] + (@{athletics_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{athletics_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = [[@{athletics_pip_rest}]] }}" class="skills">athletics</button>
+          <button name="roll_athletics" title="%{athletics}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Athletics}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{athletics}+0)d6>3cf0cs0[SKILL] + (@{athletics_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{athletics_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = [[@{athletics_pip_rest}]] }}" class="skills">athletics</button>
           <select name="attr_athletics_attr" title="@{athletics_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -177,7 +177,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_knowhow" title="%{knowhow}" type="roll" value="&{template:mythicd6} {{title=Know-How}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{knowhow}+0)d6>3cf0cs0[SKILL] + (@{knowhow_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{knowhow_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{knowhow_pip_rest} }}" class="skills">know-how</button>
+          <button name="roll_knowhow" title="%{knowhow}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Know-How}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{knowhow}+0)d6>3cf0cs0[SKILL] + (@{knowhow_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{knowhow_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{knowhow_pip_rest} }}" class="skills">know-how</button>
           <select name="attr_knowhow_attr" title="@{knowhow_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -197,7 +197,7 @@
         </div>
 
         <div class="rowflex nowrap">
-          <button name="roll_resistance" title="%{resistance}" type="roll" value="&{template:mythicd6} {{title=Resistance}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{resistance}+0)d6>3cf0cs0[SKILL]  + (@{resistance_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{resistance_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pips = @{resistance_pip_rest} }}" class="skills">resistance</button>
+          <button name="roll_resistance" title="%{resistance}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Resistance}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{resistance}+0)d6>3cf0cs0[SKILL]  + (@{resistance_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{resistance_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pips = @{resistance_pip_rest} }}" class="skills">resistance</button>
           <select name="attr_resistance_attr" title="@{resistance_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -218,7 +218,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_evasion" title="%{evasion}" type="roll" value="&{template:mythicd6} {{title=evasion}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{evasion}+0)d6>3cf0cs0[SKILL] + (@{evasion_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{evasion_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{evasion_pip_rest} }}" class="skills">evasion</button>
+          <button name="roll_evasion" title="%{evasion}" type="roll" value="@{whisper}&{template:mythicd6} {{title=evasion}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{evasion}+0)d6>3cf0cs0[SKILL] + (@{evasion_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{evasion_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{evasion_pip_rest} }}" class="skills">evasion</button>
           <select name="attr_evasion_attr" title="@{evasion_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -238,7 +238,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_language" title="%{language}" type="roll" value="&{template:mythicd6} {{title=language}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{language}+0)d6>3cf0cs0[SKILL] + (@{language_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{language_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{language_pip_rest} }}" class="skills">language</button>
+          <button name="roll_language" title="%{language}" type="roll" value="@{whisper}&{template:mythicd6} {{title=language}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{language}+0)d6>3cf0cs0[SKILL] + (@{language_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{language_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{language_pip_rest} }}" class="skills">language</button>
           <select name="attr_language_attr" title="@{language_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -258,7 +258,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_scholar" title="%{scholar}" type="roll" value="&{template:mythicd6} {{title=scholar}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{scholar}+0)d6>3cf0cs0[SKILL] + (@{scholar_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{scholar_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{scholar_pip_rest} }}" class="skills">scholar</button>
+          <button name="roll_scholar" title="%{scholar}" type="roll" value="@{whisper}&{template:mythicd6} {{title=scholar}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{scholar}+0)d6>3cf0cs0[SKILL] + (@{scholar_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{scholar_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{scholar_pip_rest} }}" class="skills">scholar</button>
           <select name="attr_scholar_attr" title="@{scholar_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -279,7 +279,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_fighting" title="%{fighting}" type="roll" value="&{template:mythicd6} {{title=fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{fighting}+0)d6>3cf0cs0[SKILL] + (@{fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{fighting_pip_rest} }}" class="skills">fighting</button>
+          <button name="roll_fighting" title="%{fighting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{fighting}+0)d6>3cf0cs0[SKILL] + (@{fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{fighting_pip_rest} }}" class="skills">fighting</button>
           <select name="attr_fighting_attr" title="@{fighting_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -299,7 +299,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_movement" title="%{movement}" type="roll" value="&{template:mythicd6} {{title=movement}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{movement}+0)d6>3cf0cs0[SKILL] + (@{movement_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{movement_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{movement_pip_rest}} }}" class="skills">movement</button>
+          <button name="roll_movement" title="%{movement}" type="roll" value="@{whisper}&{template:mythicd6} {{title=movement}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{movement}+0)d6>3cf0cs0[SKILL] + (@{movement_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{movement_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{movement_pip_rest}} }}" class="skills">movement</button>
           <select name="attr_movement_attr" title="@{movement_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -319,7 +319,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_sneak" title="%{sneak}" type="roll" value="&{template:mythicd6} {{title=sneak}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{sneak}+0)d6>3cf0cs0[SKILL] + (@{sneak_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{sneak_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{sneak_pip_rest} }}" class="skills">sneak</button>
+          <button name="roll_sneak" title="%{sneak}" type="roll" value="@{whisper}&{template:mythicd6} {{title=sneak}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{sneak}+0)d6>3cf0cs0[SKILL] + (@{sneak_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{sneak_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{sneak_pip_rest} }}" class="skills">sneak</button>
           <select name="attr_sneak_attr" title="@{sneak_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -340,7 +340,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_influence" title="%{influence}" type="roll" value="&{template:mythicd6} {{title=influence}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{influence}+0)d6>3cf0cs0[SKILL] + (@{influence_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{influence_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{influence_pip_rest} }}" class="skills">influence</button>
+          <button name="roll_influence" title="%{influence}" type="roll" value="@{whisper}&{template:mythicd6} {{title=influence}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{influence}+0)d6>3cf0cs0[SKILL] + (@{influence_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{influence_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{influence_pip_rest} }}" class="skills">influence</button>
           <select name="attr_influence_attr" title="@{influence_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -360,7 +360,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_perform" title="%{perform}" type="roll" value="&{template:mythicd6} {{title=perform}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{perform}+0)d6>3cf0cs0[SKILL] + (@{perform_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{perform_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{perform_pip_rest} }}" class="skills">perform</button>
+          <button name="roll_perform" title="%{perform}" type="roll" value="@{whisper}&{template:mythicd6} {{title=perform}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{perform}+0)d6>3cf0cs0[SKILL] + (@{perform_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{perform_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{perform_pip_rest} }}" class="skills">perform</button>
           <select name="attr_perform_attr" title="@{perform_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -380,7 +380,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_technical" title="%{technical}" type="roll" value="&{template:mythicd6} {{title=technical}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{technical}+0)d6>3cf0cs0[SKILL] + (@{technical_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{technical_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{technical_pip_rest} }}" class="skills">technical</button>
+          <button name="roll_technical" title="%{technical}" type="roll" value="@{whisper}&{template:mythicd6} {{title=technical}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{technical}+0)d6>3cf0cs0[SKILL] + (@{technical_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{technical_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{technical_pip_rest} }}" class="skills">technical</button>
           <select name="attr_technical_attr" title="@{technical_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]" selected>KNO</option>
@@ -401,7 +401,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_intuition" title="%{intuition}" type="roll" value="&{template:mythicd6} {{title=intuition}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{intuition}+0)d6>3cf0cs0[SKILL] + (@{intuition_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{intuition_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{intuition_pip_rest} }}" class="skills">intuition</button>
+          <button name="roll_intuition" title="%{intuition}" type="roll" value="@{whisper}&{template:mythicd6} {{title=intuition}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{intuition}+0)d6>3cf0cs0[SKILL] + (@{intuition_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{intuition_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{intuition_pip_rest} }}" class="skills">intuition</button>
           <select name="attr_intuition_attr" title="@{intuition_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -421,7 +421,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_piloting" title="%{piloting}" type="roll" value="&{template:mythicd6} {{title=piloting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{piloting}+0)d6>3cf0cs0[SKILL] + (@{piloting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{piloting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{piloting_pip_rest} }}" class="skills">piloting</button>
+          <button name="roll_piloting" title="%{piloting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=piloting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{piloting}+0)d6>3cf0cs0[SKILL] + (@{piloting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{piloting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{piloting_pip_rest} }}" class="skills">piloting</button>
           <select name="attr_piloting_attr" title="@{piloting_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -441,7 +441,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_thievery" title="%{thievery}" type="roll" value="&{template:mythicd6} {{title=thievery}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{thievery}+0)d6>3cf0cs0[SKILL] + (@{thievery_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{thievery_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{thievery_pip_rest} }}" class="skills">thievery</button>
+          <button name="roll_thievery" title="%{thievery}" type="roll" value="@{whisper}&{template:mythicd6} {{title=thievery}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{thievery}+0)d6>3cf0cs0[SKILL] + (@{thievery_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{thievery_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{thievery_pip_rest} }}" class="skills">thievery</button>
           <select name="attr_thievery_attr" title="@{thievery_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -462,7 +462,7 @@
 
 
         <div class="rowflex nowrap">
-          <button name="roll_investigation" title="%{investigation}" type="roll" value="&{template:mythicd6} {{title=investigation}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{investigation}+0)d6>3cf0cs0[SKILL] + (@{investigation_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{investigation_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{investigation_pip_rest} }}" class="skills">investigation</button>
+          <button name="roll_investigation" title="%{investigation}" type="roll" value="@{whisper}&{template:mythicd6} {{title=investigation}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{investigation}+0)d6>3cf0cs0[SKILL] + (@{investigation_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{investigation_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{investigation_pip_rest} }}" class="skills">investigation</button>
           <select name="attr_investigation_attr" title="@{investigation_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -482,7 +482,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_ranged_fighting" title="%{ranged_fighting}" type="roll" value="&{template:mythicd6} {{title=Ranged Fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{ranged_fighting}+0)d6>3cf0cs0[SKILL] + (@{ranged_fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{ranged_fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{ranged_fighting_pip_rest} }}" class="skills">Rg. Fighting</button>
+          <button name="roll_ranged_fighting" title="%{ranged_fighting}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Ranged Fighting}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{ranged_fighting}+0)d6>3cf0cs0[SKILL] + (@{ranged_fighting_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{ranged_fighting_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{ranged_fighting_pip_rest} }}" class="skills">Rg. Fighting</button>
           <select name="attr_ranged_fighting_attr" title="@{ranged_fighting_attr}">
             <option value="[[@{coordination}]]" selected>COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -502,7 +502,7 @@
         </div>
         
         <div class="rowflex nowrap">
-          <button name="roll_willpower" title="%{willpower}" type="roll" value="&{template:mythicd6} {{title=willpower}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{willpower}+0)d6>3cf0cs0[SKILL] + (@{willpower_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{willpower_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{willpower_pip_rest} }}" class="skills">willpower</button>
+          <button name="roll_willpower" title="%{willpower}" type="roll" value="@{whisper}&{template:mythicd6} {{title=willpower}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{willpower}+0)d6>3cf0cs0[SKILL] + (@{willpower_attr}-1)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{willpower_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{willpower_pip_rest} }}" class="skills">willpower</button>
           <select name="attr_willpower_attr" title="@{willpower_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -524,7 +524,7 @@
     <!-- Specializations -->
         <span class="rowflex nowrap">
           <input name="attr_specialization1name" title="@{specialization1name}" type="text" placeholder="specialization">
-          <button name="roll_spec1" title="%{spec1}" type="roll" value="&{template:mythicd6} {{title=@{specialization1name} }}  {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec1}-1)d6>3cf0cs0[@{specialization1name}] + (@{spec1_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec1_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec1_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec1" title="%{spec1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization1name} }}  {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec1}-1)d6>3cf0cs0[@{specialization1name}] + (@{spec1_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec1_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec1_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec1_attr" title="@{spec1_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -546,7 +546,7 @@
         
         <span class="rowflex nowrap">
           <input name="attr_specialization2name" title="@{specialization2name}" type="text" placeholder="specialization">
-          <button name="roll_spec2" title="%{spec2}" type="roll" value="&{template:mythicd6} {{title=@{specialization2name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec2}-1)d6>3cf0cs0[@{specialization2name}] + (@{spec2_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec2_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec2_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec2" title="%{spec2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization2name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec2}-1)d6>3cf0cs0[@{specialization2name}] + (@{spec2_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec2_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec2_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec2_attr" title="@{spec2_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -567,7 +567,7 @@
         
         <span class="rowflex nowrap">
           <input name="attr_specialization3name" title="@{specialization3name}" type="text" placeholder="specialization">
-          <button name="roll_spec3" title="%{spec3}" type="roll" value="&{template:mythicd6} {{title=@{specialization3name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec3}-1)d6>3cf0cs0[@{specialization3name}] + (@{spec3_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec3_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec3_pip_rest} }}" class="skills special"></button>
+          <button name="roll_spec3" title="%{spec3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=@{specialization3name} (specialization)}} {{subtitle=@{character_name} }} {{color=@{skillcolor} }} {{Successes = [[(@{spec3}-1)d6>3cf0cs0[@{specialization3name}] + (@{spec3_attr}+0)d6>3cf0cs0[ATTRIBUTE]@{modquery} + @{spec3_pip_boost}d6>3cf0cs0[pip bonus] + 1d6>3cf1cs6![Wild Die] ]]}} {{ Pip = @{spec3_pip_rest} }}" class="skills special"></button>
           <select name="attr_spec3_attr" title="@{spec3_attr}">
             <option value="[[@{coordination}]]">COO</option>
             <option value="[[@{knowledge}]]">KNO</option>
@@ -637,7 +637,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power1" title="%{power1}" type="roll" value="&{template:mythicd6} {{title=Power: @{power1name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power1rank}** }} {{desc= @{power1desc} }}" class="sendtext"></button>
+      <button name="roll_power1" title="%{power1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power1name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power1rank}** }} {{desc= @{power1desc} }}" class="sendtext"></button>
       <input name="attr_power1name" title="@{power1name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power1desc" title="@{power1desc}" placeholder="desc" type="text">
       <input name="attr_power1rank" title="@{power1rank}" type="number" value="" placeholder="1">
@@ -645,7 +645,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power2" title="%{power2}" type="roll" value="&{template:mythicd6} {{title=Power: @{power2name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power2rank}** }} {{desc= @{power2desc} }}" class="sendtext"></button>
+      <button name="roll_power2" title="%{power2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power2name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power2rank}** }} {{desc= @{power2desc} }}" class="sendtext"></button>
       <input name="attr_power2name" title="@{power2name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power2desc" title="@{power2desc}" placeholder="desc" type="text">
       <input name="attr_power2rank" title="@{power2rank}" type="number" value="" placeholder="1">
@@ -653,7 +653,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power3" title="%{power3}" type="roll" value="&{template:mythicd6} {{title=Power: @{power3name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power3rank}** }} {{desc= @{power3desc} }}" class="sendtext"></button>
+      <button name="roll_power3" title="%{power3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power3name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power3rank}** }} {{desc= @{power3desc} }}" class="sendtext"></button>
       <input name="attr_power3name" title="@{power3name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power3desc" title="@{power3desc}" placeholder="desc" type="text">
       <input name="attr_power3rank" title="@{power3rank}" type="number" value="" placeholder="1">
@@ -661,7 +661,7 @@
     </div>
 
     <div class="rowflex nowrap spaced">
-      <button name="roll_power4" title="%{power4}" type="roll" value="&{template:mythicd6} {{title=Power: @{power4name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power4rank}** }} {{desc= @{power4desc} }}" class="sendtext"></button>
+      <button name="roll_power4" title="%{power4}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Power: @{power4name} }}  {{subtitle=@{character_name} }} {{color=@{powercolor} }} {{Rank:= **@{power4rank}** }} {{desc= @{power4desc} }}" class="sendtext"></button>
       <input name="attr_power4name" title="@{power4name}" placeholder="power name" type="text" class="name" list="powers">
       <input name="attr_power4desc" title="@{power4desc}" placeholder="desc" type="text">
       <input name="attr_power4rank" title="@{power4rank}" type="number" value="" placeholder="1">
@@ -719,7 +719,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon1" title="%{weapon1}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon1} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon1acc} +@{weapon1skilldie}-1)d6>3cf0cs0[@{weapon1skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon1skillpd}[pd] + @{weapon1bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon1" title="%{weapon1}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon1} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon1acc} +@{weapon1skilldie}-1)d6>3cf0cs0[@{weapon1skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon1skillpd}[pd] + @{weapon1bdv}[bdv] ]] }}" class="d6-dice"></button>
 
     <input name="attr_weapon2" title="@{weapon2}" type="text">
     <input name="attr_weapon2acc" title="@{weapon2acc}" class="txtfield" type="number" value="">
@@ -736,7 +736,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon2" title="%{weapon2}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon2} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon2acc} +@{weapon2skilldie}-1)d6>3cf0cs0[@{weapon2skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon2skillpd}[pd] + @{weapon2bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon2" title="%{weapon2}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon2} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon2acc} +@{weapon2skilldie}-1)d6>3cf0cs0[@{weapon2skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon2skillpd}[pd] + @{weapon2bdv}[bdv] ]] }}" class="d6-dice"></button>
 
     <input name="attr_weapon3" title="@{weapon3}" type="text">
     <input name="attr_weapon3acc" title="@{weapon3acc}" class="txtfield" type="number" value="">
@@ -753,7 +753,7 @@
       <option value="ranged_fighting">Rg. Fighting</option>
       <option value="0" selected>None</option>
     </select>
-    <button name="roll_weapon3" title="%{weapon3}" type="roll" value="&{template:mythicd6} {{title=Attack: @{weapon3} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon3acc} +@{weapon3skilldie}-1)d6>3cf0cs0[@{weapon3skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon3skillpd}[pd] + @{weapon3bdv}[bdv] ]] }}" class="d6-dice"></button>
+    <button name="roll_weapon3" title="%{weapon3}" type="roll" value="@{whisper}&{template:mythicd6} {{title=Attack: @{weapon3} }}  {{subtitle=@{character_name} }} {{color=@{weaponcolor} }} {{Successes= [[(@{weapon3acc} +@{weapon3skilldie}-1)d6>3cf0cs0[@{weapon3skill}+weapon accuracy]@{modquery} + 1d6>3cf1cs6![Wild Die] ]]  }} {{Damage= [[@{weapon3skillpd}[pd] + @{weapon3bdv}[bdv] ]] }}" class="d6-dice"></button>
 
   </div>
 
@@ -798,12 +798,12 @@
   </div>
 
 
-</div>
+</main>
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ----------------------------------------------------- PAGE 2 ---------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 
-<div class="tab-content tab2 pg2">-
+<main class="tab-content tab2 pg2">-
 
   <div class="section columnflex nowrap">
 
@@ -823,13 +823,13 @@
     </div>
   </div>  
 
-</div>
+</main>
 
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 <!--  ----------------------------------------------------- PAGE 3 ---------------------------------------------------------- -->
 <!--  ----------------------------------------------------------------------------------------------------------------------- -->
 
-<div class="tab-content tab3 pg3">-
+<main class="tab-content tab3 pg3">-
 
   <div class="section columnflex nowrap">
     <span class="bold">Pregen Character Template(changing will overwrite your stats):</span>
@@ -853,6 +853,11 @@
     </select>
   </div>
 
+  <div class="section rowflex nowrap gap">
+    <span title="@{whisper}">Whisper rolls to GM?</span>
+    <input name="attr_whisper" title="@{whisper}" type="checkbox" value="/w gm">
+  </div>
+
   <div class="section columnflex nowrap">
     <span>Skill Roll color</span>
     <select name="attr_skillcolor" title="skillcolor">
@@ -901,4 +906,4 @@
     </select>
   </div>
 
-</div>
+</main>
diff --git a/MythicD6/src/data.pug b/MythicD6/src/data.pug
index 0492730efd..57239db569 100644
--- a/MythicD6/src/data.pug
+++ b/MythicD6/src/data.pug
@@ -5,7 +5,7 @@ input(type="hidden" name="attr_weapon2skilldie" value="1")
 input(type="hidden" name="attr_weapon3skillpd" value="0")
 input(type="hidden" name="attr_weapon3skilldie" value="1")
 
-input(type="hidden" name="attr_version" value="1.01")
+input(type="hidden" name="attr_version" value="1.06")
 
 datalist#powers
   each power in ["Accelerated Healing", "Animal Mimicry", "Aquatic", "Body Control", "Boost", "Chameleon", "Darkness", "Disease", "Drain", "Duplication", "Elemental Sheath", "Energy Constructs", "Enhanced Perception", "Enhancement", "Entangle", "Extra Limbs", "Fast Reactions", "Flash Attack", "Healing", "Intagible", "Invisibility", "Life Support", "Mimicry", "Molecular Mimic", "Natural Weaponry", "Negation", "Omnivorous", "Paralyze", "Poison Secretion", "Radio Communication", "Ranged Power Attack", "Regeneration", "Shape Shift", "Size Control", "Stretching", "Super Attribute", "Super Senses", "Super Tracking", "Sustenance", "Transmutation", "Transfer Attribute", "Vampirism", "Weather Control", "X-Ray Vision", "adaptation", "body armor", "energy absorption", "force field", "immunity", "invulnerability", "missile deflection", "resurrection", "two-dimensional", "air manipulation", "cosmic manipulation", "darkness manipulation", "density manipulation", "earth manipulation", "electricity manipulation", "energy manipulation", "flame manipulation", "gravity manipulation", "ice manipulation", "light manipulation", "magnetic manipulation", "plant manipulation", "sound manipulation", "time manipulation", "water manipulation", "animation", "animate dead", "beast calling", "beast control", "confusion ", "cosmic awareness", "detect", "empathy", "esp", "hex", "illusion", "iron will", "language comprehension", "luck", "machine interface", "mind control", "mind reading", "mind field", "possession", "second sight", "summoning", "telekinesis", "telepathy", "astral projection", "burrowing", "dimensional shifting", "enhanced movement", "ftl travel", "flight", "spatial warping", "super jump", "super speed", "swinging", "teleportation", "wall-crawling"]