diff --git a/Pendragon/Pendragon.html b/Pendragon/Pendragon.html
index 4287027069..a7eee930b4 100644
--- a/Pendragon/Pendragon.html
+++ b/Pendragon/Pendragon.html
@@ -157,23 +157,23 @@
 				<label style='display:inline-block;  width:120px;'>Size</label>
 				<input style='display:inline;' type="number" name="attr_SIZ" class="sheet-carac2" value="10" />
 				</button>
-				<button style='display:inline;' type='roll' name='roll_TestSIZ' value='/em @{MYNAME} rolls SIZE with a modifier of ?{modif|0} : \n/roll 1d20<[[@{SIZ}+?{modif|0}]] \ SIZE roll @{SIZ} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestSIZ' value='/em @{MYNAME} rolls SIZE with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{SIZ}+?{modif|0},0}>21}*(@{SIZ}+?{modif|0}-20) + 0]]<[[@{SIZ}+?{modif|0}]] \ SIZE roll @{SIZ} modif. ?{modif|0}'></button>
 				<br />
 				<label style='display:inline-block;  width:120px; '>Dexterity</label>
 				<input style='display:inline;' type="number" name="attr_DEX" class="sheet-carac2" value="10" />
-				<button style='display:inline;' type='roll' name='roll_TestDEX' value='/em @{MYNAME} rolls DEXTERITY with a modifier of ?{modif|0} : \n/roll 1d20<[[@{DEX}+?{modif|0}]] \ DEXTERITY roll @{DEX} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestDEX' value='/em @{MYNAME} rolls DEXTERITY with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{DEX}+?{modif|0},0}>21}*(@{DEX}+?{modif|0}-20) + 0]]<[[@{DEX}+?{modif|0}]] \ DEXTERITY roll @{DEX} modif. ?{modif|0}'></button>
 				<br />
 				<label style='display:inline-block;  width:120px;'>Strength</label>
 				<input style='display:inline;' type="number" name="attr_STR" class="sheet-carac2" value="10" />
-				<button style='display:inline;' type='roll' name='roll_TestSTR' value='/em @{MYNAME} rolls STRENGTH with a modifier of ?{modif|0} : \n/roll 1d20<[[@{STR}+?{modif|0}]] \ STRENGTH roll @{STR} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestSTR' value='/em @{MYNAME} rolls STRENGTH with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{STR}+?{modif|0},0}>21}*(@{STR}+?{modif|0}-20) + 0]]<[[@{STR}+?{modif|0}]] \ STRENGTH roll @{STR} modif. ?{modif|0}'></button>
 				<br />
 				<label style='display:inline-block;  width:120px;'>Constitution</label>
 				<input style='display:inline;' type="number" name="attr_CON" class="sheet-carac2" value="10" />
-				<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls CONSTITUTION with a modifier of ?{modif|0} : \n/roll 1d20<[[@{CON}+?{modif|0}]] \ CONSTITUTION roll @{CON} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls CONSTITUTION with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{CON}+?{modif|0},0}>21}*(@{CON}+?{modif|0}-20) + 0]]<[[@{CON}+?{modif|0}]] \ CONSTITUTION roll @{CON} modif. ?{modif|0}'></button>
 				<br />
 				<label style='display:inline-block;  width:120px;'>Appearance</label>
 				<input style='display:inline;' type="number" name="attr_APP" class="sheet-carac2" value="10" />
-				<button style='display:inline;' type='roll' name='roll_TestFOR' value="/em @{MYNAME} rolls APPEARENCE with a modifier of ?{modif|0} : \n/roll 1d20<[[@{APP}+?{modif|0}]] \ APPEARENCE roll @{APP} modif. ?{modif|0}"></button>
+				<button style='display:inline;' type='roll' name='roll_TestFOR' value="/em @{MYNAME} rolls APPEARENCE with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{APP}+?{modif|0},0}>21}*(@{APP}+?{modif|0}-20) + 0]]<[[@{APP}+?{modif|0}]] \ APPEARENCE roll @{APP} modif. ?{modif|0}"></button>
 				<br />
 				<h3 style="margin-bottom: 10px;">DERIVED STATISTICS</h3>
 				<input type="hidden" name="attr_DEG-dice" value="((@{STR} + @{SIZ}) / 6)" disabled="true" />
@@ -197,33 +197,33 @@
 				<label style='display:inline-block;  width:170px;'>Honor</label>
 				<input style='display:inline;' type="number" name="attr_HON" class="sheet-carac2" value="10" />
 				<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-honor' value='1' />
-				<button type='roll' name='roll_TestHON' value="/em @{MYNAME} rolls HONOR with a modifier of ?{modif|0} : \n/roll 1d20<[[@{HON}+?{modif|0}]] \ HONOR roll @{HON} modif. ?{modif|0}"></button>
+				<button type='roll' name='roll_TestHON' value="/em @{MYNAME} rolls HONOR with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{HON}+?{modif|0},0}>21}*(@{HON}+?{modif|0}-20) + 0]]<[[@{HON}+?{modif|0}]] \ HONOR roll @{HON} modif. ?{modif|0}"></button>
 				<br />
 				<label style='display:inline-block;  width:170px;'>Loyalty</label>
 				<input style='display:inline;' type="number" name="attr_LOY" class="sheet-carac2" value="10" />
 				<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-loyaute' value='1' />
-				<button type='roll' name='roll_TestLOY' value="/em @{MYNAME} rolls LOYALTY with a modifier of ?{modif|0} : \n/roll 1d20<[[@{LOY}+?{modif|0}]] \ LOYALTY roll @{LOY} modif. ?{modif|0}"></button>
+				<button type='roll' name='roll_TestLOY' value="/em @{MYNAME} rolls LOYALTY with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{LOY}+?{modif|0},0}>21}*(@{LOY}+?{modif|0}-20) + 0]]<[[@{LOY}+?{modif|0}]] \ LOYALTY roll @{LOY} modif. ?{modif|0}"></button>
 				<br />
 				<label style='display:inline-block;  width:170px;'>Hospitality</label>
 				<input style='display:inline;' type="number" name="attr_HOS" class="sheet-carac2" value="10" />
 				<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-hospitalite' value='1' />
-				<button type='roll' name='roll_TestHOS' value="/em @{MYNAME} rolls HOSPITALITY with a modifier of ?{modif|0} : \n/roll 1d20<[[@{HOS}+?{modif|0}]] \ HOSPITALITY roll @{HOS} modif. ?{modif|0}"></button>
+				<button type='roll' name='roll_TestHOS' value="/em @{MYNAME} rolls HOSPITALITY with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{HOS}+?{modif|0},0}>21}*(@{HOS}+?{modif|0}-20) + 0]]<[[@{HOS}+?{modif|0}]] \ HOSPITALITY roll @{HOS} modif. ?{modif|0}"></button>
 				<br />
 				<label style='display:inline-block;  width:170px;'>Hate (Saxons) </label>
 				<input style='display:inline;' type="number" name="attr_HAT" class="sheet-carac2" value="10" />
 				<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-hate' value='1' />
-				<button type='roll' name='roll_TestHAT' value="/em @{MYNAME} rolls Hate (Saxons) with a modifier of ?{modif|0} : \n/roll 1d20<[[@{HAT}+?{modif|0}]] \ HATRED OF THE SAXONS roll @{HAT} modif. ?{modif|0}"></button>
+				<button type='roll' name='roll_TestHAT' value="/em @{MYNAME} rolls Hate (Saxons) with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{HAT}+?{modif|0},0}>21}*(@{HAT}+?{modif|0}-20) + 0]]<[[@{HAT}+?{modif|0}]] \ HATRED OF THE SAXONS roll @{HAT} modif. ?{modif|0}"></button>
 				<br />
 				<label style='display:inline-block;  width:170px;'>Love (Family)</label>
 				<input style='display:inline;' type="number" name="attr_LOV" class="sheet-carac2" value="10" />
 				<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-love' value='1' />
