diff --git a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
index a0a4a3a13f..8a606e2430 100644
--- a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
+++ b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
@@ -1,5 +1,5 @@
 <!-- Dungeon Crawl Classics: Tabbed Character Sheet -->
-<!-- Version 1.3 -->
+<!-- Version 1.4 -->
 
 <div class="sheet-overall-wrapper">
 
@@ -16,7 +16,7 @@
 			<div class="sheet-col-1-4 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="text" placeholder="Character Name" name="attr_character_name"><br/>Character Name</div>
 			<div class="sheet-col-1-8 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="text" placeholder="Race" name="attr_race"><br/>Race</div>
 			<div class="sheet-col-1-8 sheet-center">&nbsp;</div>
-			<div class="sheet-col-1-8 sheet-center sheet-margin-top"><p class="sheet-last-updated">Sheet last updated<br/>9 August 2017</p></div>
+			<div class="sheet-col-1-8 sheet-center sheet-margin-top"><p class="sheet-last-updated">Sheet last updated<br/>10 September 2017</p></div>
 		</div>
 
 	</div>
@@ -1010,7 +1010,7 @@
 									</div>
 									<div class="sheet-col-1-8 sheet-center">
 										<button type="roll" class="sheet-roll" name="roll_ClericDisapproval" 
-										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}} {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - [[@{luckMod}]] [Luck Mod] ]] }}" >Disapproval</button>
+										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}} {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - ([[@{luckMod}]]) [Luck Mod] ]] }}" >Disapproval</button>
 									</div>
 								</div>
 
@@ -1371,7 +1371,7 @@
 
 									<div class="sheet-col-1-8 sheet-center">
 										<button type="roll" class="sheet-roll" name="roll_DwarfPriestDisapproval"
-										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}} {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - [[@{luckMod}]] [Luck Mod] ]] }}" >Disapproval</button>
+										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}} {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - ([[@{luckMod}]]) [Luck Mod] ]] }}" >Disapproval</button>
 									</div>
 								</div>
 
@@ -3006,7 +3006,7 @@
 										</select>
 									</div>
 									<button type="roll" class="sheet-roll" name="roll_paladinDisapproval"
-										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}}  {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - [[@{luckMod}]] [Luck Mod] ]] }}" >Disapproval</button>
+										value="&{template:DccTabbed} {{background=[[4]]}} {{class=1}} {{name=@{character_name}}} {{title=Deity Disapproval}}  {{deity=@{ClericDeity}}} {{disapproval=[[ (?{Natural Roll that resulted in Disapproval|1})@{disapprovalDie} [Die Roll] - ([[@{luckMod}]]) [Luck Mod] ]] }}" >Disapproval</button>
 								</div>
 
 								<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
@@ -5047,11 +5047,11 @@
 								<div class="sheet-col-1-11" title="Only enter the base damage roll here without any bonuses from stats or other sources"><input class="sheet-center" value="0" type="text" name="attr_meleeDmg"></div>
 								<div class="sheet-col-1-20"><input class="sheet-center" type="number" name="attr_meleeDmgBonus" value="[[[[@{strMod}]] + @{meleeMagic} + @{meleedmgLuckyRoll} + @{dmgLuckyRoll} + @{zeroWeaponLuckyRoll}]]" disabled="disabled"></div>
 								<div class="sheet-col-1-14">
-			                        <button type='roll' class="sheet-roll" title="Melee Weapon Attack"
+			                        <button type='roll' class="sheet-roll" name="roll_meleeWeaponAttack" title="Melee Weapon Attack"
 			                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name}}} {{title=@{meleeWeaponName}}} {{wielded=@{meleeAttackWielded} }} {{attack=[[ @{meleeAttackDice}cs>@{meleeCritThreat} [To Hit Roll] + @{meleeToHit} [To Hit Bonus] + (?{Deed/Smite Die roll|0}) [Deed/Smite] + (?{Any Attack Bonus|0}) [Attack Bonus]  ]]  }} {{damage=[[ ({(@{meleeDmg} [Base damage] + @{meleeDmgBonus} [Damage Bonus] + (?{Deed/Smite Die roll|0}) [Deed/Smite Die]),1d1}kh1) ]]}} {{crit=[[ @{CritDie} + [[@{luckMod}]] + @{critLuckyRoll} ]]}} {{crittable=@{CritDie_max}}} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]]}}" >Attack</button>
 			                    </div>
 			                    <div class="sheet-col-1-11">
