diff --git a/Symbaroum/src/pug/_mixins.pug b/Symbaroum/src/pug/_mixins.pug
index 7885624c58..279b6ab5a1 100644
--- a/Symbaroum/src/pug/_mixins.pug
+++ b/Symbaroum/src/pug/_mixins.pug
@@ -35,7 +35,7 @@ mixin rankChecks(section)
 
 //- WEAPON
 mixin weapon()
-	button(data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type='roll' value='&{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}')
+	button(data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type='roll' value='&{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}')
 	label(data-i18n-title="title-weapon-or-power-used" title="Weapon or power used in attack")
 		input(data-i18n-title="title-weapon-or-power-used" name="attr_weapon1-name" title="Weapon or power used in attack" type="text")
 	select(data-i18n-title="title-attribute-explanation" name="attr_attack-ability1" title="Ability that determines a hit, usually Accurate")
@@ -55,7 +55,7 @@ mixin weapon()
 
 //- DEFENSE
 mixin defense()
-	button(name="roll_defense" type='roll' value="&{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}")
+	button(name="roll_defense" type='roll' value="&{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}")
 	label(data-i18n-title="armor-or-power" title="armor-or-power")
 		input(data-i18n-title="title-armor-or-power-explanation" name="attr_armor1-name" title="Armor the character is wearing, or Power used to defend" type="text")
 	label(data-i18n-title="impede" title="impede")
@@ -78,7 +78,7 @@ mixin defense()
 //- TRAITS & ABILITES
 mixin traitAbil(section)
 	- const traitSkill = section === "ability" ? "skill" : section;
-	button(data-i18n-title="title-" + section + "-check" name="roll_" + section + "Check" title=section + " Check" type="roll" value="&{template:abilitycheck}{{name=^{" + section + "}: @{" + section + "name}}} {{character=@{character-name}}} {{selected=@{" + section + "attribute}}} {{attribute=[[@{" + section + "attribute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}} ")
+	button(data-i18n-title="title-" + section + "-check" name="roll_" + section + "Check" title=section + " Check" type="roll" value="&{template:abilitycheck}{{name=^{" + section + "}: @{" + section + "name}}} {{character=@{character-name}}} {{selected=@{" + section + "attribute}}} {{attribute=[[@{" + section + "attribute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}} ")
 	label.long(data-i18n-title="title-" + section + "name" title=section + " name")
 		input(data-i18n-placeholder="name" data-i18n-title="title-" + section + "name" name="attr_" + section + "name" placeholder="Name" title=section + " name" type="text")
 	select(data-i18n-title="title-" + section + "-ability" name="attr_" + section + "attribute" title="Attribute for " + section " Check")
diff --git a/Symbaroum/symbaroum.html b/Symbaroum/symbaroum.html
index 8b4463769f..bcf5a174b4 100644
--- a/Symbaroum/symbaroum.html
+++ b/Symbaroum/symbaroum.html
@@ -37,21 +37,21 @@
   </div>
   <div class="grid attributes">
     <input name="attr_accurate" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="accurate" name="roll_AccurateCheck" type="roll" value="&amp;{template:attrib}{{name=^{accurate}}} {{character=@{character-name}}} {{attribute=[[@{accurate}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Accurate</span></button>
+    <button data-i18n="accurate" name="roll_AccurateCheck" type="roll" value="&amp;{template:attrib}{{name=^{accurate}}} {{character=@{character-name}}} {{attribute=[[@{accurate}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Accurate</span></button>
     <input name="attr_cunning" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="cunning" name="roll_CunningCheck" type="roll" value="&amp;{template:attrib}{{name=^{cunning}}} {{character=@{character-name}}} {{attribute=[[@{cunning}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Cunning</span></button>