-				<button type='roll' name='roll_TestLOV' value="/em @{MYNAME} rolls Love (Family) with a modifier of ?{modif|0} : \n/roll 1d20<[[@{LOV}+?{modif|0}]] \ LOVE OF FAMILY roll @{LOV} modif. ?{modif|0}"></button>
+				<button type='roll' name='roll_TestLOV' value="/em @{MYNAME} rolls Love (Family) with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{LOV}+?{modif|0},0}>21}*(@{LOV}+?{modif|0}-20) + 0]]<[[@{LOV}+?{modif|0}]] \ LOVE OF FAMILY roll @{LOV} modif. ?{modif|0}"></button>
 				<!-- additional passions -->
 				<fieldset class="repeating_passions" style="margin-top:-20px;">
 					<input style='display:inline-block;  width:185px; background: transparent; border: none; margin-bottom:5px; text-align:left;' name="attr_Pname" type='text' value="passion name">
 					<input style='display:inline;' type="number" name="attr_Pvalue" class="sheet-carac2" value="10" />
 					<input style='display:inline;  margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-Pname' value='1' />
-					<button type='roll' name='roll_CB-Pname' value="/em @{MYNAME} rolls @{Pname} with a modifier of ?{modif|0} : \n/roll 1d20<[[@{Pvalue}+?{modif|0}]] \   @{Pname} roll  @{Pvalue} modif. ?{modif|0}"></button>
+					<button type='roll' name='roll_CB-Pname' value="/em @{MYNAME} rolls @{Pname} with a modifier of ?{modif|0} : \n/roll 1d20+[[{{@{Pvalue}+?{modif|0},0}>21}*(@{Pvalue}+?{modif|0}-20) + 0]]<[[@{Pvalue}+?{modif|0}]] \   @{Pname} roll  @{Pvalue} modif. ?{modif|0}"></button>
 					<br />
 				</fieldset>
 			</p>
@@ -233,7 +233,7 @@
 <div class="sheet-tab-content sheet-tab2">
 	<h3 style="margin-bottom: 10px; text-align:center;">PERSONALITY TRAITS</h3>
 	<p style="text-align:center;">
-		<button type='roll' name='roll_Test-TCha' value='/em @{MYNAME} rolls CHASTE. \n/roll 1d20<[[@{TCha}+?{modif|0}]] \ CHASTE roll @{TCha}  modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TCha' value='/em @{MYNAME} rolls CHASTE. \n/roll 1d20+[[{{@{TCha}+?{modif|0},0}>21}*(@{TCha}+?{modif|0}-20) + 0]]<[[@{TCha}+?{modif|0}]] \ CHASTE roll @{TCha}  modif. ?{modif|0}'></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TCha' value='1' />
 		<label style='display:inline-block; width:130px;'>Chaste</label>
 		<input style=style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TCha" class="sheet-carac2" value="10" />
@@ -241,9 +241,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TLus" class="sheet-carac2" value="20-@{TCha}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Lustful</label>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TLus' value='1' />
-		<button type='roll' name='roll_Test-TLus' value='/em @{MYNAME} rolls LUSTFUL. \n/roll 1d20<[[@{TLus}+?{modif|0}]] \ LUSTFUL roll @{TLus} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TLus' value='/em @{MYNAME} rolls LUSTFUL. \n/roll 1d20+[[{{@{TLus}+?{modif|0},0}>21}*(@{TLus}+?{modif|0}-20) + 0]]<[[@{TLus}+?{modif|0}]] \ LUSTFUL roll @{TLus} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TEne' value="/em @{MYNAME} rolls ENERGETIC. \n/roll 1d20<[[@{TEne}+?{modif|0}]] \ ENERGETIC roll @{TEne} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TEne' value="/em @{MYNAME} rolls ENERGETIC. \n/roll 1d20+[[{{@{TEne}+?{modif|0},0}>21}*(@{TEne}+?{modif|0}-20) + 0]]<[[@{TEne}+?{modif|0}]] \ ENERGETIC roll @{TEne} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TEne' value='1' />
 		<label style='display:inline-block; width:130px;'>Energetic*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TEne" class="sheet-carac2" value="10" />
@@ -251,9 +251,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TLaz" class="sheet-carac2" value="20-@{TEne}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Lazy</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TLaz' value='1' />
-		<button type='roll' name='roll_Test-TLaz' value='/em @{MYNAME} rolls LAZY. \n/roll 1d20<[[@{TLaz}+?{modif|0}]] \ LAZY roll @{TLaz} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TLaz' value='/em @{MYNAME} rolls LAZY. \n/roll 1d20+[[{{@{TLaz}+?{modif|0},0}>21}*(@{TLaz}+?{modif|0}-20) + 0]]<[[@{TLaz}+?{modif|0}]] \ LAZY roll @{TLaz} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TFor' value="/em @{MYNAME} rolls FORGIVING. \n/roll 1d20<[[@{TFor}+?{modif|0}]] \ FORGIVING roll @{TFor} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TFor' value="/em @{MYNAME} rolls FORGIVING. \n/roll 1d20+[[{{@{TFor}+?{modif|0},0}>21}*(@{TFor}+?{modif|0}-20) + 0]]<[[@{TFor}+?{modif|0}]] \ FORGIVING roll @{TFor} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TFor' value='1' />
 		<label style='display:inline-block; width:130px;'>Forgiving</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TFor" class="sheet-carac2" value="10" />
@@ -261,9 +261,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TVen" class="sheet-carac2" value="20-@{TFor}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Vengeful</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TVen' value='1' />
-		<button type='roll' name='roll_Test-TVen' value='/em @{MYNAME} rolls VENGEFUL. \n/roll 1d20<[[@{TVen}+?{modif|0}]] \ VENGEFUL roll @{TVen} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TVen' value='/em @{MYNAME} rolls VENGEFUL. \n/roll 1d20+[[{{@{TVen}+?{modif|0},0}>21}*(@{TVen}+?{modif|0}-20) + 0]]<[[@{TVen}+?{modif|0}]] \ VENGEFUL roll @{TVen} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TGen' value="/em @{MYNAME} rolls GENEROUS. \n/roll 1d20<[[@{TGen}+?{modif|0}]] \ GENEROUS roll @{TGen} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TGen' value="/em @{MYNAME} rolls GENEROUS. \n/roll 1d20+[[{{@{TGen}+?{modif|0},0}>21}*(@{TGen}+?{modif|0}-20) + 0]]<[[@{TGen}+?{modif|0}]] \ GENEROUS roll @{TGen} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TGen' value='1' />
 		<label style='display:inline-block; width:130px;'>Generous*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TGen" class="sheet-carac2" value="10" />