-			                        <button type='roll' class="sheet-roll" title="Melee Weapon Backstab"
+			                        <button type='roll' class="sheet-roll" name="roll_meleeWeaponBackstab" title="Melee Weapon Backstab"
 			                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name}}} {{title=Backstab with @{meleeWeaponName}}} {{flavortext=You attack the enemy from behind or when they are unaware.  If the attack hits, it is a critical hit.}} {{backstab=[[ @{meleeAttackDice} [To Hit Roll] + @{meleeToHit} [To Hit Bonus] + @{ThiefBackstabCheck} [Backstab Bonus] + (?{Any Attack Bonus|0}) [Attack Bonus]  ]]  }} {{damage=[[ @{meleeDmg} [Base damage] + @{meleeDmgBonus} [Damage Bonus] ]]}} {{crit=[[ @{CritDie} + [[@{luckMod}]] + @{critLuckyRoll} ]]}} {{crittable=@{CritDie_max}}} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]]}}" >Backstab</button>
 			                    </div>
 							</div>
@@ -5140,11 +5140,11 @@
 										</select>
 									</div>
 									<div class="sheet-col-1-22">
-				                        <button type='roll' class="sheet-roll" title="Ranged Weapon" 
+				                        <button type='roll' class="sheet-roll" name="roll_rangedWeaponAttack" title="Ranged Weapon" 
 				                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name} }} {{title=@{rangedWeaponName} \n @{rangedDistanceShort} / @{rangedDistanceMed} / @{rangedDistanceLong} }} {{range=@{attackRange} }} {{rangedtype=Ranged Type}} {{type=@{rangedWeaponType} }} {{rangedattack=[[ @{rangedAttackDice}cs>@{rangedCritThreat} [To Hit Roll] + @{rangedToHit} [To Hit Bonus] + (?{Deed/Smite Die roll|0}) [Deed/Smite Die] + (?{Any Attack Bonus|0}) [Attack Bonus] - @{mediumRangePenalty} [Medium Range Penalty] ]] }} {{damage=[[ @{rangedDmg} [Base damage] + @{rangedDmgBonus} [Damage Bonus] + (?{Deed/Smite Die roll|0}) [Deed/Smite Die] + @{thrownShortRangeBonus} [Short Range Thrown Weapon STR Mod] ]] }} {{crit=[[ @{CritDie}[Dice Roll] + [[@{luckMod}]][Current Luck] + @{critLuckyRoll}[Crit Lucky Roll] ]] }} {{crittable=@{CritDie_max} }} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]] }}">Atk</button>
 				                    </div>
 				                    <div class="sheet-col-1-11">
-				                        <button type='roll' class="sheet-roll" title="Ranged Weapon Backstab" 
+				                        <button type='roll' class="sheet-roll" name="roll_rangedWeaponBackstab" title="Ranged Weapon Backstab" 
 				                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name} }} {{title=Backstab with @{rangedWeaponName} \n @{rangedDistanceShort} / @{rangedDistanceMed} / @{rangedDistanceLong} }} {{flavortext=You attack the enemy from behind or when they are unaware.  If the attack hits, it is a critical hit.}} {{range=@{attackRange} }} {{type=@{rangedWeaponType} }} {{rangedbackstab=[[ @{rangedAttackDice} [To Hit Roll] + @{rangedToHit} [To Hit Bonus] + (?{Any Attack Bonus|0}) [Attack Bonus] - @{mediumRangePenalty} [Medium Range Penalty] ]] }} {{damage=[[ @{rangedDmg} [Base damage] + @{rangedDmgBonus} [Damage Bonus] + @{thrownShortRangeBonus} [Short Range Thrown Weapon STR Mod] ]] }} {{crit=[[ @{CritDie}[Dice Roll] + [[@{luckMod}]][Current Luck] + @{critLuckyRoll}[Crit Lucky Roll] ]] }} {{crittable=@{CritDie_max} }} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]] }}">Backstab</button>
 				                    </div>
 								</div>