+    <button data-i18n="cunning" name="roll_CunningCheck" type="roll" value="&amp;{template:attrib}{{name=^{cunning}}} {{character=@{character-name}}} {{attribute=[[@{cunning}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Cunning</span></button>
     <input name="attr_discreet" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="discreet" name="roll_DiscreetCheck" type="roll" value="&amp;{template:attrib}{{name=^{discreet}}} {{character=@{character-name}}} {{attribute=[[@{discreet}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Discreet</span></button>
+    <button data-i18n="discreet" name="roll_DiscreetCheck" type="roll" value="&amp;{template:attrib}{{name=^{discreet}}} {{character=@{character-name}}} {{attribute=[[@{discreet}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Discreet</span></button>
     <input name="attr_persuasive" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="persuasive" name="roll_PersuasiveCheck" type="roll" value="&amp;{template:attrib}{{name=^{persuasive}}} {{character=@{character-name}}} {{attribute=[[@{persuasive}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Persuasive</span></button>
+    <button data-i18n="persuasive" name="roll_PersuasiveCheck" type="roll" value="&amp;{template:attrib}{{name=^{persuasive}}} {{character=@{character-name}}} {{attribute=[[@{persuasive}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Persuasive</span></button>
     <input name="attr_quick" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="quick" name="roll_QuickCheck" type="roll" value="&amp;{template:attrib}{{name=^{quick}}} {{character=@{character-name}}} {{attribute=[[@{quick}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Quick</span></button>
+    <button data-i18n="quick" name="roll_QuickCheck" type="roll" value="&amp;{template:attrib}{{name=^{quick}}} {{character=@{character-name}}} {{attribute=[[@{quick}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Quick</span></button>
     <input name="attr_resolute" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="resolute" name="roll_ResoluteCheck" type="roll" value="&amp;{template:attrib}{{name=^{resolute}}} {{character=@{character-name}}} {{attribute=[[@{resolute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Resolute</span></button>
+    <button data-i18n="resolute" name="roll_ResoluteCheck" type="roll" value="&amp;{template:attrib}{{name=^{resolute}}} {{character=@{character-name}}} {{attribute=[[@{resolute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Resolute</span></button>
     <input name="attr_strong" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="strong" name="roll_StrongCheck" type="roll" value="&amp;{template:attrib}{{name=^{strong}}} {{character=@{character-name}}} {{attribute=[[@{strong}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Strong</span></button>
+    <button data-i18n="strong" name="roll_StrongCheck" type="roll" value="&amp;{template:attrib}{{name=^{strong}}} {{character=@{character-name}}} {{attribute=[[@{strong}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Strong</span></button>
     <input name="attr_vigilant" max="15" min="5" type="number" value="10"/>
-    <button data-i18n="vigilant" name="roll_VigilantCheck" type="roll" value="&amp;{template:attrib}{{name=^{vigilant}}} {{character=@{character-name}}} {{attribute=[[@{vigilant}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}"><span>Vigilant</span></button>
+    <button data-i18n="vigilant" name="roll_VigilantCheck" type="roll" value="&amp;{template:attrib}{{name=^{vigilant}}} {{character=@{character-name}}} {{attribute=[[@{vigilant}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}"><span>Vigilant</span></button>
     <input class="sheet-number-circle" type="number" disabled="true" value="(@{accurate}+@{cunning}+@{discreet}+@{persuasive}+@{quick}+@{resolute}+@{strong}+@{vigilant})" name="attr_attribute-total"/><span data-i18n="total">Total</span>
   </div>
   <div class="grid tabs">
@@ -113,7 +113,7 @@
       <h3 class="center background-color" data-i18n="attack">Attack</h3>
     </div>
     <div class="grid section-body">
-      <button data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type="roll" value="&amp;{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}"></button>
+      <button data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type="roll" value="&amp;{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}"></button>
       <label data-i18n-title="title-weapon-or-power-used" title="Weapon or power used in attack">
         <input data-i18n-title="title-weapon-or-power-used" name="attr_weapon1-name" title="Weapon or power used in attack" type="text"/>
       </label>