@@ -271,9 +271,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TSel" class="sheet-carac2" value="20-@{TGen}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Selfish</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TSel' value='1' />
-		<button type='roll' name='roll_Test-TSel' value='/em @{MYNAME} rolls SELFISH. \n/roll 1d20<[[@{TSel}+?{modif|0}]] \ SELFISH roll @{TSel} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TSel' value='/em @{MYNAME} rolls SELFISH. \n/roll 1d20+[[{{@{TSel}+?{modif|0},0}>21}*(@{TSel}+?{modif|0}-20) + 0]]<[[@{TSel}+?{modif|0}]] \ SELFISH roll @{TSel} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-THon' value="/em @{MYNAME} rolls HONEST. \n/roll 1d20<[[@{THon}+?{modif|0}]] \ HONEST roll @{THon} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-THon' value="/em @{MYNAME} rolls HONEST. \n/roll 1d20+[[{{@{THon}+?{modif|0},0}>21}*(@{THon}+?{modif|0}-20) + 0]]<[[@{THon}+?{modif|0}]] \ HONEST roll @{THon} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-THon' value='1' />
 		<label style='display:inline-block; width:130px;'>Honest</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_THon" class="sheet-carac2" value="10" />
@@ -281,9 +281,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TDec" class="sheet-carac2" value="20-@{THon}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Deceitful</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TDec' value='1' />
-		<button type='roll' name='roll_Test-TDec' value='/em @{MYNAME} rolls DECEITFUL. \n/roll 1d20<[[@{TDec}+?{modif|0}]] \ DECEITFUL roll @{TDec} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TDec' value='/em @{MYNAME} rolls DECEITFUL. \n/roll 1d20+[[{{@{TDec}+?{modif|0},0}>21}*(@{TDec}+?{modif|0}-20) + 0]]<[[@{TDec}+?{modif|0}]] \ DECEITFUL roll @{TDec} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TJus' value="/em @{MYNAME} rolls JUST. \n/roll 1d20<[[@{TJus}+?{modif|0}]] \ JUST roll @{TJus} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TJus' value="/em @{MYNAME} rolls JUST. \n/roll 1d20+[[{{@{TJus}+?{modif|0},0}>21}*(@{TJus}+?{modif|0}-20) + 0]]<[[@{TJus}+?{modif|0}]] \ JUST roll @{TJus} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TJus' value='1' />
 		<label style='display:inline-block; width:130px;'>Just*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TJus" class="sheet-carac2" value="10" />
@@ -291,9 +291,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TArb" class="sheet-carac2" value="20-@{TJus}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Arbitrary</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TArb' value='1' />
-		<button type='roll' name='roll_Test-TArb' value='/em @{MYNAME} rolls ARBITRARY. \n/roll 1d20<[[@{TArb}+?{modif|0}]] \ ARBITRARY roll @{TArb} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TArb' value='/em @{MYNAME} rolls ARBITRARY. \n/roll 1d20+[[{{@{TArb}+?{modif|0},0}>21}*(@{TArb}+?{modif|0}-20) + 0]]<[[@{TArb}+?{modif|0}]] \ ARBITRARY roll @{TArb} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TMer' value="/em @{MYNAME} rolls MERCIFUL. \n/roll 1d20<[[@{TMer}+?{modif|0}]] \ MERCIFUL roll @{TMer} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TMer' value="/em @{MYNAME} rolls MERCIFUL. \n/roll 1d20+[[{{@{TMer}+?{modif|0},0}>21}*(@{TMer}+?{modif|0}-20) + 0]]<[[@{TMer}+?{modif|0}]] \ MERCIFUL roll @{TMer} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TMer' value='1' />
 		<label style='display:inline-block; width:130px;'>Merciful*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TMer" class="sheet-carac2" value="10" />
@@ -301,9 +301,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TCru" class="sheet-carac2" value="20-@{TMer}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Cruel</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TCru' value='1' />
-		<button type='roll' name='roll_Test-TCru' value='/em @{MYNAME} rolls CRUEL. \n/roll 1d20<[[@{TCru}+?{modif|0}]] \ CRUEL roll @{TCru} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TCru' value='/em @{MYNAME} rolls CRUEL. \n/roll 1d20+[[{{@{TCru}+?{modif|0},0}>21}*(@{TCru}+?{modif|0}-20) + 0]]<[[@{TCru}+?{modif|0}]] \ CRUEL roll @{TCru} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TMod' value="/em @{MYNAME} rolls MODEST. \n/roll 1d20<[[@{TMod}+?{modif|0}]] \ MODEST roll @{TMod} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TMod' value="/em @{MYNAME} rolls MODEST. \n/roll 1d20+[[{{@{TMod}+?{modif|0},0}>21}*(@{TMod}+?{modif|0}-20) + 0]]<[[@{TMod}+?{modif|0}]] \ MODEST roll @{TMod} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TMod' value='1' />
 		<label style='display:inline-block; width:130px;'>Modest*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TMod" class="sheet-carac2" value="10" />
@@ -311,9 +311,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TPro" class="sheet-carac2" value="20-@{TMod}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Proud</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TPro' value='1' />
-		<button type='roll' name='roll_Test-TPro' value='/em @{MYNAME} rolls PROUD. \n/roll 1d20<[[@{TPro}+?{modif|0}]] \ PROUD roll @{TPro} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TPro' value='/em @{MYNAME} rolls PROUD. \n/roll 1d20+[[{{@{TPro}+?{modif|0},0}>21}*(@{TPro}+?{modif|0}-20) + 0]]<[[@{TPro}+?{modif|0}]] \ PROUD roll @{TPro} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TPio' value="/em @{MYNAME} rolls SPIRITUAL. \n/roll 1d20<[[@{TPio}+?{modif|0}]] \ SPIRITUAL roll @{TPio} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TPio' value="/em @{MYNAME} rolls SPIRITUAL. \n/roll 1d20+[[{{@{TPio}+?{modif|0},0}>21}*(@{TPio}+?{modif|0}-20) + 0]]<[[@{TPio}+?{modif|0}]] \ SPIRITUAL roll @{TPio} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TPio' value='1' />
 		<label style='display:inline-block; width:130px;'>Spiritual</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TPio" class="sheet-carac2" value="10" />
@@ -321,9 +321,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TWor" class="sheet-carac2" value="20-@{TPio}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Worldly</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TWor' value='1' />
-		<button type='roll' name='roll_Test-TWor' value='/em @{MYNAME} rolls WORLDLY. \n/roll 1d20<[[@{TWor}+?{modif|0}]] \ WORLDLY roll @{TWor} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TWor' value='/em @{MYNAME} rolls WORLDLY. \n/roll 1d20+[[{{@{TWor}+?{modif|0},0}>21}*(@{TWor}+?{modif|0}-20) + 0]]<[[@{TWor}+?{modif|0}]] \ WORLDLY roll @{TWor} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TPru' value="/em @{MYNAME} rolls PRUDENT. \n/roll 1d20<[[@{TPru}+?{modif|0}]] \ PRUDENT roll @{TPru} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TPru' value="/em @{MYNAME} rolls PRUDENT. \n/roll 1d20+[[{{@{TPru}+?{modif|0},0}>21}*(@{TPru}+?{modif|0}-20) + 0]]<[[@{TPru}+?{modif|0}]] \ PRUDENT roll @{TPru} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TPru' value='1' />
 		<label style='display:inline-block; width:130px;'>Prudent</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TPru" class="sheet-carac2" value="10" />