@@ -5458,7 +5458,7 @@
 								                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 														<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-															<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+															<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckSingleDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 																value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spellcheckwizard=[[@{spellCheckDie} + [[@{spellUserBonus}]] [Level/Stat Bonus] + [[@{spellCastLuckyRoll}]] [Casting Lucky Roll] + @{elfLuckySpellCheck} [Elven Lucky Spell] + (?{Amount of Spellburn|0}) [Spellburn] + ([[@{armorCheck}]]) [Armor Check Penalty] + @{arcaneMod} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Single Die Spell Check</button>
 														</div>
 
@@ -5499,7 +5499,7 @@
 								                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 														<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-															<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+															<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckMultiDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 																value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellcheckwizardmulti=1}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spelldie1=[[@{spellCheckMultiDie}]]}} {{spelldie2=[[@{spellCheckMultiDie}]]}} {{spellbonus=[[@{spellUserBonus}[Level/Stat Bonus] + @{spellCastLuckyRoll} [Casting Lucky Roll] + @{elfLuckySpellCheck} [Elven Lucky Spell] + (?{Amount of Spellburn|0}) [Spellburn] + @{armorCheck} [Armor Check Penalty] + @{arcaneModMulti} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Multi-Die Spell Check</button>
 														</div>
 													</div>
@@ -5723,7 +5723,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckSingleDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spellcheckwizard=[[@{spellCheckDie} + [[@{spellUserBonus}]] [Level/Stat Bonus] + [[@{spellCastLuckyRoll}]] [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + ([[@{armorCheck}]]) [Armor Check Penalty] + @{arcaneMod} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Single Die Spell Check</button>
 													</div>
 
@@ -5763,7 +5763,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckMultiDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellcheckwizardmulti=1}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spelldie1=[[@{spellCheckMultiDie}]]}} {{spelldie2=[[@{spellCheckMultiDie}]]}} {{spellbonus=[[@{spellUserBonus}[Level/Stat Bonus] + @{spellCastLuckyRoll} [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + @{armorCheck} [Armor Check Penalty] + @{arcaneModMulti} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Multi-Die Spell Check</button>
 													</div>
 												</div>
@@ -5988,7 +5988,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckSingleDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spellcheckwizard=[[@{spellCheckDie} + [[@{spellUserBonus}]] [Level/Stat Bonus] + [[@{spellCastLuckyRoll}]] [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + ([[@{armorCheck}]]) [Armor Check Penalty] + @{arcaneMod} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Single Die Spell Check</button>
 													</div>
 
@@ -6029,7 +6029,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckMultiDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellcheckwizardmulti=1}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spelldie1=[[@{spellCheckMultiDie}]]}} {{spelldie2=[[@{spellCheckMultiDie}]]}} {{spellbonus=[[@{spellUserBonus}[Level/Stat Bonus] + @{spellCastLuckyRoll} [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + @{armorCheck} [Armor Check Penalty] + @{arcaneModMulti} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Multi-Die Spell Check</button>
 													</div>
 												</div>
@@ -6253,7 +6253,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckSingleDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spellcheckwizard=[[@{spellCheckDie} + [[@{spellUserBonus}]] [Level/Stat Bonus] + [[@{spellCastLuckyRoll}]] [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + ([[@{armorCheck}]]) [Armor Check Penalty] + @{arcaneMod} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Single Die Spell Check</button>
 													</div>
 
@@ -6294,7 +6294,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckMultiDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellcheckwizardmulti=1}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spelldie1=[[@{spellCheckMultiDie}]]}} {{spelldie2=[[@{spellCheckMultiDie}]]}} {{spellbonus=[[@{spellUserBonus}[Level/Stat Bonus] + @{spellCastLuckyRoll} [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + @{armorCheck} [Armor Check Penalty] + @{arcaneModMulti} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Multi-Die Spell Check</button>
 													</div>
 												</div>
@@ -6519,7 +6519,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckSingleDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spellcheckwizard=[[@{spellCheckDie} + [[@{spellUserBonus}]] [Level/Stat Bonus] + [[@{spellCastLuckyRoll}]] [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + ([[@{armorCheck}]]) [Armor Check Penalty] + @{arcaneMod} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Single Die Spell Check</button>
 													</div>
 
@@ -6559,7 +6559,7 @@
 							                        <div class="sheet-col-1-23 sheet-vert-bottom sheet-center">&nbsp;</div>
 
 													<div class="sheet-col-11-23 sheet-vert-middle sheet-left">
-														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_Spellcheck" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
+														<button type="roll" class="sheet-roll sheet-vert-middle" name="roll_spellCheckMultiDie" title="The first time you attempt to cast this spell - Roll for your Mercurial Magic Effect."
 															value="&{template:DccTabbed} {{background=[[1d3]]}} {{spell=1}} {{name=@{character_name}}} {{title=@{spellName}}} {{spellcheckwizardmulti=1}} {{spellshowmanifest=@{spellManifestation}}} {{spellshowinfoblock=1}} {{spelllevel=@{spellBaseLevel}}} {{spellrange=@{spellRange}}} {{spellduration=@{spellDuration}}} {{spellcasttime=@{spellCastTime}}} {{spellsave=@{spellSave}}} {{spellconcentrate=@{spellConc}}} {{spellshowdesc=@{spellDescription}}} {{spellshowmercurial=@{spellMercurialMagic}}} {{rolltype=Spell Check : }} {{spelldie1=[[@{spellCheckMultiDie}]]}} {{spelldie2=[[@{spellCheckMultiDie}]]}} {{spellbonus=[[@{spellUserBonus}[Level/Stat Bonus] + @{spellCastLuckyRoll} [Casting Lucky Roll] + (?{Amount of Spellburn|0}) [Spellburn] + @{armorCheck} [Armor Check Penalty] + @{arcaneModMulti} [Bonus/Minus] ]]  }} {{crit= Add an additional +@{Level} to your spell check roll!}} {{fumble=[[1d6 + (@{spellFumbleCheck} [Luck] + @{spellFumbleLuckyRoll} [Fumble Lucky Roll]) ]] }}" >Multi-Die Spell Check</button>
 													</div>
 												</div>
@@ -8053,7 +8053,7 @@
 								<div class="sheet-col-1-11" title="Only enter the base damage roll here without any bonuses from stats or other sources"><input class="sheet-center" value="0" type="text" name="attr_meleeDmgZero"></div>
 								<div class="sheet-col-1-12"><input class="sheet-center" type="number" name="attr_meleeDmgBonusZero" value="[[[[@{strMod}]] + @{meleeMagicZero} + @{meleedmgLuckyRoll} + @{dmgLuckyRoll} + @{zeroWeaponLuckyRoll}]]" disabled="disabled"></div>
 								<div class="sheet-col-1-14 sheet-padl">
-			                        <button type='roll' class="sheet-roll" title="Melee Weapon Attack Zero"
+			                        <button type='roll' class="sheet-roll" name="roll_meleeWeaponAttackZero" title="Melee Weapon Attack Zero"
 			                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name}}} {{title=@{meleeWeaponNameZero}}} {{wielded=@{meleeAttackWieldedZero} }} {{attack=[[ @{meleeAttackDiceZero}cs>@{meleeCritThreatZero} [To Hit Roll] + @{meleeToHitZero} [To Hit Bonus] + (?{Any Attack Bonus|0}) [Attack Bonus]  ]]  }} {{damage=[[ ({(@{meleeDmgZero} [Base damage] + @{meleeDmgBonusZero} [Damage Bonus]),1d1}kh1) ]]}} {{crit=[[ @{CritDie} + [[@{luckMod}]] + @{critLuckyRoll} ]]}} {{crittable=@{critDieMaxZero}}} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]]}}" >Attack</button>
 			                    </div>
 							</div>
@@ -8131,7 +8131,7 @@
 										</select>
 									</div>
 									<div class="sheet-col-1-14 sheet-padl">
-				                        <button type='roll' class="sheet-roll" title="Ranged Weapon" 
+				                        <button type='roll' class="sheet-roll" name="roll_rangedWeaponAttackZero" title="Ranged Weapon" 
 				                        value="&{template:DccTabbed} {{background=[[0]]}} {{combat=1}} {{name=@{character_name} }} {{title=@{rangedWeaponNameZero} \n @{rangedDistanceShortZero} / @{rangedDistanceMedZero} / @{rangedDistanceLongZero} }} {{range=@{attackRangeZero} }}  {{rangedtype=Ranged Type}} {{type=@{rangedWeaponTypeZero} }} {{rangedattack=[[ @{rangedAttackDiceZero}cs>@{rangedCritThreatZero} [To Hit Roll] + @{rangedToHitZero} [To Hit Bonus] + (?{Any Attack Bonus|0}) [Attack Bonus] - @{mediumRangePenaltyZero} [Medium Range Penalty] ]] }} {{damage=[[ @{rangedDmgZero} [Base damage] + @{rangedDmgBonusZero} [Damage Bonus] + @{thrownShortRangeBonusZero} [Short Range Thrown Weapon STR Mod] ]] }} {{crit=[[ @{CritDie}[Dice Roll] + [[@{luckMod}]][Current Luck] + @{critLuckyRoll}[Crit Lucky Roll] ]] }} {{crittable=@{critDieMaxZero} }} {{fumble=[[ @{armorFumbleDie} + [[@{fumbleCheck}]] + [[@{fumbleLuckyRoll}]] ]] }}">Attack</button>
 				                    </div>
 								</div>
@@ -8662,7 +8662,8 @@
 								<div class="sheet-col-2-23" title="Damage for special added to attack"><input class="sheet-center" type="TEXT" value="0" name="attr_monsterSpecialDmg"></div>
 								<div class="sheet-col-9-22 sheet-center">&nbsp;</div>
 								<div class="sheet-col-1-5">
-			                        <button type='roll' class="sheet-roll" name="Attack_@{monsterMeleeAttackName}" value="&{template:DccTabbed} {{combat=1}} {{name=@{character_name}}} {{title=@{monsterMeleeAttackName}}} {{monsterattack=[[ @{monsterMeleeAttackDice}cs>@{monsterMeleeThreat} [To Hit Roll] + @{monsterMeleeToHit} [To Hit Bonus] + (?{To Hit Bonus/Minus|0}) [Bonus/Minus] ]]  }} {{damage=[[ @{monsterMeleeDmg} [Base damage] + @{monsterMeleeDmgBonus} [Damage Bonus] + (?{Damage Bonus/Minus|0}) [Bonus/Minus] ]]}} {{crit=[[ @{critDieMonster} - (?{Player Character Being Attacked Luck Modifier|0}) [Bonus/Minus] ]]}} {{crittable=@{critDieMaxMonster}}} {{fumble=[[ @{armorFumbleDieMonster} ]]}}  {{special=@{monsterSpecial}}} {{specialdmg=[[@{monsterSpecialDmg}]]}}">Monster Melee Attack</button>
+			                        <button type='roll' class="sheet-roll" name="roll_monsterMeleeAttack" 
+			                        value="&{template:DccTabbed} {{combat=1}} {{name=@{character_name}}} {{title=@{monsterMeleeAttackName}}} {{monsterattack=[[ @{monsterMeleeAttackDice}cs>@{monsterMeleeThreat} [To Hit Roll] + @{monsterMeleeToHit} [To Hit Bonus] + (?{To Hit Bonus/Minus|0}) [Bonus/Minus] ]]  }} {{damage=[[ @{monsterMeleeDmg} [Base damage] + @{monsterMeleeDmgBonus} [Damage Bonus] + (?{Damage Bonus/Minus|0}) [Bonus/Minus] ]]}} {{crit=[[ @{critDieMonster} - (?{Player Character Being Attacked Luck Modifier|0}) [Bonus/Minus] ]]}} {{crittable=@{critDieMaxMonster}}} {{fumble=[[ @{armorFumbleDieMonster} ]]}}  {{special=@{monsterSpecial}}} {{specialdmg=[[@{monsterSpecialDmg}]]}}">Monster Melee Attack</button>
 			                    </div>
 							</div>
 						</fieldset>
@@ -8743,7 +8744,7 @@
 									<div class="sheet-col-2-23" title="Damage for special added to attack"><input class="sheet-center" type="text" value="0" name="attr_monsterRangedSpecialDmg"></div>
 									<div class="sheet-col-9-22 sheet-center">&nbsp;</div>
 									<div class="sheet-col-1-5">
-				                        <button type='roll' class="sheet-roll" title="Ranged Weapon" 
+				                        <button type='roll' class="sheet-roll" name="roll_monsterRangedAttack" title="Ranged Weapon" 
 				                        value="&{template:DccTabbed} {{combat=1}} {{name=@{character_name} }} {{title=@{monsterRangedWeaponName} \n @{monsterRangedDistanceShort} / @{monsterRangedDistanceMed} / @{monsterRangedDistanceLong} }} {{range=@{monsterAttackRange} }} {{rangedattack=[[ @{monsterRangedAttackDice}cs>@{monsterRangedThreat} [To Hit Roll] + @{monsterRangedToHit} [To Hit Bonus] + (?{Any Attack Bonus|0}) [Attack Bonus] - @{mediumRangePenaltyMonster} [Medium Range Penalty] ]] }} {{damage=[[ @{monsterRangedDmg} [Base damage] + @{monsterRangedDmgBonus} [Damage Bonus] ]] }} {{crit=[[ @{critDieMonster} - (?{Player Character Being Attacked Luck Modifier|0}) [Bonus/Minus] ]]}} {{crittable=@{critDieMaxMonster}}} {{fumble=[[ @{armorFumbleDieMonster} ]]}}  {{special=@{monsterRangedSpecial}}} {{specialdmg=[[@{monsterRangedSpecialDmg}]]}}">Monster Ranged Attack</button>
 				                    </div>
 				                    <div class="sheet-col-1-6 sheet-center">&nbsp;</div>
diff --git a/DCC_Tabbed_Sheet/ReadMe b/DCC_Tabbed_Sheet/ReadMe
index b4e4c624fd..7ea9b9195d 100644
--- a/DCC_Tabbed_Sheet/ReadMe
+++ b/DCC_Tabbed_Sheet/ReadMe
@@ -3,10 +3,17 @@
 This is a DCC sheet that uses tabs and Roll Templates.  It also includes a 0-level sheet, and a Monster sheet.  It is the same style sheet as the Mutant Crawl Classics (MCC) sheet.
 
 ## Current Version
-1.3
+1.4
 
 ### Changelog
 
+#### 1.4
+* Fixed misnamed rolls for Single and Multi-Die spell checks.  They should now be able to be dragged onto the hotbar and work.  Old macros will no longer work as the roll variable names have changed.
+* Fixed bug where disapproval rolls with a negative luck modifier wouldn't roll
+* Fixed unnamed rolls for Level 1+ Melee, Melee Backstab, Ranged, Ranged Backstab rolls so they can now be dragged onto the hotbar as macros
+* Fixed unnamed rolls for Level 0 Melee and Ranged attack rolls so that they now can be dragged onto the hotbar as macros
+* Fixed unnamed rolls for Monsters for Melee and Ranged attack rolls so that they now can be dragged onto the hotbar as macros
+
 #### 1.3
 * Fixed formatting for Melee Weapons
 * Added in a 16 melee Critical Threat range for those who dual wield (mostly Halflings)
diff --git a/DCC_Tabbed_Sheet/sheet.json b/DCC_Tabbed_Sheet/sheet.json
index 734a599a15..e2d41f9b9d 100644
--- a/DCC_Tabbed_Sheet/sheet.json
+++ b/DCC_Tabbed_Sheet/sheet.json
@@ -4,5 +4,5 @@
     "authors": "Amanda the Amazon",
     "roll20userid": "565956",
     "preview": "DCC_Tabbed_Sheet.png",
-    "instructions": "# Dungeon Crawl Classics (DCC) Tabbed Character Sheet\r This sheet has a pared down 0-level Player sheet, a Level 1+ Player sheet and a Monster Sheet for the GM that are switchable via a tab at the top left of the sheet.\r* If you are currently using the original DCC sheet, it is recommended to make a copy of the campaign before switching to the new sheet.  The same variables were used whenever possible, but repeating sections data will not transfer at this time (I hope to add this feature).\r\r## Player Sheets\r\r* Most rolls should have Roll Templates.\r* Includes Core, Crawl and Crawling Under a Broken Moon classes.  Will eventually include a custom class area.\r* For Thieves, you can use the old Beta % based rolls (per Claytonian JP's request)\r* Lucky rolls are included within rolls automatically whenever possible.\r* Roll Template Backgrounds based on the kind of rolls you are making.\r* Criticals and Fumbles are rolled automatically based on the d20 roll.\r\r## Monster Sheet\r\r* Monster Rolls have Roll Templates.\r* Certain rolls only go to GM\r* Melee and Ranged Attacks include Special attack ability\r* Criticals and Fumbles are rolled automatically based on the d20 roll.\r\r\r## Current Version: 1.3"
+    "instructions": "# Dungeon Crawl Classics (DCC) Tabbed Character Sheet\r This sheet has a pared down 0-level Player sheet, a Level 1+ Player sheet and a Monster Sheet for the GM that are switchable via a tab at the top left of the sheet.\r* If you are currently using the original DCC sheet, it is recommended to make a copy of the campaign before switching to the new sheet.  The same variables were used whenever possible, but repeating sections data will not transfer at this time (I hope to add this feature).\r\r## Player Sheets\r\r* Most rolls should have Roll Templates.\r* Includes Core, Crawl and Crawling Under a Broken Moon classes.  Will eventually include a custom class area.\r* For Thieves, you can use the old Beta % based rolls (per Claytonian JP's request)\r* Lucky rolls are included within rolls automatically whenever possible.\r* Roll Template Backgrounds based on the kind of rolls you are making.\r* Criticals and Fumbles are rolled automatically based on the d20 roll.\r\r## Monster Sheet\r\r* Monster Rolls have Roll Templates.\r* Certain rolls only go to GM\r* Melee and Ranged Attacks include Special attack ability\r* Criticals and Fumbles are rolled automatically based on the d20 roll.\r\r\r## Current Version: 1.4"
 }
\ No newline at end of file