@@ -164,7 +164,7 @@
     </div>
     <fieldset class="repeating_weapons">
       <div class="grid section-body">
-        <button data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type="roll" value="&amp;{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Enemy Disdvantage|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}"></button>
+        <button data-i18n-title="title-use-sattack" name="roll_attack" title="Use attack!" type="roll" value="&amp;{template:attack}{{name=@{weapon1-name}}}{{attribute=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}]]}}{{attribute1=[[@{attack-ability1}+(?{Modifier +/-|0})+@{weapon1-extra-attack}+1]]}} {{attack=[[1d20]]}} {{damage=[[@{weapon1-dtype}+@{weapon1-extra-dtype}+@{weapon1-extra-damage}]]}} {{damage-crit=[[1d6]]}} {{character-name=@{character-name}}} {{attack-type=[[@{attack-ability1}]]}}"></button>
         <label data-i18n-title="title-weapon-or-power-used" title="Weapon or power used in attack">
           <input data-i18n-title="title-weapon-or-power-used" name="attr_weapon1-name" title="Weapon or power used in attack" type="text"/>
         </label>
@@ -230,7 +230,7 @@
       <h3 class="center background-color" data-i18n="defense">Defense</h3>
     </div>
     <div class="grid section-body">
-      <button name="roll_defense" type="roll" value="&amp;{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}"></button>
+      <button name="roll_defense" type="roll" value="&amp;{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}"></button>
       <label data-i18n-title="armor-or-power" title="armor-or-power">
         <input data-i18n-title="title-armor-or-power-explanation" name="attr_armor1-name" title="Armor the character is wearing, or Power used to defend" type="text"/>
       </label>
@@ -284,7 +284,7 @@
     </div>
     <fieldset class="repeating_armor">
       <div class="grid section-body">
-        <button name="roll_defense" type="roll" value="&amp;{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Enemy Disdvantage|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}"></button>
+        <button name="roll_defense" type="roll" value="&amp;{template:defense}{{name=@{armor1-name}}}{{attribute=[[@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{attribute1=[[1+@{defense-ability}+(?{Modifier +/-|0})+@{armor-impeding}+@{extra-armor}]]}}{{defense-roll=[[1d20]]}}{{damage-taken=[[@{armor1-dtype}+@{armor1-extra-dtype}+@{negated-damage}]]}}{{defense-crit=[[1d20]]}}{{damage-crit=[[1d6]]}}{{character-name=@{character-name}}} {{defense-type=[[@{defense-ability}]]}}"></button>
         <label data-i18n-title="armor-or-power" title="armor-or-power">
           <input data-i18n-title="title-armor-or-power-explanation" name="attr_armor1-name" title="Armor the character is wearing, or Power used to defend" type="text"/>
         </label>
@@ -345,7 +345,7 @@
           <h1 data-i18n="traits">Traits</h1>
         </div>
         <div class="grid section-body">
-          <button data-i18n-title="title-trait-check" name="roll_traitCheck" title="trait Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{trait}: @{traitname}}} {{character=@{character-name}}} {{selected=@{traitattribute}}} {{attribute=[[@{traitattribute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}} "></button>
+          <button data-i18n-title="title-trait-check" name="roll_traitCheck" title="trait Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{trait}: @{traitname}}} {{character=@{character-name}}} {{selected=@{traitattribute}}} {{attribute=[[@{traitattribute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}} "></button>
           <label class="long" data-i18n-title="title-traitname" title="trait name">
             <input data-i18n-placeholder="name" data-i18n-title="title-traitname" name="attr_traitname" placeholder="Name" title="trait name" type="text"/>
           </label>
@@ -384,7 +384,7 @@
         </div>
         <fieldset class="repeating_trait">
           <div class="grid section-body">