@@ -331,9 +331,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TRec" class="sheet-carac2" value="20-@{TPru}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Reckless</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TRec' value='1' />
-		<button type='roll' name='roll_Test-TRec' value='/em @{MYNAME} rolls RECKLESS. \n/roll 1d20<[[@{TRec}+?{modif|0}]] \ RECKLESS roll @{TRec} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TRec' value='/em @{MYNAME} rolls RECKLESS. \n/roll 1d20+[[{{@{TRec}+?{modif|0},0}>21}*(@{TRec}+?{modif|0}-20) + 0]]<[[@{TRec}+?{modif|0}]] \ RECKLESS roll @{TRec} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TTem' value="/em @{MYNAME} rolls TEMPERATE. \n/roll 1d20<[[@{TTem}+?{modif|0}]] \ TEMPERATE roll @{TTem} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TTem' value="/em @{MYNAME} rolls TEMPERATE. \n/roll 1d20+[[{{@{TTem}+?{modif|0},0}>21}*(@{TTem}+?{modif|0}-20) + 0]]<[[@{TTem}+?{modif|0}]] \ TEMPERATE roll @{TTem} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TTem' value='1' />
 		<label style='display:inline-block; width:130px;'>Temperate</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TTem" class="sheet-carac2" value="10" />
@@ -341,9 +341,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TInd" class="sheet-carac2" value="20-@{TTem}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Indulgent</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TInd' value='1' />
-		<button type='roll' name='roll_Test-TInd' value='/em @{MYNAME} rolls INDULGENT. \n/roll 1d20<[[@{TInd}+?{modif|0}]] \ INDULGENT roll @{TInd} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TInd' value='/em @{MYNAME} rolls INDULGENT. \n/roll 1d20+[[{{@{TInd}+?{modif|0},0}>21}*(@{TInd}+?{modif|0}-20) + 0]]<[[@{TInd}+?{modif|0}]] \ INDULGENT roll @{TInd} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TTru' value="/em @{MYNAME} rolls TRUSTING. \n/roll 1d20<[[@{TTru}+?{modif|0}]] \ TRUSTING roll @{TTru} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TTru' value="/em @{MYNAME} rolls TRUSTING. \n/roll 1d20+[[{{@{TTru}+?{modif|0},0}>21}*(@{TTru}+?{modif|0}-20) + 0]]<[[@{TTru}+?{modif|0}]] \ TRUSTING roll @{TTru} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TTru' value='1' />
 		<label style='display:inline-block; width:130px;'>Trusting</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TTru" class="sheet-carac2" value="10" />
@@ -351,9 +351,9 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TSus" class="sheet-carac2" value="20-@{TTru}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Suspicious</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TSus' value='1' />
-		<button type='roll' name='roll_Test-TSus' value='/em @{MYNAME} rolls SUSPICIOUS. \n/roll 1d20<[[@{TSus}+?{modif|0}]] \ SUSPICIOUS roll @{TSus} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TSus' value='/em @{MYNAME} rolls SUSPICIOUS. \n/roll 1d20+[[{{@{TSus}+?{modif|0},0}>21}*(@{TSus}+?{modif|0}-20) + 0]]<[[@{TSus}+?{modif|0}]] \ SUSPICIOUS roll @{TSus} modif. ?{modif|0}'></button>
 		<br />
-		<button type='roll' name='roll_Test-TVal' value="/em @{MYNAME} rolls VALOROUS. \n/roll 1d20<[[@{TVal}+?{modif|0}]] \ VALOROUS roll @{TVal} modif. ?{modif|0}"></button>
+		<button type='roll' name='roll_Test-TVal' value="/em @{MYNAME} rolls VALOROUS. \n/roll 1d20+[[{{@{TVal}+?{modif|0},0}>21}*(@{TVal}+?{modif|0}-20) + 0]]<[[@{TVal}+?{modif|0}]] \ VALOROUS roll @{TVal} modif. ?{modif|0}"></button>
 		<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-TVal' value='1' />
 		<label style='display:inline-block; width:130px;'>Valorous*</label>
 		<input style='display:inline; text-align:center; font-weight:bold;' type="number" name="attr_TVal" class="sheet-carac2" value="10" />
@@ -361,7 +361,7 @@
 		<input style='display:inline; width:35px; text-align:center; font-weight:bold;' type="text" name="attr_TCow" class="sheet-carac2" value="20-@{TVal}" disabled="true" />
 		<label style='display:inline-block; width:130px; text-align:right'>Cowardly</label>
 		<input style='display:inline; margin-left: 10px; margin-left:10px; margin-right: 10px; ' type='checkbox' name='attr_CB-TCow' value='1' />
-		<button type='roll' name='roll_Test-TCow' value='/em @{MYNAME} rolls COWARDLY. \n/roll 1d20<[[@{TCow}+?{modif|0}]] \ COWARDLY roll @{TCow} modif. ?{modif|0}'></button>
+		<button type='roll' name='roll_Test-TCow' value='/em @{MYNAME} rolls COWARDLY. \n/roll 1d20+[[{{@{TCow}+?{modif|0},0}>21}*(@{TCow}+?{modif|0}-20) + 0]]<[[@{TCow}+?{modif|0}]] \ COWARDLY roll @{TCow} modif. ?{modif|0}'></button>
 		<br />
 	</p>
 	<h4 style="margin-bottom: 10px;">
@@ -402,7 +402,7 @@
 		</select>
 		<input style='display:inline-block; width:160px; font-size:1em; background: transparent; border: none; margin-bottom:5px;' name="attr_TDcible" type='text' value="target">
 		<input style='display:inline;' type="number" name="attr_TD-value" class="sheet-carac2" value="0" />
-		<button style='display:inline;' type='roll' name='roll_Test-TCow' value='/em @{MYNAME} makes a directed trait roll. \n/roll 1d20<[[@{TD-trait}+@{TD-value}+?{modif|0}]] \ trait @{TD-trait} , target modifier @{TD-value} modifier ?{modif|0}'></button>
+		<button style='display:inline;' type='roll' name='roll_Test-TCow' value='/em @{MYNAME} makes a directed trait roll. \n/roll 1d20+[[{{@{TD-trait}+?{modif|0},0}>21}*(@{TD-trait}+?{modif|0}-20) + 0]]<[[@{TD-trait}+@{TD-value}+?{modif|0}]] \ trait @{TD-trait} , target modifier @{TD-value} modifier ?{modif|0}'></button>
 		<br />
 	</fieldset>
 </div>
@@ -413,148 +413,148 @@
 			<label style='display:inline-block; width:120px;'>Awareness</label>
 			<input style='display:inline;' type="number" name="attr_awa" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-awa' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sawa' value='/em @{MYNAME} rolls Awareness. \n/roll 1d20<[[@{awa}+?{modif|0}]] \ awareness skill roll @{awa} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sawa' value='/em @{MYNAME} rolls Awareness. \n/roll 1d20+[[{{@{awa}+?{modif|0},0}>21}*(@{awa}+?{modif|0}-20) + 0]]<[[@{awa}+?{modif|0}]] \ awareness skill roll @{awa} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Boating</label>
 			<input style='display:inline;' type="number" name="attr_boa" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-boa' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sboa' value='/em @{MYNAME} rolls Boating. \n/roll 1d20<[[@{boa}+?{modif|0}]] \ boating skill roll @{boa} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sboa' value='/em @{MYNAME} rolls Boating. \n/roll 1d20+[[{{@{boa}+?{modif|0},0}>21}*(@{boa}+?{modif|0}-20) + 0]]<[[@{boa}+?{modif|0}]] \ boating skill roll @{boa} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Chirurgery</label>
 			<input style='display:inline;' type="number" name="attr_chirurgery" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-chirurgery' value='1' />
