diff --git a/Coriolis/Coriolis.css b/Coriolis/Coriolis.css
index f10de59e7c..7a1d756fc1 100644
--- a/Coriolis/Coriolis.css
+++ b/Coriolis/Coriolis.css
@@ -286,10 +286,10 @@ h5 {
     font-size: 10px;
 }
 fieldset {
-    padding: 0;
-    margin: 0;
-    border: 0;
-    width: 100%;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	width: 100%;
 }
 .repitem table,
 fieldset table {
@@ -447,65 +447,6 @@ fieldset table {
 .sheet-people td:nth-child(5) {
     width: 400px;
 }
-
-/* Roll template ------------------------------------------------------------ */
-.sheet-skill-roll {
-    float: right;
-    padding-left: 20px;
-}
-.sheet-rolltemplate-coriolis table {
-    width: 80%;
-	color: black;
-	font-size: 1em;
-	font-family: sans-serif;
-    font-weight: bold;
-    border: 2px solid #71685e;
-}
-.sheet-rolltemplate-coriolis th {
-	background-image:url("https://i.imgur.com/2KArYMt.gif");
-	background-repeat: no-repeat;
-	color: #ffffff;
-	padding: 2px;
-	border-bottom: 1px solid black;
-	line-height: 1.6em;
-	font-size: 1.2em;
-    font-weight: bold;
-}
-.sheet-rolltemplate-coriolis .sheet-roll {
-    color: #232924;
-}
-.sheet-rolltemplate-coriolis td {
-	padding: 5px;
-	border-bottom: 1px solid #62584d;
-}
-.sheet-rolltemplate-coriolis tr:nth-child(odd) {
-	background-color: #a19a92;
-}
-.sheet-rolltemplate-coriolis tr:nth-child(even) {
-	background-color: #e2ded9;
-}
-.sheet-rolltemplate-coriolis .inlinerollresult {
-	display: inline-block;
-	min-width: 1.5em;
-	text-align: center;
-	border: 0;
-}
-.sheet-rolltemplate-coriolis .sheet-fail td {
-	background-image:url("https://i.imgur.com/VFA3fjP.png"); background-repeat:repeat; /* red */
-    color: #fff;
-}
-.sheet-rolltemplate-coriolis .sheet-success td {
-    background-image:url("https://i.imgur.com/Kwfbfyh.png"); background-repeat:repeat; /* blue */
-    color: #fff;
-}
-.sheet-rolltemplate-coriolis .sheet-great-success td {
-    background-image:url("https://i.imgur.com/fkDjSos.png"); background-repeat:repeat; /* green */
-    color: #fff;
-}
-.sheet-showsize {
-    background-color: red;
-}
-
 .sheet-span-as-input {
     text-align: left;
     min-width: 100px;
@@ -524,7 +465,54 @@ fieldset table {
     background-size: 100% 100%;
     background-repeat: no-repeat;
 }
-/*  *************************   TEST    *************************   */
 .sheet-hidden {
     display:none;
 }
+/* Roll template ------------------------------------------------------------ */
+.sheet-rolltemplate-coriolis table {
+    width: 100%;
+	color: black;
+	font-size: 1em;
+	font-family: sans-serif;
+	font-weight: bold;
+	border: 2px solid #71685e;
+}
+.sheet-rolltemplate-coriolis th {
+	background-image:url("https://i.imgur.com/2KArYMt.gif"); background-repeat: no-repeat;
+	color: #e3e8e4;
+	padding: 2px;
+	border-bottom: 1px solid black;
+	line-height: 1.6em;
+	height: 1.5em;
+	font-size: 1.2em;
+    font-weight: bold;
+}
+.sheet-rolltemplate-coriolis .sheet-roll {
+    color: #232924;
+}
+.sheet-rolltemplate-coriolis .inlinerollresult {
+	display: inline-block;
+	min-width: 2em;
+	text-align: center;
+	border: 0;
+}
+.sheet-rolltemplate-coriolis .sheet-reroll td {
+	background-image:url("https://imgur.com/L2bnHyJ.png"); background-repeat:repeat; /* grey */
+    color: white;
+text-shadow:5px 5px 10px black;
+}
+.sheet-rolltemplate-coriolis .sheet-fail td {
+	background-image:url("https://imgur.com/K9b4WHa.png"); background-repeat:repeat; /* red */
+    color: white;
+text-shadow:5px 5px 10px black;
+}
+.sheet-rolltemplate-coriolis .sheet-success td {
+    background-image:url("https://imgur.com/PKAUZZT.png"); background-repeat:repeat; /* blue */
+    color: white;
+text-shadow:5px 5px 10px black;
+}
+.sheet-rolltemplate-coriolis .sheet-great-success td {
+    background-image:url("https://imgur.com/4LAQCuC.png"); background-repeat:repeat; /* green */
+    color: white;
+text-shadow:5px 5px 10px black;
+}
diff --git a/Coriolis/Coriolis.html b/Coriolis/Coriolis.html
index 6aa238c0c6..f4e64063ea 100644
--- a/Coriolis/Coriolis.html
+++ b/Coriolis/Coriolis.html
@@ -57,7 +57,7 @@
                             <h2 data-i18n="sheet-character-attributes-strength">Strength</h2>
                         </td>
                         <td class="value">
-                            <button type="roll" name="roll_strength" value="&{template:coriolis} {{name=^{sheet-character-attributes-strength}}} {{roll=[[(@{strength} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+                            <button type="roll" name="roll_strength" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-attributes-strength}}} {{roll=[[(@{strength} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
                             <input type="number" name="attr_strength" value="0">
                         </td>
                     </tr>
@@ -66,7 +66,7 @@
                             <h2 data-i18n="sheet-character-attributes-agility">Agility</h2>
                         </td>
                         <td class="value">
-                            <button type="roll" name="roll_agility" value="&{template:coriolis} {{name=^{sheet-character-attributes-agility}}} {{roll=[[(@{agility} + @{modifier-pos} - @{modifier-neg})d6>6]]}}" ></button>
+                            <button type="roll" name="roll_agility" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-attributes-agility}}} {{roll=[[(@{agility} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}" ></button>
                             <input type="number" name="attr_agility" value="0">
                         </td>
                     </tr>
@@ -75,16 +75,16 @@
                             <h2 data-i18n="sheet-character-attributes-wits">Wits</h2>
                         </td>
                         <td class="value">
-                            <button type="roll" name="roll_wits" value="&{template:coriolis} {{name=^{sheet-character-attributes-wits}}} {{roll=[[(@{wits} + @{modifier-pos} - @{modifier-neg})d6>6]]}}" ></button>
+                            <button type="roll" name="roll_wits" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-attributes-wits}}} {{roll=[[(@{wits} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
                             <input type="number" name="attr_wits" value="0">
                         </td>
                     </tr>
-                    <tr class="table-">
+                    <tr>
                         <td>
                             <h2 data-i18n="sheet-character-attributes-empathy">Empathy</h2>
                         </td>
                         <td class="value">
-                            <button type="roll" name="roll_empathy" value="&{template:coriolis} {{name=^{sheet-character-attributes-empathy}}} {{roll=[[(@{empathy} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+                            <button type="roll" name="roll_empathy" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-attributes-empathy}}} {{roll=[[(@{empathy} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
                             <input type="number" name="attr_empathy" value="0">
                         </td>
                     </tr>
@@ -100,9 +100,10 @@
                         <td class="table-invis2">
                             <h2 data-i18n="sheet-character-trauma-hitpoints">Hit Points<BR>(Str + Agi)</h2>
                         </td>
-                        <td class="span-as-input">
+                        <td class="value">
                             <div>
-                             <span name="attr_hitpoints">0</span>
+                             <!--<span name="attr_hitpoints">0</span>-->
+                              <input type="number" name="attr_hitpoints" value="0">
                              </div>
                         </td>
                     </tr>
@@ -142,8 +143,9 @@
                         <td class="table-invis2">
                             <h2 data-i18n="sheet-character-trauma-mindpoints">Mind points<BR>(Wit + Emp)</h2>
                         </td>
-                        <td class="span-as-input">
-                            <span name="attr_mindpoints">0</span>
+                        <td class="value">
+                            <!--<span name="attr_mindpoints">0</span>-->
+                          <input type="number" name="attr_mindpoints" value="0">
                         </td>
                     </tr>
                     <tr>
@@ -369,7 +371,7 @@
                             <h1 data-i18n="sheet-character-skills">Skills</h1>
                     	</td>
                         <td>
-                            <h4 data-i18n="sheet-character-skills-general">General</h4>
+                            <h4 data-i18n="sheet-character-skills-general" style="text-align:right">General</h4>
                         </td>
                         <td colspan="2">
                             <h4  data-i18n="sheet-character-skills-advanced" style="text-align:right">Advanced</h4>
@@ -377,17 +379,17 @@
                 	</tr>
                     <tr class="bb">
 						<td>
-							<h2 data-i18n="sheet-character-skills-dexterity">Dexterity (Agi)</h2>
+							<h2 data-i18n="sheet-character-skills-dexterity">Dexterity (Agi)</h2> <!-- Test -->
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_dexterity" value="&{template:coriolis} {{name=^{sheet-character-skills-dexterity}}} {{roll=[[(@{agility} + @{dexterity} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_dexterity" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-dexterity}}} {{roll=[[(@{agility} + @{dexterity} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{agility} + @{dexterity} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_dexterity" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-command">Command (Emp)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_command" value="&{template:coriolis} {{name=^{sheet-character-skills-command}}} {{advanced=[[@{command}>0]]}} {{roll=[[(@{empathy} + @{command} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_command" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-command}}} {{advanced-skill=[[@{command}>0]]}} {{roll=[[(@{empathy} + @{command} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{empathy} + @{command} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_command" value="0">
 						</td>
 					</tr>
@@ -396,14 +398,14 @@
 							<h2 data-i18n="sheet-character-skills-force">Force (Str)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_force" value="&{template:coriolis} {{name=^{sheet-character-skills-force}}} {{roll=[[(@{strength} + @{force} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_force" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-force}}} {{roll=[[(@{strength} + @{force} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{force} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_force" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-culture">Culture (Emp)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_culture" value="&{template:coriolis} {{name=^{sheet-character-skills-culture}}} {{advanced=[[@{culture}>0]]}} {{roll=[[(@{empathy} + @{culture} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_culture" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-culture}}} {{advanced-skill=[[@{culture}>0]]}} {{roll=[[(@{empathy} + @{culture} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{empathy} + @{culture} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_culture" value="0">
 						</td>
 					</tr>
@@ -412,14 +414,14 @@
 							<h2 data-i18n="sheet-character-skills-infiltration">Infiltration (Agi)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_infiltration" value="&{template:coriolis} {{name=^{sheet-character-skills-infiltration}}} {{roll=[[(@{agility} + @{infiltration} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_infiltration" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-infiltration}}} {{roll=[[(@{agility} + @{infiltration} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{agility} + @{infiltration} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_infiltration" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-datadjinn">Data Djinn (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_datadjinn" value="&{template:coriolis} {{name=^{sheet-character-skills-datadjinn}}} {{advanced=[[@{datadjinn}>0]]}} {{roll=[[(@{wits} + @{datadjinn} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_datadjinn" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-datadjinn}}} {{advanced-skill=[[@{datadjinn}>0]]}} {{roll=[[(@{wits} + @{datadjinn} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{wits} + @{datadjinn} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_datadjinn" value="0">
 						</td>
 					</tr>
@@ -428,14 +430,14 @@
 							<h2 data-i18n="sheet-character-skills-manipulation">Manipulation (Emp)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_manipulation" value="&{template:coriolis} {{name=^{sheet-character-skills-manipulation}}} {{roll=[[(@{empathy} + @{manipulation} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_manipulation" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-manipulation}}} {{roll=[[(@{empathy} + @{manipulation} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{empathy} + @{manipulation} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_manipulation" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-medicurgy">Medicurgy (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_medicurgy" value="&{template:coriolis} {{name=^{sheet-character-skills-medicurgy}}} {{advanced=[[@{medicurgy}>0]]}} {{roll=[[(@{wits} + @{medicurgy} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_medicurgy" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-medicurgy}}} {{advanced-skill=[[@{medicurgy}>0]]}} {{roll=[[(@{wits} + @{medicurgy} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{wits} + @{medicurgy} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_medicurgy" value="0">
 						</td>
 					</tr>
@@ -444,14 +446,14 @@
 							<h2 data-i18n="sheet-character-skills-meleecombat">Melee Combat (Str)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_melee-combat" value="&{template:coriolis} {{name=^{sheet-character-skills-meleecombat}}} {{roll=[[(@{strength} + @{melee-combat} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_melee-combat" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-meleecombat}}} {{roll=[[(@{strength} + @{melee-combat} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{strength} + @{melee-combat} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_melee-combat" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-mysticpowers">Mystic Powers (Emp)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_mystic-powers" value="&{template:coriolis} {{name=^{sheet-character-skills-mysticpowers}}} {{advanced=[[@{mystic-powers}>0]]}} {{roll=[[(@{empathy} + @{mystic-powers} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_mystic-powers" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-mysticpowers}}} {{advanced-skill=[[@{mystic-powers}>0]]}} {{roll=[[(@{empathy} + @{mystic-powers} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{empathy} + @{mystic-powers} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_mystic-powers" value="0">
 						</td>
 					</tr>
@@ -460,14 +462,14 @@
 							<h2 data-i18n="sheet-character-skills-observation">Observation (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_observation" value="&{template:coriolis} {{name=^{sheet-character-skills-observation}}} {{roll=[[(@{wits} + @{observation} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_observation" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-observation}}} {{roll=[[(@{wits} + @{observation} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[@{wits} + @{observation} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_observation" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-pilot">Pilot (Agi)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_pilot" value="&{template:coriolis} {{name=^{sheet-character-skills-pilot}}} {{advanced=[[@{pilot}>0]]}} {{roll=[[(@{agility} + @{pilot} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_pilot" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-pilot}}} {{advanced-skill=[[@{pilot}>0]]}} {{roll=[[(@{agility} + @{pilot} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{agility} + @{pilot} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_pilot" value="0">
 						</td>
 					</tr>
@@ -476,14 +478,14 @@
 							<h2 data-i18n="sheet-character-skills-rangedcombat">Ranged Combat (Agi)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_ranged-combat" value="&{template:coriolis} {{name=^{sheet-character-skills-rangedcombat}}} {{roll=[[(@{agility} + @{ranged-combat} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_ranged-combat" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-rangedcombat}}} {{roll=[[(@{agility} + @{ranged-combat} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{agility} + @{ranged-combat} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_ranged-combat" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-science">Science (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_science" value="&{template:coriolis} {{name=^{sheet-character-skills-science}}} {{advanced=[[@{science}>0]]}} {{roll=[[(@{wits} + @{science} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_science" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-science}}} {{advanced-skill=[[@{science}>0]]}} {{roll=[[(@{wits} + @{science} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{wits} + @{science} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_science" value="0">
 						</td>
 					</tr>
@@ -492,14 +494,14 @@
 							<h2 data-i18n="sheet-character-skills-survival">Survival (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_survival" value="&{template:coriolis} {{name=^{sheet-character-skills-survival}}} {{roll=[[(@{wits} + @{survival} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_survival" value="&{template:coriolis} {{isNotAdvanced=1}} {{name=^{sheet-character-skills-survival}}} {{roll=[[(@{wits} + @{survival} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{wits} + @{survival} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_survival" value="0">
 						</td>
 						<td>
 							<h2 data-i18n="sheet-character-skills-technology">Technology (Wit)</h2>
 						</td>
 						<td class="value">
-							<button type="roll" name="roll_technology" value="&{template:coriolis} {{name=^{sheet-character-skills-technology}}} {{advanced=[[@{technology}>0]]}} {{roll=[[(@{wits} + @{technology} + @{modifier-pos} - @{modifier-neg})d6>6]]}}"></button>
+							<button type="roll" name="roll_technology" value="&{template:coriolis} {{isAdvanced=1}} {{name=^{sheet-character-skills-technology}}} {{advanced-skill=[[@{technology}>0]]}} {{roll=[[(@{wits} + @{technology} + @{modifier-pos} - @{modifier-neg})d6>6]]}} {{pool=[[(@{wits} + @{technology} + @{modifier-pos} - @{modifier-neg})>0]]}} {{reroll=[[2d6>6]]}}"></button>
 							<input type="number" name="attr_technology" value="0">
 						</td>
 					</tr>
@@ -1185,37 +1187,106 @@
     </table>
 </div>
 
-<!--    *************************   Hidden  *************************   -->
+<!--    *************************   Hidden test  *************************   -->
 <div class="scripts">
-    <rolltemplate class="sheet-rolltemplate-coriolis">
-        <table class="sheet-skill-roll">
-    		<tr><th>{{name}}</th></tr>
+  <rolltemplate class="sheet-rolltemplate-coriolis">
+    <table class="sheet-skill-roll">
+    	<tr>
+			<th>
+				{{name}}
+			</th>
+		</tr>
 
-            {{#rollTotal() advanced 0}}
-            <tr class="sheet-fail">
-                <td style="padding-left: 20px" data-i18n="rolltemplate-autofail">Missing skill point in advanced skill. Automatic fail.</td>
-            </tr>
-            {{/rollTotal() advanced 0}}
+	    {{#isNotAdvanced}}
+	        {{#rollLess() pool 1}}
+        		<tr class="sheet-reroll">
+        		    <td><span data-i18n="rolltemplate-dice-pool">Dice pool is 0 or less.<br> Rolling 2d6 instead.</span></td>
+        		</tr>
 
-            {{#rollLess() roll 1}}
-    		<tr class="sheet-fail">
-    			<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-fail">Failure.</span></td>
-    		</tr>
-            {{/rollLess() roll 1}}
+            	{{#rollLess() reroll 2}}
+        			<tr class="sheet-fail">
+        				<td><span class="sheet-roll">{{reroll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-fail">Failure.</span></td>
+        			</tr>
+        		{{/rollLess() reroll 2}}
 
-            {{#rollBetween() roll 1 2}}
-    		<tr class="sheet-success">
-    			<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-limitedsuccess">Limited Success.</span></td>
-    		</tr>
-            {{/rollBetween() roll 1 2}}
+        		{{#rollGreater() reroll 1}}
+        				<tr class="sheet-great-success">
+        				<td><span class="sheet-roll">{{reroll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-limitedsuccess">Limited Success.</span></td>
+        				</tr>
+        		{{/rollGreater() reroll 1}}
+    	    {{/rollLess() pool 1}}
 
-            {{#rollGreater() roll 2}}
-    		<tr class="sheet-great-success">
-    			<td><span class="sheet-roll">{{roll}}</span><span  style="padding-left: 20px" data-i18n="rolltemplate-criticalsuccess">Critical Success.</span></td>
-    		</tr>
-            {{/rollGreater() roll 2}}
-        </table>
-    </rolltemplate>
+    	    {{#rollGreater() pool 0}}
+        		{{#rollLess() roll 1}}
+        				<tr class="sheet-fail">
+        					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-fail">Failure.</span></td>
+        				</tr>
+        	    {{/rollLess() roll 1}}
+
+        	    {{#rollBetween() roll 1 2}}
+        				<tr class="sheet-success">
+        					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-limitedsuccess">Limited Success.</span></td>
+        				</tr>
+        	    {{/rollBetween() roll 1 2}}
+
+        	    {{#rollGreater() roll 2}}
+        				<tr class="sheet-great-success">
+        					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-criticalsuccess">Critical Success.</span></td>
+        				</tr>
+        	    {{/rollGreater() roll 2}}
+    		{{/rollGreater() pool 0}}
+	    {{/isNotAdvanced}}
+
+	    {{#isAdvanced}}
+    		{{#rollLess() advanced-skill 1}}
+              <tr class="sheet-reroll">
+                  <td data-i18n="rolltemplate-autofail">Missing skill point in advanced skill. Automatic fail.</td>
+              </tr>
+            {{/rollLess() advanced-skill 1}}
+
+            {{#rollGreater() advanced-skill 0}}
+                {{#rollLess() pool 1}}
+            		<tr class="sheet-reroll">
+            		    <td><span data-i18n="rolltemplate-dice-pool">Dice pool is 0 or less.<br> Rolling 2d6 instead.</span></td>
+            		</tr>
+
+                	{{#rollLess() reroll 2}}
+            			<tr class="sheet-fail">
+            				<td><span class="sheet-roll">{{reroll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-fail">Failure.</span></td>
+            			</tr>
+            		{{/rollLess() reroll 2}}
+
+            		{{#rollGreater() reroll 1}}
+            				<tr class="sheet-great-success">
+            				<td><span class="sheet-roll">{{reroll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-limitedsuccess">Limited Success.</span></td>
+            				</tr>
+            		{{/rollGreater() reroll 1}}
+        	    {{/rollLess() pool 1}}
+
+        	    {{#rollGreater() pool 0}}
+            		{{#rollLess() roll 1}}
+            				<tr class="sheet-fail">
+            					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-fail">Failure.</span></td>
+            				</tr>
+            	    {{/rollLess() roll 1}}
+
+            	    {{#rollBetween() roll 1 2}}
+            				<tr class="sheet-success">
+            					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-limitedsuccess">Limited Success.</span></td>
+            				</tr>
+            	    {{/rollBetween() roll 1 2}}
+
+            	    {{#rollGreater() roll 2}}
+            				<tr class="sheet-great-success">
+            					<td><span class="sheet-roll">{{roll}}</span><span style="padding-left: 20px" data-i18n="rolltemplate-criticalsuccess">Critical Success.</span></td>
+            				</tr>
+            	    {{/rollGreater() roll 2}}
+        		{{/rollGreater() pool 0}}
+            {{/rollGreater() advanced-skill 0}}
+        {{/isAdvanced}}
+
+    </table>
+  </rolltemplate>
 </div>
 
 <!--    *************************   WORKERS  *************************   -->
diff --git a/Coriolis/sheet.json b/Coriolis/sheet.json
index 4702dd3794..ecc75ee9f7 100644
--- a/Coriolis/sheet.json
+++ b/Coriolis/sheet.json
@@ -4,5 +4,5 @@
 	"authors": "Original Sheet by Frej Berggren, Anders Antila and Alexander Wilson. Updated (Oct'17) by Nicolaj G.",
 	"preview": "coriolis_preview_updated.png",
 	"roll20userid": "2112900,14762",
-	"instructions": "This sheet is for the Swedish RPG Coriolis (2016 edition). All credits go to Fria Ligan who made the game and some of the assets in the sheet. Please visit Frialigan.se for more Coriolis stuff! Enjoy!\n Updated Oct'17 by Nicolaj G. \n To mark permanent radiation click right above the corresponding checkbox! \n Open a sheet in the game to update the sheet to v. 2.0. Fields/Items/Attributes not updated are because of missing assignments/attributes in the original sheet. \n Changelog: \n* Changed most of the underlying code \n* Added missing Character and Spaceship pages, and fields missing from the current pages \n* Added markers for permanent radiation (click right above the checkbox) \n* Added Manual modifier input for rolls \n* Changed general layout and improved some graphics to be more similar to the book \n* Sorted the Skills-list to be like the book \n* Sorted the Spaceship Weaponsystem Columns \n* Fixed a couple of typos \n* Changed all text to be English per default"
+	"instructions": "This sheet is for the Swedish RPG Coriolis (2016 edition). All credits go to Fria Ligan who made the game and some of the assets in the sheet. Please visit Frialigan.se for more Coriolis stuff! Enjoy!\n Updated Oct'17 by Nicolaj G. \n To mark permanent radiation click right above the corresponding checkbox! \n Open a sheet in the game to update the sheet to v. 2.0. Fields/Items/Attributes not updated are because of missing assignments/attributes in the original sheet. \n \n Changelog (15-10-2017): \n* Added Rerolls for Dicepools with 0 or less dice. \n Changelog (09-10-2017): \n* Changed most of the underlying code \n* Added missing Character and Spaceship pages, and fields missing from the current pages \n* Added markers for permanent radiation (click right above the checkbox) \n* Added Manual modifier input for rolls \n* Changed general layout and improved some graphics to be more similar to the book \n* Sorted the Skills-list to be like the book \n* Sorted the Spaceship Weaponsystem Columns \n* Fixed a couple of typos \n* Changed all text to be English per default"
 }
diff --git a/Coriolis/translation.json b/Coriolis/translation.json
index e54ef0a532..3f06ab3ba7 100644
--- a/Coriolis/translation.json
+++ b/Coriolis/translation.json
@@ -116,6 +116,9 @@
 	"sheet-spaceshipnotes-log-notes": "Notes",
 	"sheet-spaceshipnotes-cargo": "Cargo and Gear",
 	"rolltemplate-autofail": "Missing skill point in advanced skill. Automatic fail.",
+	"rolltemplate-dice-pool": "Dice pool is 0 or less.<br> Rolling 2d6 instead.",
+	"rolltemplate-difficult-fail": "Difficult Roll Failure.",
+	"rolltemplate-difficult-success": "Difficult Roll Success.",
 	"rolltemplate-fail": "Failure.",
 	"rolltemplate-limitedsuccess": "Limited Success.",
 	"rolltemplate-criticalsuccess": "Critical Success."