-            <button data-i18n-title="title-trait-check" name="roll_traitCheck" title="trait Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{trait}: @{traitname}}} {{character=@{character-name}}} {{selected=@{traitattribute}}} {{attribute=[[@{traitattribute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}} "></button>
+            <button data-i18n-title="title-trait-check" name="roll_traitCheck" title="trait Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{trait}: @{traitname}}} {{character=@{character-name}}} {{selected=@{traitattribute}}} {{attribute=[[@{traitattribute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}} "></button>
             <label class="long" data-i18n-title="title-traitname" title="trait name">
               <input data-i18n-placeholder="name" data-i18n-title="title-traitname" name="attr_traitname" placeholder="Name" title="trait name" type="text"/>
             </label>
@@ -540,7 +540,7 @@
           <h1 data-i18n="abilities">Abilities</h1>
         </div>
         <div class="grid section-body">
-          <button data-i18n-title="title-ability-check" name="roll_abilityCheck" title="ability Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{ability}: @{abilityname}}} {{character=@{character-name}}} {{selected=@{abilityattribute}}} {{attribute=[[@{abilityattribute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}} "></button>
+          <button data-i18n-title="title-ability-check" name="roll_abilityCheck" title="ability Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{ability}: @{abilityname}}} {{character=@{character-name}}} {{selected=@{abilityattribute}}} {{attribute=[[@{abilityattribute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}} "></button>
           <label class="long" data-i18n-title="title-abilityname" title="ability name">
             <input data-i18n-placeholder="name" data-i18n-title="title-abilityname" name="attr_abilityname" placeholder="Name" title="ability name" type="text"/>
           </label>
@@ -579,7 +579,7 @@
         </div>
         <fieldset class="repeating_abilities">
           <div class="grid section-body">
-            <button data-i18n-title="title-ability-check" name="roll_abilityCheck" title="ability Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{ability}: @{abilityname}}} {{character=@{character-name}}} {{selected=@{abilityattribute}}} {{attribute=[[@{abilityattribute}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}} "></button>
+            <button data-i18n-title="title-ability-check" name="roll_abilityCheck" title="ability Check" type="roll" value="&amp;{template:abilitycheck}{{name=^{ability}: @{abilityname}}} {{character=@{character-name}}} {{selected=@{abilityattribute}}} {{attribute=[[@{abilityattribute}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}} "></button>
             <label class="long" data-i18n-title="title-abilityname" title="ability name">
               <input data-i18n-placeholder="name" data-i18n-title="title-abilityname" name="attr_abilityname" placeholder="Name" title="ability name" type="text"/>
             </label>
diff --git a/Symbaroum/symbaroum.pug b/Symbaroum/symbaroum.pug
index 1c65cc5dc2..137d6bc400 100644
--- a/Symbaroum/symbaroum.pug
+++ b/Symbaroum/symbaroum.pug
@@ -43,7 +43,7 @@ input.tab(name="attr_page-number" type="hidden" value="1")
 		each val in attributeObject
 			- const attrName = val.toLowerCase();
 			input(name='attr_' + attrName  max="15" min="5" type="number" value="10")
-			button(data-i18n=attrName name='roll_' + val + 'Check' type='roll' value='&{template:attrib}{{name=^{' + attrName + '}}} {{character=@{character-name}}} {{attribute=[[@{' + attrName + '}+(?{Enemy Disdvantage|0})]]}} {{roll=[[1d20]]}}')
+			button(data-i18n=attrName name='roll_' + val + 'Check' type='roll' value='&{template:attrib}{{name=^{' + attrName + '}}} {{character=@{character-name}}} {{attribute=[[@{' + attrName + '}+(?{Modifier +/-|0})]]}} {{roll=[[1d20]]}}')
 				span=val
 		input(type="number" class="sheet-number-circle" disabled="true" value="(@{accurate}+@{cunning}+@{discreet}+@{persuasive}+@{quick}+@{resolute}+@{strong}+@{vigilant})" name="attr_attribute-total")
 		span(data-i18n="total") Total