-			<button style='display:inline;' type='roll' name='roll_SChirurgery' value='/em @{MYNAME} rolls Chirurgery. \n/roll 1d20<[[@{chirurgery}+?{modif|0}]] \ Chirurgery skill roll @{chirurgery} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_SChirurgery' value='/em @{MYNAME} rolls Chirurgery. \n/roll 1d20+[[{{@{chirurgery}+?{modif|0},0}>21}*(@{chirurgery}+?{modif|0}-20) + 0]]<[[@{chirurgery}+?{modif|0}]] \ Chirurgery skill roll @{chirurgery} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Compose</label>
 			<input style='display:inline;' type="number" name="attr_compo" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-compo' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Scom' value='/em @{MYNAME} rolls Compose. \n/roll 1d20<[[@{compo}+?{modif|0}]] \ compose skill roll @{compo} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Scom' value='/em @{MYNAME} rolls Compose. \n/roll 1d20+[[{{@{compo}+?{modif|0},0}>21}*(@{compo}+?{modif|0}-20) + 0]]<[[@{compo}+?{modif|0}]] \ compose skill roll @{compo} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Courtesy</label>
 			<input style='display:inline;' type="number" name="attr_cou" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-cou' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Scou' value='/em @{MYNAME} rolls Courtesy. \n/roll 1d20<[[@{cou}+?{modif|0}]] \ courtesy skill roll @{cou} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Scou' value='/em @{MYNAME} rolls Courtesy. \n/roll 1d20+[[{{@{cou}+?{modif|0},0}>21}*(@{cou}+?{modif|0}-20) + 0]]<[[@{cou}+?{modif|0}]] \ courtesy skill roll @{cou} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Distaff</label>
 			<input style='display:inline;' type="number" name="attr_distaff" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-distaff' value='1' />
-			<button style='display:inline;' type='roll' name='roll_distaff' value='/em @{MYNAME} rolls Distaff. \n/roll 1d20<[[@{distaff}+?{modif|0}]] \ courtesy skill roll @{distaff} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_distaff' value='/em @{MYNAME} rolls Distaff. \n/roll 1d20+[[{{@{distaff}+?{modif|0},0}>21}*(@{distaff}+?{modif|0}-20) + 0]]<[[@{distaff}+?{modif|0}]] \ courtesy skill roll @{distaff} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Dancing</label>
 			<input style='display:inline;' type="number" name="attr_danse" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-danse' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sdan' value='/em @{MYNAME} rolls Dancing. \n/roll 1d20<[[@{danse}+?{modif|0}]] \ dancing skill roll @{danse} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sdan' value='/em @{MYNAME} rolls Dancing. \n/roll 1d20+[[{{@{danse}+?{modif|0},0}>21}*(@{danse}+?{modif|0}-20) + 0]]<[[@{danse}+?{modif|0}]] \ dancing skill roll @{danse} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Faerie Lore</label>
 			<input style='display:inline;' type="number" name="attr_faes" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-faes' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sfae' value='/em @{MYNAME} rolls Faerie Lore. \n/roll 1d20<[[@{faes}+?{modif|0}]] \ faerie lore skill roll @{faes} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sfae' value='/em @{MYNAME} rolls Faerie Lore. \n/roll 1d20+[[{{@{faes}+?{modif|0},0}>21}*(@{faes}+?{modif|0}-20) + 0]]<[[@{faes}+?{modif|0}]] \ faerie lore skill roll @{faes} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Falconry</label>
 			<input style='display:inline;' type="number" name="attr_fal" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-fal' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sfal' value='/em @{MYNAME} rolls Falconry. \n/roll 1d20<[[@{fal}+?{modif|0}]] \ falconry skill roll @{fal} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sfal' value='/em @{MYNAME} rolls Falconry. \n/roll 1d20+[[{{@{fal}+?{modif|0},0}>21}*(@{fal}+?{modif|0}-20) + 0]]<[[@{fal}+?{modif|0}]] \ falconry skill roll @{fal} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Fashion</label>
 			<input style='display:inline;' type="number" name="attr_fashion" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-Fashion' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sfashion' value='/em @{MYNAME} rolls Fashion. \n/roll 1d20<[[@{fashion}+?{modif|0}]] \ falconry skill roll @{fashion} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sfashion' value='/em @{MYNAME} rolls Fashion. \n/roll 1d20+[[{{@{fashion}+?{modif|0},0}>21}*(@{fashion}+?{modif|0}-20) + 0]]<[[@{fashion}+?{modif|0}]] \ falconry skill roll @{fashion} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>First Aid</label>
 			<input style='display:inline;' type="number" name="attr_fa" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-fa' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sfa' value='/em @{MYNAME} rolls First Aid. \n/roll 1d20<[[@{fa}+?{modif|0}]] \ first aid skill roll @{fa} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sfa' value='/em @{MYNAME} rolls First Aid. \n/roll 1d20+[[{{@{fa}+?{modif|0},0}>21}*(@{fa}+?{modif|0}-20) + 0]]<[[@{fa}+?{modif|0}]] \ first aid skill roll @{fa} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Flirting</label>
 			<input style='display:inline;' type="number" name="attr_fli" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-fli' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sfli' value='/em @{MYNAME} rolls Flirting. \n/roll 1d20<[[@{fli}+?{modif|0}]] \ flirting skill roll @{fli} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sfli' value='/em @{MYNAME} rolls Flirting. \n/roll 1d20+[[{{@{fli}+?{modif|0},0}>21}*(@{fli}+?{modif|0}-20) + 0]]<[[@{fli}+?{modif|0}]] \ flirting skill roll @{fli} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Folklore</label>
 			<input style='display:inline;' type="number" name="attr_fol" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-fol' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Folklore. \n/roll 1d20<[[@{fol}+?{modif|0}]] \ folklore skill roll @{fol} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Folklore. \n/roll 1d20+[[{{@{fol}+?{modif|0},0}>21}*(@{fol}+?{modif|0}-20) + 0]]<[[@{fol}+?{modif|0}]] \ folklore skill roll @{fol} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Gaming</label>
 			<input style='display:inline;' type="number" name="attr_gam" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-gam' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sgam' value='/em @{MYNAME} rolls Gaming. \n/roll 1d20<[[@{gam}+?{modif|0}]] \ gaming skill roll @{gam} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sgam' value='/em @{MYNAME} rolls Gaming. \n/roll 1d20+[[{{@{gam}+?{modif|0},0}>21}*(@{gam}+?{modif|0}-20) + 0]]<[[@{gam}+?{modif|0}]] \ gaming skill roll @{gam} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Heraldry</label>
 			<input style='display:inline;' type="number" name="attr_her" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-her' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sher' value='/em @{MYNAME} rolls Heraldry. \n/roll 1d20<[[@{her}+?{modif|0}]] \ heraldry skill roll @{her} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sher' value='/em @{MYNAME} rolls Heraldry. \n/roll 1d20+[[{{@{her}+?{modif|0},0}>21}*(@{her}+?{modif|0}-20) + 0]]<[[@{her}+?{modif|0}]] \ heraldry skill roll @{her} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Hunting</label>
 			<input style='display:inline;' type="number" name="attr_hun" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-hun' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Shun' value='/em @{MYNAME} rolls Hunting. \n/roll 1d20<[[@{hun}+?{modif|0}]] \ hunting skill roll @{hun} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Shun' value='/em @{MYNAME} rolls Hunting. \n/roll 1d20+[[{{@{hun}+?{modif|0},0}>21}*(@{hun}+?{modif|0}-20) + 0]]<[[@{hun}+?{modif|0}]] \ hunting skill roll @{hun} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Intrigue</label>
 			<input style='display:inline;' type="number" name="attr_int" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-int' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sint' value='/em @{MYNAME} rolls Intrigue. \n/roll 1d20<[[@{int}+?{modif|0}]] \ intrigue skill roll @{int} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sint' value='/em @{MYNAME} rolls Intrigue. \n/roll 1d20+[[{{@{int}+?{modif|0},0}>21}*(@{int}+?{modif|0}-20) + 0]]<[[@{int}+?{modif|0}]] \ intrigue skill roll @{int} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Music</label>
 			<input style='display:inline;' type="number" name="attr_music" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-music' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Smusic' value='/em @{MYNAME} rolls Music skill roll. \n/roll 1d20<[[@{music}+?{modif|0}]] \ music skill roll @{music} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Smusic' value='/em @{MYNAME} rolls Music skill roll. \n/roll 1d20+[[{{@{music}+?{modif|0},0}>21}*(@{music}+?{modif|0}-20) + 0]]<[[@{music}+?{modif|0}]] \ music skill roll @{music} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Orate</label>
 			<input style='display:inline;' type="number" name="attr_ora" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-ora' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sora' value='/em @{MYNAME} rolls Orate skill roll. \n/roll 1d20<[[@{ora}+?{modif|0}]] \ orate skill roll @{ora} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sora' value='/em @{MYNAME} rolls Orate skill roll. \n/roll 1d20+[[{{@{ora}+?{modif|0},0}>21}*(@{ora}+?{modif|0}-20) + 0]]<[[@{ora}+?{modif|0}]] \ orate skill roll @{ora} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Play</label>
 			<input style='display:inline;' type="number" name="attr_pla" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-pla' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Play. \n/roll 1d20<[[@{pla}+?{modif|0}]] \ play skill roll @{pla} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Play. \n/roll 1d20+[[{{@{pla}+?{modif|0},0}>21}*(@{pla}+?{modif|0}-20) + 0]]<[[@{pla}+?{modif|0}]] \ play skill roll @{pla} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Read</label>
 			<input style='display:inline;' type="number" name="attr_read" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-read' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sread' value='/em @{MYNAME} rolls Read. \n/roll 1d20<[[@{read}+?{modif|0}]] \ read skill roll @{read} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sread' value='/em @{MYNAME} rolls Read. \n/roll 1d20+[[{{@{read}+?{modif|0},0}>21}*(@{read}+?{modif|0}-20) + 0]]<[[@{read}+?{modif|0}]] \ read skill roll @{read} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Recognize</label>
 			<input style='display:inline;' type="number" name="attr_rec" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-rec' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Srec' value='/em @{MYNAME} rolls Recognize. \n/roll 1d20<[[@{rec}+?{modif|0}]] \ recognize skill roll @{rec} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Srec' value='/em @{MYNAME} rolls Recognize. \n/roll 1d20+[[{{@{rec}+?{modif|0},0}>21}*(@{rec}+?{modif|0}-20) + 0]]<[[@{rec}+?{modif|0}]] \ recognize skill roll @{rec} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Religion</label>
 			<input style='display:inline;' type="number" name="attr_rel" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-rel' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Srel' value='/em @{MYNAME} rolls Religion. \n/roll 1d20<[[@{rel}+?{modif|0}]] \ religion skill roll @{rel} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Srel' value='/em @{MYNAME} rolls Religion. \n/roll 1d20+[[{{@{rel}+?{modif|0},0}>21}*(@{rel}+?{modif|0}-20) + 0]]<[[@{rel}+?{modif|0}]] \ religion skill roll @{rel} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Romance</label>
 			<input style='display:inline;' type="number" name="attr_rom" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-rom' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Romance. \n/roll 1d20<[[@{rom}+?{modif|0}]] \ romance skill roll @{rom} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{MYNAME} rolls Romance. \n/roll 1d20+[[{{@{rom}+?{modif|0},0}>21}*(@{rom}+?{modif|0}-20) + 0]]<[[@{rom}+?{modif|0}]] \ romance skill roll @{rom} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Singing</label>
 			<input style='display:inline;' type="number" name="attr_sing" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-sing' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Ssing' value='/em @{MYNAME} rolls Singing. \n/roll 1d20<[[@{sing}+?{modif|0}]] \ singing skill roll @{sing} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Ssing' value='/em @{MYNAME} rolls Singing. \n/roll 1d20+[[{{@{sing}+?{modif|0},0}>21}*(@{sing}+?{modif|0}-20) + 0]]<[[@{sing}+?{modif|0}]] \ singing skill roll @{sing} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Stewardship</label>
 			<input style='display:inline;' type="number" name="attr_ste" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-ste' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sste' value='/em @{MYNAME} rolls Stewardship. \n/roll 1d20<[[@{ste}+?{modif|0}]] \ stewardship skill roll @{ste} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sste' value='/em @{MYNAME} rolls Stewardship. \n/roll 1d20+[[{{@{ste}+?{modif|0},0}>21}*(@{ste}+?{modif|0}-20) + 0]]<[[@{ste}+?{modif|0}]] \ stewardship skill roll @{ste} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Swimming</label>
 			<input style='display:inline;' type="number" name="attr_swi" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-swi' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Sswi' value='/em @{MYNAME} rolls Swimming. \n/roll 1d20<[[@{swi}+?{modif|0}]] \ swimming skill roll @{swi} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Sswi' value='/em @{MYNAME} rolls Swimming. \n/roll 1d20+[[{{@{swi}+?{modif|0},0}>21}*(@{swi}+?{modif|0}-20) + 0]]<[[@{swi}+?{modif|0}]] \ swimming skill roll @{swi} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Tourney</label>
 			<input style='display:inline;' type="number" name="attr_tou" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-tou' value='1' />
-			<button style='display:inline;' type='roll' name='roll_Stou' value='/em @{MYNAME} rolls Tourney. \n/roll 1d20<[[@{tou}+?{modif|0}]] \ tourney skill roll @{tou} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_Stou' value='/em @{MYNAME} rolls Tourney. \n/roll 1d20+[[{{@{tou}+?{modif|0},0}>21}*(@{tou}+?{modif|0}-20) + 0]]<[[@{tou}+?{modif|0}]] \ tourney skill roll @{tou} modif. ?{modif|0}'></button>
 			<br />
 			<fieldset class="repeating_skills" style="margin-top:-20px;">
 				<input style='display:inline-block; width:130px; background: transparent; border: none; margin-bottom:5px; text-align:left; font-size:1.2em; font-weight: bold;' name="attr_Cskillname" type='text' value="skill name">
 				<input style='display:inline;' type="number" name="attr_Cskillvalue" class="sheet-comp" value="10" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-CCskillname' value='1' />
-				<button style='display:inline;' type='roll' name='roll_TestCskill' value='/em @{MYNAME} tests @{Cskillname} \n/roll 1d20<[[@{Cskillvalue}+?{modif|0}]] \ @{Cskillvalue} roll @{Cskillvalue} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestCskill' value='/em @{MYNAME} tests @{Cskillname} \n/roll 1d20+[[{{@{Cskillvalue}+?{modif|0},0}>21}*(@{Cskillvalue}+?{modif|0}-20) + 0]]<[[@{Cskillvalue}+?{modif|0}]] \ @{Cskillvalue} roll @{Cskillvalue} modif. ?{modif|0}'></button>
 				<br />
 			</fieldset>
 			<h2 style="margin: 10px;">Squire</h2>
@@ -563,31 +563,31 @@
 				<input style='display:inline-block; width:203px; background: transparent; border: none; margin-bottom:5px; text-align:left; ' name="attr_squire_name" type='text' value="squire name">
 				<label style='display:inline-block; margin-left:5px; width:22px;'>Age:</label>
 				<input style='display:inline;' type="number" name="attr_squire_age" class="sheet-comp" value="15" />
-				<button style='display:inline;' type='roll' name='roll_SquireRoll' value='/em @{MYNAME} makes a Squire Roll \n/roll 1d20<[[@{squire_age}+?{modif|0}]] \ @{squire_age} roll @{squire_age} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_SquireRoll' value='/em @{MYNAME} makes a Squire Roll \n/roll 1d20+[[{{@{squire_age}+?{modif|0},0}>21}*(@{squire_age}+?{modif|0}-20) + 0]]<[[@{squire_age}+?{modif|0}]] \ squire age roll @{squire_age} modif. ?{modif|0}'></button>
 			</div>
 			<div>
 				<label style='display:inline-block; width:130px;'>First Aid:</label>
 				<input style='display:inline;' type="number" name="attr_squire_first_aid" class="sheet-comp" value="6" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_squire_first_aid_chk' />
-				<button style='display:inline;' type='roll' name='roll_Test_sq_first_aid' value='/em @{MYNAME} tests Squire First Aid \n/roll 1d20<[[@{squire_first_aid}+?{modif|0}]] \ @{squire_first_aid} roll @{squire_first_aid} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_Test_sq_first_aid' value='/em @{MYNAME} tests Squire First Aid \n/roll 1d20+[[{{@{squire_first_aid}+?{modif|0},0}>21}*(@{squire_first_aid}+?{modif|0}-20) + 0]]<[[@{squire_first_aid}+?{modif|0}]] \ squire first aid skill roll @{squire_first_aid} modif. ?{modif|0}'></button>
 			</div>
 			<div>
 				<label style='display:inline-block; width:130px;'>Battle:</label>
 				<input style='display:inline;' type="number" name="attr_squire_battle" class="sheet-comp" value="1" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_squire_battle_chk' />
-				<button style='display:inline;' type='roll' name='roll_Test_sq_battle' value='/em @{MYNAME} tests Squire Battle \n/roll 1d20<[[@{squire_battle}+?{modif|0}]] \ @{squire_battle} roll @{squire_battle} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_Test_sq_battle' value='/em @{MYNAME} tests Squire Battle \n/roll 1d20+[[{{@{squire_battle}+?{modif|0},0}>21}*(@{squire_battle}+?{modif|0}-20) + 0]]<[[@{squire_battle}+?{modif|0}]] \ squire battle skill roll @{squire_battle} modif. ?{modif|0}'></button>
 			</div>
 			<div>
 				<label style='display:inline-block; width:130px;'>Horsemanship:</label>
 				<input style='display:inline;' type="number" name="attr_squire_horsemanship" class="sheet-comp" value="6" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_squire_horsemanship_chk' />
-				<button style='display:inline;' type='roll' name='roll_Test_sq_horsemanship' value='/em @{MYNAME} tests Squire Battle \n/roll 1d20<[[@{squire_battle}+?{modif|0}]] \ @{squire_battle} roll @{squire_battle} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_Test_sq_horsemanship' value='/em @{MYNAME} tests Squire Horsemanship \n/roll 1d20+[[{{@{squire_horsemanship}+?{modif|0},0}>21}*(@{squire_horsemanship}+?{modif|0}-20) + 0]]<[[@{squire_horsemanship}+?{modif|0}]] \ squire horsemanship skill roll @{squire_horsemanship} modif. ?{modif|0}'></button>
 			</div>
 			<div>
 				<input style='display:inline-block; width:140px; background: transparent; border: none; margin-bottom:5px; text-align:left; font-size:1.2em; font-weight: bold;' name="attr_squire_skill_name" type='text' value="squire skill">
 				<input style='display:inline;' type="number" name="attr_squire_skill_value" class="sheet-comp" value="5" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_squire_other_skill_chk' />
-				<button style='display:inline;' type='roll' name='roll_Test_squire_other_skill' value='/em @{MYNAME} tests @{squire_skill_name} \n/roll 1d20<[[@{squire_skill_value}+?{modif|0}]] \ @{squire_skill_value} roll @{squire_skill_value} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_Test_squire_other_skill' value='/em @{MYNAME} tests @{squire_skill_name} \n/roll 1d20+[[{{@{squire_skill_value}+?{modif|0},0}>21}*(@{squire_skill_value}+?{modif|0}-20) + 0]]<[[@{squire_skill_value}+?{modif|0}]] \ squire skill roll @{squire_skill_value} modif. ?{modif|0}'></button>
 			</div>
 		</div>
 		<div class="sheet-col">
@@ -595,44 +595,44 @@
 			<label style='display:inline-block; width:120px;'>Battle</label>
 			<input style='display:inline;' type="number" name="attr_bat" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-bat' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestBat' value='/em @{MYNAME} rolls Battle. \n/roll 1d20<[[@{bat}+?{modif|0}]] \ battle skill roll @{bat} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestBat' value='/em @{MYNAME} rolls Battle. \n/roll 1d20+[[{{@{bat}+?{modif|0},0}>21}*(@{bat}+?{modif|0}-20) + 0]]<[[@{bat}+?{modif|0}]] \ battle skill roll @{bat} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Siege</label>
 			<input style='display:inline;' type="number" name="attr_siege" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-siege' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestSiege' value='/em @{MYNAME} rolls Siege. \n/roll 1d20<[[@{siege}+?{modif|0}]] \ siege skill roll @{siege} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestSiege' value='/em @{MYNAME} rolls Siege. \n/roll 1d20+[[{{@{siege}+?{modif|0},0}>21}*(@{siege}+?{modif|0}-20) + 0]]<[[@{siege}+?{modif|0}]] \ siege skill roll @{siege} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Horsemanship</label>
 			<input style='display:inline;' type="number" name="attr_hor" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-hor' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestHor' value='/em @{MYNAME} rolls Horsemanship. \n/roll 1d20<[[@{hor}+?{modif|0}]] \ horsemanship skill roll @{hor} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestHor' value='/em @{MYNAME} rolls Horsemanship. \n/roll 1d20+[[{{@{hor}+?{modif|0},0}>21}*(@{hor}+?{modif|0}-20) + 0]]<[[@{hor}+?{modif|0}]] \ horsemanship skill roll @{hor} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Sword</label>
 			<input style='display:inline;' type="number" name="attr_sword" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-sword' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestEpee' value='/em @{MYNAME} attacks with a Sword! \n/roll 1d20<[[@{sword}+?{modif|0}]] \ sword skill roll @{sword} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestEpee' value='/em @{MYNAME} attacks with a Sword! \n/roll 1d20+[[{{@{sword}+?{modif|0},0}>21}*(@{sword}+?{modif|0}-20) + 0]]<[[@{sword}+?{modif|0}]] \ sword skill roll @{sword} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Lance</label>
 			<input style='display:inline;' type="number" name="attr_lance" class="sheet-comp" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-lance' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestLance' value='/em @{MYNAME} charges with a Lance! \n/roll 1d20<[[@{lance}+?{modif|0}]] \ lance skill roll @{lance} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestLance' value='/em @{MYNAME} charges with a Lance! \n/roll 1d20+[[{{@{lance}+?{modif|0},0}>21}*(@{lance}+?{modif|0}-20) + 0]]<[[@{lance}+?{modif|0}]] \ lance skill roll @{lance} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px;'>Spear</label>
 			<input style='display:inline;' type="number" name="attr_spear" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-spear' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestEpieu' value='/em @{MYNAME} attacks with a Spear! \n/roll 1d20<[[@{spear}+?{modif|0}]] \ spear skill roll @{spear} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestEpieu' value='/em @{MYNAME} attacks with a Spear! \n/roll 1d20*[[{{@{spear}+?{modif|0},0}>21}*(@{spear}+?{modif|0}-20) + 0]]<[[@{spear}+?{modif|0}]] \ spear skill roll @{spear} modif. ?{modif|0}'></button>
 			<br />
 			<label style='display:inline-block; width:120px; '>Dagger</label>
 			<input style='display:inline;' type="number" name="attr_dagger" value="0" />
 			<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-dagger' value='1' />
-			<button style='display:inline;' type='roll' name='roll_TestDague' value='/em @{MYNAME} attacks with a Dagger! \n/roll 1d20<[[@{dagger}+?{modif|0}]] \ dagger skill roll @{dagger} modif. ?{modif|0}'></button>
+			<button style='display:inline;' type='roll' name='roll_TestDague' value='/em @{MYNAME} attacks with a Dagger! \n/roll 1d20*[[{{@{dagger}+?{modif|0},0}>21}*(@{dagger}+?{modif|0}-20) + 0]]<[[@{dagger}+?{modif|0}]] \ dagger skill roll @{dagger} modif. ?{modif|0}'></button>
 			<br />
 			<!-- additional skills -->
 			<fieldset class="repeating_comp" style="margin-top:-20px;">
 				<input style='display:inline-block; width:130px; background: transparent; border: none; margin-bottom:5px; text-align:left; font-size:1.2em; font-weight: bold; ' name="attr_CCname" type='text' value="skill name">
 				<input style='display:inline;' type="number" name="attr_CCvalue" class="sheet-comp" value="10" />
 				<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_CB-CCname' value='1' />
-				<button style='display:inline;' type='roll' name='roll_TestCC' value='/em @{MYNAME} tests @{CCname} \n/roll 1d20<[[@{CCvalue}+?{modif|0}]] \ @{CCname} roll @{CCvalue} modif. ?{modif|0}'></button>
+				<button style='display:inline;' type='roll' name='roll_TestCC' value='/em @{MYNAME} tests @{CCname} \n/roll 1d20+[[{{@{CCvalue}+?{modif|0},0}>21}*(@{CCvalue}+?{modif|0}-20) + 0]]<[[@{CCvalue}+?{modif|0}]] \ @{CCname} roll @{CCvalue} modif. ?{modif|0}'></button>
 				<br />
 			</fieldset>
 			<h2 style="margin: 10px;">Armor</h2>
@@ -734,21 +734,21 @@
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName1" />
 					<input style='display:inline;' type="number" name="attr_GCValue1" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB1' value='1' />
-					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName1} skill roll. \n/roll 1d20<[[@{GCValue1}+?{modif|0}]] \ @{GCName1} skill roll @{GCValue1} modif. ?{modif|0}'></button>
+					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName1} skill roll. \n/roll 1d20+[[{{@{GCValue1}+?{modif|0},0}>21}*(@{GCValue1}+?{modif|0}-20) + 0]]<[[@{GCValue1}+?{modif|0}]] \ @{GCName1} skill roll @{GCValue1} modif. ?{modif|0}'></button>
 					<br />
 				</div>
 				<div style="padding-bottom : 3px;">
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName2" />
 					<input style='display:inline; ' type="number" name="attr_GCValue2" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB2' value='1' />
-					<button style='display:inline; ' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName2} skill roll. \n/roll 1d20<[[@{GCValue2}+?{modif|0}]] \ @{GCName2} skill roll @{GCValue2} modif. ?{modif|0}'></button>
+					<button style='display:inline; ' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName2} skill roll. \n/roll 1d20+[[{{@{GCValue2}+?{modif|0},0}>21}*(@{GCValue2}+?{modif|0}-20) + 0]]<[[@{GCValue2}+?{modif|0}]] \ @{GCName2} skill roll @{GCValue2} modif. ?{modif|0}'></button>
 					<br />
 				</div>
 				<div>
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName3" />
 					<input style='display:inline;' type="number" name="attr_GCValue3" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB3' value='1' />
-					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName3} skill roll. \n/roll 1d20<[[@{GCValue3}+?{modif|0}]] \ @{GCName3} skill roll @{GCValue3} modif. ?{modif|0}'></button>
+					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} ( @{GRole} ) is doing a @{GCName3} skill roll. \n/roll 1d20+[[{{@{GCValue3}+?{modif|0},0}>21}*(@{GCValue3}+?{modif|0}-20) + 0]]<[[@{GCValue3}+?{modif|0}]] \ @{GCName3} skill roll @{GCValue3} modif. ?{modif|0}'></button>
 				</div>
 			</div>
 			<textarea style="display:inline-block; width: 225px; height:90px; margin-left:5px; border: 1px solid black; background:transparent;" type="text" name="attr_GN1" /></textarea>
@@ -772,21 +772,21 @@
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName1" />
 					<input style='display:inline;' type="number" name="attr_GCValue1" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB1' value='1' />
-					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName1} skill roll. \n/roll 1d20<[[@{GCValue1}+?{modif|0}]] \ @{GCName1} skill roll @{GCValue1} modif. ?{modif|0}'></button>
+					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName1} skill roll. \n/roll 1d20+[[{{@{GCValue1}+?{modif|0},0}>21}*(@{GCValue1}+?{modif|0}-20) + 0]]<[[@{GCValue1}+?{modif|0}]] \ @{GCName1} skill roll @{GCValue1} modif. ?{modif|0}'></button>
 					<br />
 				</div>
 				<div style="padding-bottom : 3px;">
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName2" />
 					<input style='display:inline; ' type="number" name="attr_GCValue2" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB2' value='1' />
-					<button style='display:inline; ' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName2} skill roll. \n/roll 1d20<[[@{GCValue2}+?{modif|0}]] \ @{GCName2} skill roll @{GCValue2} modif. ?{modif|0}'></button>
+					<button style='display:inline; ' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName2} skill roll. \n/roll 1d20+[[{{@{GCValue2}+?{modif|0},0}>21}*(@{GCValue2}+?{modif|0}-20) + 0]]<[[@{GCValue2}+?{modif|0}]] \ @{GCName2} skill roll @{GCValue2} modif. ?{modif|0}'></button>
 					<br />
 				</div>
 				<div>
 					<input style="display:inline-block; width: 150px; background:transparent; border-bottom: 1px solid black;" type="text" name="attr_GCName3" />
 					<input style='display:inline;' type="number" name="attr_GCValue3" value="0" />
 					<input style='display:inline; margin-left: 10px; margin-right: 10px;' type='checkbox' name='attr_GC-CB3' value='1' />
-					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName3} skill roll. \n/roll 1d20<[[@{GCValue3}+?{modif|0}]] \ @{GCName3} skill roll @{GCValue3} modif. ?{modif|0}'></button>
+					<button style='display:inline;' type='roll' name='roll_TestFOR' value='/em @{GName} is doing a @{GCName3} skill roll. \n/roll 1d20+[[{{@{GCValue3}+?{modif|0},0}>21}*(@{GCValue3}+?{modif|0}-20) + 0]]<[[@{GCValue3}+?{modif|0}]] \ @{GCName3} skill roll @{GCValue3} modif. ?{modif|0}'></button>
 				</div>
 			</div>
 			<textarea style="display:inline-block; width: 225px; height:90px; margin-left:5px; border: 1px solid black; background:transparent;" type="text" name="attr_GN1" /></textarea>