diff --git a/CoeursVaillants-2/CoeursVaillants-2.css b/CoeursVaillants-2/CoeursVaillants-2.css
index 91243eae52..8d7c952565 100644
--- a/CoeursVaillants-2/CoeursVaillants-2.css
+++ b/CoeursVaillants-2/CoeursVaillants-2.css
@@ -1,6 +1,12 @@
 * {
     box-sizing: border-box;
 }
+.charsheet {
+    background-color: white;
+}
+.sheet-darkmode .charsheet {
+    background-color: #202020;
+}
 /* ---- DIV ----- */
 div{
     padding: 0px 0px 0px 0px;
@@ -12,7 +18,6 @@ div{
 div.sheet-main{
     padding: 4px;
     width: 850px;
-    background: white;
     text-align:center;
     font-family: 'Verdana';
     border-width: 1px;
@@ -25,22 +30,30 @@ div.sheet-ligne{
     text-align: left;
     vertical-align: middle;
     margin: 1px 0px 1px 0px;
-    /* border: 1px solid red; */
 }
 div.sheet-mycol{
     display: inline-block;
     vertical-align: top;
-    /* border: 1px solid blue; */
 }
 div.sheet-mycolbrd{
     display: inline-block;
     vertical-align: top;
-    /* border-right: 1px solid black; */
-    /* border-radius: 6px; */
     text-align: center;
     padding: 3px;
     margin-bottom: 3px;
 }
+div.sheet-borderRight {
+    border-right: 1px solid black;
+}
+.sheet-darkmode div.sheet-borderRight {
+    border-right: 1px solid white;
+}
+div.sheet-borderBottom {
+    border-bottom: 1px solid black;
+}
+.sheet-darkmode div.sheet-borderBottom {
+    border-bottom: 1px solid white;
+}
 div.sheet-libeldesc{
     color: black;
     display: block;
@@ -49,6 +62,9 @@ div.sheet-libeldesc{
 	vertical-align: middle;
 	margin-bottom: 1px;
 }
+.sheet-darkmode div.sheet-libeldesc{
+    color: white;
+}
 div.sheet-libel1{
     color: black;
     display: inline-block;
@@ -60,6 +76,9 @@ div.sheet-libel1{
     text-transform: uppercase;
 	margin-bottom: 4px;
 }
+.sheet-darkmode div.sheet-libel1{
+    color: white;
+}
 div.sheet-libel2{
     color: black;
     display: inline-block;
@@ -71,6 +90,9 @@ div.sheet-libel2{
     text-transform: uppercase;
 	margin-bottom: 4px;
 }
+.sheet-darkmode div.sheet-libel2{
+    color: white;
+}
 div.sheet-libel3{
     color: black;
     display: inline-block;
@@ -82,10 +104,20 @@ div.sheet-libel3{
     text-transform: uppercase;
 	margin-bottom: 2px;
 }
-
+.sheet-darkmode div.sheet-libel3{
+    color: white;
+}
 /* --------------------- */
 /* --------FORMS-------- */
 /* --------------------- */
+select {
+    color: black;
+    background-color: WhiteSmoke;
+}
+.sheet-darkmode select {
+    color: white;
+    background-color: #383838;
+}
 select.sheet-short {
     width: 80px;
 }
@@ -97,10 +129,15 @@ input{
     padding: 0;
     margin: 0;
     color: black;
+    background-color: WhiteSmoke;
     font-family: cursive;
     font-weight: normal;
     border-radius: 0px;
 }
+.sheet-darkmode input {
+    color: white;
+    background-color: #383838;
+}
 input[type="text"]{
     padding: 0px 0px 1px 2px;
     border-width: 0px 0px 1px 0px;
@@ -111,7 +148,7 @@ input[type="text"].sheet-biginp{
     /* font-weight: bold; */
 }
 input[type="number"]{
-    text-align: right;
+    text-align: center;
     border-width: 0px 1px 1px 0px;
     border-style: solid;
 }
@@ -124,10 +161,8 @@ input[type="number"].sheet-inpnum2c{
 input[type="number"].sheet-inpnum2cbig{
     width: 35px;
     font-size: 140%;
-	/* margin-bottom: 4px; */
 }
 input[type="number"].sheet-inpnum2cboxed{
-    /* border: 1px solid black; */
     width: 35px;
 }
 input.sheet-long {
@@ -144,9 +179,17 @@ input.sheet-extrashort {
 	width: 40px;
 }
 textarea {
-    resize:none;
+    resize: none;
+    box-sizing: border-box;
+    margin: 0px;
     font-weight: normal;
 	font-family: cursive;
+    color: black;
+    background-color: WhiteSmoke;
+}
+.sheet-darkmode textarea {
+    color: white;
+    background-color: #383838;
 }
 textarea.sheet-text2col {
     width: 400px;
@@ -157,6 +200,12 @@ textarea.sheet-text3col {
 /* --------------------- */
 /* --------TEXT--------- */
 /* --------------------- */
+.sheet-infoDesc {
+    color: black;
+}
+.sheet-darkmode .sheet-infoDesc {
+    color: white;
+}
 label.sheet-avent2 {
     font-size:10px;
     margin-top:0px;
@@ -165,113 +214,146 @@ label.sheet-avent2 {
 /* --------------------- */
 /* -------BOUTONS------- */
 /* --------------------- */
-/* .sheet-btRoll4 { */
-    /* color: #500000; */
-    /* background: none; */
-    /* border: none; */
-    /* font-weight: bolder; */
-/* } */
-/* .ui-dialog .charsheet button[type=roll]:before { */
-    /* content: ""; */
-/* } */
-button[type=roll].sheet-btRoll20,
-button[type=roll].sheet-btRoll20deminiv,
-button[type=roll].sheet-btRoll20niv,
-button[type=roll].sheet-btRoll4,
-button[type=roll].sheet-btRoll8,
-button[type=roll].sheet-btRoll8Big,
-button[type=roll].sheet-btDesc,
-button[type=roll].sheet-btLien{
+.repcontrol .btn {
+    color: #383838;
+    background: WhiteSmoke;
+	display: inline-block;
+    text-shadow: none;
+    box-shadow: none;
+}
+.sheet-darkmode .repcontrol .btn {
+    color: WhiteSmoke;
+    background: #383838;
+}
+
+.ui-dialog button[type=roll].sheet-btRoll20,
+.ui-dialog button[type=roll].sheet-btRoll20deminiv,
+.ui-dialog button[type=roll].sheet-btRoll20niv,
+.ui-dialog button[type=roll].sheet-btRoll4,
+.ui-dialog button[type=roll].sheet-btRoll8,
+.ui-dialog button[type=roll].sheet-btRoll8Big,
+.ui-dialog button[type=roll].sheet-btDesc,
+.ui-dialog button[type=roll].sheet-btLien{
     color: black;
     padding: 0;
     margin: 0;
     border:none;
     background:none;
     opacity: 0.6;
+    box-shadow: none;
+    text-shadow: none;
 }
-button[type=roll]:hover{
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20deminiv,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20niv,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll4,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll8,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll8Big,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btDesc,
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btLien{
+    color: white;
+}
+.ui-dialog button[type=roll]:hover{
    opacity: 1.0;
 }
-button[type=roll].sheet-btRoll20 {
+.ui-dialog button[type=roll].sheet-btRoll20 {
     height: 1.3em;
     width: 1.3em;
     line-height: 1.3em;
 }
-button[type=roll].sheet-btRoll20:before {
+.ui-dialog button[type=roll].sheet-btRoll20:before {
     font-size: 1.3em;
+    content: "T";
 }
-button[type=roll].sheet-btRoll20deminiv{
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20:before {
+    content: "t";
+}
+.ui-dialog button[type=roll].sheet-btRoll20deminiv{
     height: 1.5em;
     width: 1.5em;
     line-height: 1.5em;
 }
-button[type=roll].sheet-btRoll20deminiv:before {
+.ui-dialog button[type=roll].sheet-btRoll20deminiv:before {
     font-size: 1.5em;
+    content: "t";
 }
-button[type=roll].sheet-btRoll20niv{
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20deminiv:before {
+    content: "T";
+}
+.ui-dialog button[type=roll].sheet-btRoll20niv{
     height: 1.5em;
     width: 1.5em;
     line-height: 1.5em;
-	/* color: white; */
-	/* background-color: black; */
 }
-button[type=roll].sheet-btRoll20niv:before {
+.ui-dialog button[type=roll].sheet-btRoll20niv:before {
     font-size: 1.5em;
-	content: "T" !important;
+	content: "T";
 }
-button[type=roll].sheet-btRoll4 {
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll20niv:before {
+	content: "t";
+}
+.ui-dialog button[type=roll].sheet-btRoll4 {
     height: 1.4em;
     width: 1.4em;
     line-height: 1.4em;
 }
-button[type=roll].sheet-btRoll4:before {
+.ui-dialog button[type=roll].sheet-btRoll4:before {
     font-size: 1.4em;
-	font-family: dicefontd4 !important;
-	content: "D" !important;
+	font-family: dicefontd4;
+	content: "D";
 }
-button[type=roll].sheet-btRoll8 {
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll4:before {
+	content: "d";
+}
+.ui-dialog button[type=roll].sheet-btRoll8 {
     height: 1.4em;
     width: 1.4em;
     line-height: 1.4em;
 }
-button[type=roll].sheet-btRoll8:before {
+.ui-dialog button[type=roll].sheet-btRoll8:before {
     font-size: 1.4em;
-	font-family: dicefontd8 !important;
-	content: "H" !important;
+	font-family: dicefontd8;
+	content: "H";
 }
-button[type=roll].sheet-btRoll8Big {
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll8:before {
+	content: "h";
+}
+.ui-dialog button[type=roll].sheet-btRoll8Big {
     height: 2em;
     width: 2em;
     line-height: 2em;
 }
-button[type=roll].sheet-btRoll8Big:before {
+.ui-dialog button[type=roll].sheet-btRoll8Big:before {
     font-size: 2em;
-	font-family: dicefontd8 !important;
-	content: "H" !important;
+	font-family: dicefontd8;
+	content: "H";
 }
-button[type=roll].sheet-btDesc{
+.sheet-darkmode .ui-dialog button[type=roll].sheet-btRoll8Big:before {
+	content: "h";
+}
+.ui-dialog button[type=roll].sheet-btDesc{
     color: black;
     height: 18px;
     width: 18px;
     line-height: 16px;
     opacity: 0.4;
 }
-button[type=roll].sheet-btDesc:before{
+.ui-dialog button[type=roll].sheet-btDesc:before{
     font-family: "Pictos";
     font-size: 1.0em;
     content: 'i';
 }
-button[type=roll].sheet-btDesc:hover{
+.ui-dialog button[type=roll].sheet-btDesc:hover{
     opacity: 1.0;
 }
-button[type=roll].sheet-btLien:before{
+.ui-dialog button[type=roll].sheet-btLien:before{
     font-family: "Pictos";
     font-size: 0.9em;
     content: 'G';
     width: 1em;
     vertical-align: top;
 }
-button[type=roll].sheet-btLien:hover{
+.ui-dialog button[type=roll].sheet-btLien:hover{
     opacity: 1.0;
 }
 
@@ -287,65 +369,100 @@ input.sheet-block_switch:checked ~ div.sheet-block_a {
 input.sheet-block_switch:checked ~ div.sheet-block_b {
     display: inline;
 }
-input.sheet-block_switch:not(:checked) ~ span:after {
-    content:" PNJ";
-}
-input.sheet-block_switch:checked ~ span:after {
-    content:" PNJ";
-}
 
 /* --------------------- */
 /* ----- TEMPLATES ----- */
 /* --------------------- */
 .sheet-rolltemplate-jet div {
+    color: black;
+    text-align: left;
+    font-size: 110%;
+    font-weight: normal;
+	margin-bottom: 2px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+    padding-left: 10px;
+}
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet div {
+    color: white;
+}
+
+.sheet-rolltemplate-jet div.sheet-template-main {
     background: palegoldenrod;
     border: 1px solid black;
     border-radius: 10px;
     padding: 5px;
     width: 100%;
 }
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet div.sheet-template-main {
+    background: darkred;
+    border: 1px solid white;
+}
 
-.sheet-rolltemplate-jet div > h3{
-    color: black;
+.sheet-rolltemplate-jet .sheet-template-charName {
     text-align: center;
     margin-bottom: 2px;
-    font-size: 130%;
+    font-size: 120%;
     font-weight: bold;
 }
 
-.sheet-rolltemplate-jet div > h4{
-    color: firebrick;
+.sheet-rolltemplate-jet .sheet-template-title {
+    color: darkred;
     text-align: center;
     margin-bottom: 5px;
-    font-size: 120%;
+    font-size: 110%;
     font-weight: bold;
 }
-
-.sheet-rolltemplate-jet div > h5{
-    text-align: center;
-    font-size: 120%;
-    font-weight: bold;
-	margin-bottom: 5px;
-	padding-top: 3px;
-	padding-bottom: 3px;
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .sheet-template-title {
+    color: palegoldenrod;
 }
 
-.sheet-rolltemplate-jet div > h6{
-    text-align: left;
-    font-size: 120%;
-    font-weight: bold;
-	margin-bottom: 5px;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-left: 10px;
-}
-
-.sheet-rolltemplate-jet div > div{
-    border: none;
-    padding: 0px;
+.sheet-rolltemplate-jet .sheet-template-rollDesc {
 	margin-bottom: 2px;
 	padding-top: 3px;
 	padding-bottom: 3px;
 	padding-left: 5px;
-    font-weight: bold;
-}
\ No newline at end of file
+    font-size: 90%;
+    font-weight: normal;
+    font-style: italic;
+}
+
+.sheet-rolltemplate-jet .sheet-template-success {
+    color: green;
+}
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .sheet-template-success {
+    color: greenyellow;
+}
+.sheet-rolltemplate-jet .sheet-template-failure {
+    color: red;
+}
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .sheet-template-failure {
+    color: pink;
+}
+
+.sheet-rolltemplate-jet .inlinerollresult,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .inlinerollresult {
+	display: inline-block;
+    text-align: center;
+    background: none;
+    padding: 1px;
+    border: none;
+	min-width: 1em;
+}
+
+.sheet-rolltemplate-jet .sheet-noCrit .inlinerollresult.fullcrit,
+.sheet-rolltemplate-jet .sheet-noCrit .inlinerollresult.fullfail,
+.sheet-rolltemplate-jet .inlinerollresult.importantroll {
+    border: none;
+}
+
+.sheet-rolltemplate-jet .sheet-enableCrit .inlinerollresult.fullcrit,
+.sheet-rolltemplate-jet .sheet-enableCrit .inlinerollresult.fullfail {
+    border-style: none none solid none;
+    border-color: darkred;
+    font-style: italic;
+}
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .sheet-enableCrit .inlinerollresult.fullcrit,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-jet .sheet-enableCrit .inlinerollresult.fullfail {
+    border-color: palegoldenrod;
+}
diff --git a/CoeursVaillants-2/CoeursVaillants-2.html b/CoeursVaillants-2/CoeursVaillants-2.html
index 9d3582f2d0..1a2354532e 100644
--- a/CoeursVaillants-2/CoeursVaillants-2.html
+++ b/CoeursVaillants-2/CoeursVaillants-2.html
@@ -1,11 +1,11 @@
-<input type="checkbox" name="attr_switch" class="sheet-block_switch" value="1"><span></span>
+<input type="checkbox" name="attr_switch" class="sheet-block_switch" value="1"><div class="sheet-infoDesc">PNJ</div>
 
 <div class="sheet-main sheet-block_a">
-	<div class="sheet-ligne" style="border-bottom: 1px solid black;">
+	<div class="sheet-ligne sheet-borderBottom">
 		<div class="sheet-ligne" style="text-align: center;">
 			<img title="Version 2.0 - 02/07/2022" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/CoeursVaillants-2/images/Logo.png" width="30%" />
 		</div>
-		<div class="sheet-mycolbrd" style="width: 71%; border-right: 1px solid black;"> <!-- CADRE INFOS -->
+		<div class="sheet-mycolbrd" style="width: 71%;"> <!-- CADRE INFOS -->
 			<div class="sheet-mycol" style="width: 49%;">
 				<div class="sheet-ligne" style="margin-bottom: 3px;">
 					<div class="sheet-libel2" style="width: 65px;">Nom</div>
@@ -24,11 +24,13 @@
 			</div>
 		</div>
 		<div class="sheet-mycolbrd" style="width: 28%;">  <!-- CADRE NIVEAU -->
-			<div class="sheet-ligne">
-				<div class="sheet-libel2" style="width: 85px">Niveau</div>
-				<input type="number" name="attr_niveau" class='sheet-inpnum2cbig' style="width: 40px;" value='1' min="1" max="7">
-				<div class="sheet-libel1" style="width: 20px; vertical-align: middle;">XP</div>
-				<input type="number" name="attr_xp" class='sheet-inpnum2c' style="width: 40px;" value='0' min="0">
+			<div class="sheet-ligne" style="vertical-align: top; text-align: right;">
+				<div class="sheet-libel2" style="margin-right: 2px;">Niv</div>
+				<input type="number" name="attr_niveau" class='sheet-inpnum2cbig' style="width: 38px; margin-right: 5px;" value='1' min="1" max="7">
+				<div class="sheet-libel1" style="width: 18px; margin-right: 2px;">XP</div>
+				<input type="number" name="attr_xp" class='sheet-inpnum2c' style="width: 38px;" value='0' min="0">
+                <div class="sheet-infoDesc" style="vertical-align: middle; margin: 0px;">/</div>
+                <input type="number" name="attr_xpTotal" class='sheet-inpnum2c' style="width: 45px;" value='0' min="0">
 			</div>
 			<div class="sheet-ligne" style="margin-top: 3px;">
 				<div class="sheet-libeldesc">1XP : relancer avec Avantage</div>
@@ -37,12 +39,12 @@
 			</div>
 		</div>
 	</div>
-	<div class="sheet-ligne">
-		<div class="sheet-mycolbrd" style="width: 25%; height: 270px; text-align: left; border-right: 1px solid black;">  <!-- CADRE CARACS -->
+	<div class="sheet-ligne sheet-borderBottom">
+		<div class="sheet-mycolbrd sheet-borderRight" style="width: 25%; height: 270px; text-align: left;">  <!-- CADRE CARACS -->
 			<div class="sheet-ligne" style="margin-bottom: 8px;">
-				<div>Carac.</div>
-				<button type='roll' name='roll_testfor' title='Tirer une nouvelle série de caracs' class="sheet-btRoll20" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Tirage de Caractéristiques}} {{tSerie1=[[3d6cs0cf0]] [[3d6cs0cf0]] [[3d6cs0cf0]] [[3d6cs0cf0]]}} {{tSerie2=[[3d6cs0cf0]] [[3d6cs0cf0]] [[3d6cs0cf0]] [[3d6cs0cf0]]}} {{tRollDesc=Plus c’est bas mieux c’est !}}'></button>
-				<div style="padding-left: 30px; text-align: right;">½Niv | Niv</div>
+				<div class="sheet-infoDesc">Carac.</div>
+				<button type='roll' name='roll_testfor' title='Tirer une nouvelle série de caracs' class="sheet-btRoll20" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Tirage de Caractéristiques}} {{tSerie1=[[3d6]] [[3d6]] [[3d6]] [[3d6]]}} {{tSerie2=[[3d6]] [[3d6]] [[3d6]] [[3d6]]}} {{tRollDesc=Plus c’est bas mieux c’est !}}'></button>
+				<div class="sheet-infoDesc" style="padding-left: 30px; text-align: right;">½Niv | Niv</div>
 			</div>
 			<div class="sheet-ligne"> <!-- LIGNE VIG -->
 				<div class="sheet-libel2">VIG</div>
@@ -50,32 +52,32 @@
 				<button type='roll' name='roll_testvig' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Vigueur (½Niveau)}} {{carac=[[@{vig}]]}} {{rollResult1=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}} {{rollResult2=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}}'></button>
 				<button type='roll' name='roll_testvig' class="sheet-btRoll20niv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Vigueur (Niveau)}} {{carac=[[@{vig}]]}} {{rollResult1=[[1d20+@{niveau}[Niveau]]]}} {{rollResult2=[[1d20+@{niveau}[Niveau]]]}}'></button>
 			</div>
-			<div style="margin-bottom: 9px; margin-top: -7px;">Vigueur</div>
+			<div class="sheet-infoDesc" style="margin-bottom: 9px; margin-top: -7px;">Vigueur</div>
 			<div class="sheet-ligne"> <!-- LIGNE DEX -->
 				<div class="sheet-libel2">DEX</div>
 				<input type="number" name="attr_dex" class='sheet-inpnum2cbig' style="margin-right: 10px; width: 45px" value='10' min="0" max="20" />
 				<button type='roll' name='roll_testDex' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Dextérité (½Niveau)}} {{carac=[[@{dex}]]}} {{rollResult1=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}} {{rollResult2=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}}'></button>
 				<button type='roll' name='roll_testDex' class="sheet-btRoll20niv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Dextérité (Niveau)}} {{carac=[[@{dex}]]}} {{rollResult1=[[1d20+@{niveau}[Niveau]]]}} {{rollResult2=[[1d20+@{niveau}[Niveau]]]}}'></button>
 			</div>
-			<div style="margin-bottom: 9px; margin-top: -7px;">Dextérité</div>
+			<div class="sheet-infoDesc" style="margin-bottom: 9px; margin-top: -7px;">Dextérité</div>
 			<div class="sheet-ligne"> <!-- LIGNE INT -->
 				<div class="sheet-libel2">INT</div>
 				<input type="number" name="attr_int" class='sheet-inpnum2cbig' style="margin-right: 10px; width: 45px" value='10' min="0" max="20" />
 				<button type='roll' name='roll_testInt' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test d’Intelligence (½Niveau)}} {{carac=[[@{int}]]}} {{rollResult1=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}} {{rollResult2=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}}'></button>
 				<button type='roll' name='roll_testInt' class="sheet-btRoll20niv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test d’Intelligence (Niveau)}} {{carac=[[@{int}]]}} {{rollResult1=[[1d20+@{niveau}[Niveau]]]}} {{rollResult2=[[1d20+@{niveau}[Niveau]]]}}'></button>
 			</div>
-			<div style="margin-bottom: 9px; margin-top: -7px;">Intelligence</div>
+			<div class="sheet-infoDesc" style="margin-bottom: 9px; margin-top: -7px;">Intelligence</div>
 			<div class="sheet-ligne"> <!-- LIGNE CHA -->
 				<div class="sheet-libel2">CHA</div>
 				<input type="number" name="attr_cha" class='sheet-inpnum2cbig' style="margin-right: 10px; width: 45px" value='10' min="0" max="20" />
 				<button type='roll' name='roll_testCha' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Charisme (½Niveau)}} {{carac=[[@{cha}]]}} {{rollResult1=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}} {{rollResult2=[[1d20+[[floor(@{niveau}/2)]][Demi-niveau]]]}}'></button>
 				<button type='roll' name='roll_testCha' class="sheet-btRoll20niv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Test de Charisme (Niveau)}} {{carac=[[@{cha}]]}} {{rollResult1=[[1d20+@{niveau}[Niveau]]]}} {{rollResult2=[[1d20+@{niveau}[Niveau]]]}}'></button>
 			</div>
-			<div style="margin-bottom: 5px; margin-top: -7px;">Charisme</div>
+			<div class="sheet-infoDesc" style="margin-bottom: 5px; margin-top: -7px;">Charisme</div>
 		</div>
 		<div class="sheet-mycol" style="width: 74%;">
-			<div class="sheet-ligne">
-				<div class="sheet-mycolbrd" style="width: 220px;">  <!-- CADRE DEF -->
+			<div class="sheet-ligne sheet-borderBottom">
+				<div class="sheet-mycolbrd sheet-borderRight" style="width: 220px;">  <!-- CADRE DEF -->
 					<div class="sheet-ligne" style="text-align: left;">
 						<div class="sheet-libel3" style="width: 80px; margin-left: 70px; margin-bottom: 3px;">Défense</div>
 					</div>
@@ -92,21 +94,27 @@
 						</div>
 						<input type="number" name="attr_ca" class='sheet-inpnum2cbig' style="width: 45px; margin-left: 15px; margin-top: 5px;" value='10' min="0" max="40" />
 					</div>
+					<div class="sheet-ligne" style="text-align: right; margin-bottom: -4px;">
+						<div class="sheet-infoDesc" style="margin-right: 20px;">½Niv | Niv</div>
+					</div>
 					<div class="sheet-ligne" style="margin-bottom: 5px;">
-						<div style="margin-left: 130px; text-align: right;">½Niv | Niv</div>
-						<div class="sheet-libel1" style="width: 90px; text-align: right;">Seuil de mouvement</div>
+						<div class="sheet-libel1" style="width: 90px; text-align: right; margin-right: 2px;">Seuil de mouvement</div>
 						<input type="number" name="attr_mouvement" class='sheet-inpnum2c' style="width: 35px;" value='10' />
 						<button type='roll' name='roll_testMan' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Jet de Mouvement}} {{carac=[[@{mouvement}]]}} {{rollResult1=[[1d20+[[floor(@{niveau}/2)]]]]}}'></button>
 						<button type='roll' name='roll_testMan' class="sheet-btRoll20niv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Jet de Mouvement}} {{carac=[[@{mouvement}]]}} {{rollResult1=[[1d20+@{niveau}]]}}'></button>
 					</div>
 				</div>
-				<div class="sheet-mycolbrd" style="width: 215px; border-left: 1px solid black; border-right: 1px solid black;"> <!-- CADRE PV -->
+				<div class="sheet-mycolbrd sheet-borderRight" style="width: 215px;"> <!-- CADRE PV -->
 					<div class="sheet-ligne" style="text-align: center;">
-						<div class="sheet-libel3" style="width: 190px; margin-bottom: 5px;">Points de Vie</div>
+						<div class="sheet-libel3" style="width: 190px;">Points de Vie</div>
+					</div>
+					<div class="sheet-ligne" style="text-align: right; margin-top: -5px; margin-bottom: -3px;">
+                        <div class="sheet-infoDesc" style="margin-right: 9px;">Temp.</div><div class="sheet-infoDesc" style="margin-right: 5px;">Aggr.</div>
 					</div>
 					<div class="sheet-ligne" style="text-align: center; margin-bottom: 8px;">
-						<input type="number" name="attr_pv" class='sheet-inpnum2cbig' style="width:45px" value='0'><div class="sheet-libel1" style="width:10px">/</div><input type="number" name="attr_pvmax" class='sheet-inpnum2c' style="width:38px" value='0' />
-						<input type="number" name="attr_pvTemp" class='sheet-inpnum2c' style="width:40px; margin-left: 15px;" value='0' /><div class="sheet-libel1" style="width:35px">temp.</div>
+						<input type="number" name="attr_pv" class='sheet-inpnum2cbig' style="width: 53px" value='0'><div class="sheet-libel1" style="width:10px">/</div><input type="number" name="attr_pvmax" class='sheet-inpnum2c' style="width: 45px; margin-right: 7px;" value='0' />
+						<input type="number" name="attr_pvTemp" class='sheet-inpnum2c' style="width:40px;" value='0'/>
+						<input type="number" name="attr_pvAggr" class='sheet-inpnum2c' style="width:40px;" value='0'/>
 					</div>
 					<div class="sheet-ligne" style="margin-bottom: 5px;">
 						<div class="sheet-libel1" style="width: 100px;">Jet PV max</div>
@@ -126,9 +134,13 @@
 					</div>
 				</div>
 				<div class="sheet-mycolbrd" style="width: 176px;"> <!-- CADRE PA -->
-					<div class="sheet-ligne" style="margin-bottom: 0px">
-						<div class="sheet-libel1" style="width: 120px; text-align: left;">Points d'Aventure</div>
-						<input type="number" name="attr_aventure" class='sheet-inpnum2cbig' style="width: 40px" value='1' min="0">
+					<div class="sheet-ligne" style="margin-bottom: 0px; text-align: center;">
+						<div class="sheet-libel1" style="width: 140px;">Points d'Aventure</div>
+					</div>
+					<div class="sheet-ligne" style="margin-bottom: 0px; text-align: center;">
+						<input type="number" name="attr_aventure" class='sheet-inpnum2cbig' style="width: 40px; margin-right: 0px;" value='1' min="0">
+                        <div class="sheet-libel1" style="width: 5px; margin: 0px;">/</div>
+                        <input type="number" name="attr_aventureMax" class='sheet-inpnum2c' style="width: 35px; margin-right: 0px;" value='1' min="0"/>
 					</div>
 					<div class="sheet-ligne">
 						<div class="sheet-libeldesc">Jet avec avantage</div>
@@ -141,7 +153,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="sheet-ligne" style="border-top: 1px solid black;">
+			<div class="sheet-ligne">
 				<div class="sheet-mycolbrd" style="width: 130px; padding-top: 10px;"> <!-- CADRE MÉTIERS -->
 					<div class="sheet-ligne" style="margin-bottom: 6px;">
 						<input type="checkbox" value="metier1" name="attr_metier1"/>
@@ -168,7 +180,7 @@
 					</div>
 					<div class="sheet-ligne" style="padding-top: 5px; text-align: center;">
 						<div class="sheet-libel3" style="width: 150px;">Jet de Chance</div>
-						<button type='roll' name='roll_testChance' class="sheet-btRoll8Big" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Jet de Chance}} {{jetChance=[[1d8cs0cf0]]}}'></button>
+						<button type='roll' name='roll_testChance' class="sheet-btRoll8Big" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=Jet de Chance}} {{jetChance=[[1d8]]}}'></button>
 					</div>
 					<div class="sheet-ligne" style="padding-top: 5px; margin-bottom: 5px; text-align: center;">
 						<input type="checkbox" value="exalte" name="attr_exalte"/>
@@ -191,7 +203,7 @@
 					<div class="sheet-ligne" style="margin-top: 5px;">
 						<div  class="sheet-libel1" style="width: 120px;">Vitesse</div>
 						<input type="number" name="attr_mvt" class='sheet-inpnum2c' value='6' />
-						<div>pas</div>
+						<div class="sheet-infoDesc">pas</div>
 					</div>
 					<div class="sheet-ligne">
 						<div class="sheet-libeldesc">Moitié : +1 attaque ou Déf</div>
@@ -201,7 +213,7 @@
 			</div>
 		</div>
     </div>
-    <div class="sheet-mycolbrd" style="width: 100%; border-top: 1px solid black;"> <!-- CADRE ARMES -->
+    <div class="sheet-mycolbrd sheet-borderBottom" style="width: 100%;"> <!-- CADRE ARMES -->
 		<div class="sheet-ligne">
 			<div class="sheet-libel2">Armes</div>
 		</div>
@@ -215,24 +227,23 @@
 			<fieldset>
 		</div>
     </div>
-    <div class="sheet-mycolbrd" style="width: 100%; border-top: 1px solid black;"> <!-- CADRE CAPACITÉS -->
+    <div class="sheet-mycolbrd sheet-borderBottom" style="width: 100%;"> <!-- CADRE CAPACITÉS -->
 		<div class="sheet-ligne">
-			<div class="sheet-libel2">Capacités</div><div style="width: 750px; text-align: right;">Utilisations</div>
+			<div class="sheet-libel2">Capacités</div><div class="sheet-infoDesc" style="width: 100px; margin-left: 640px; margin-top: 10px;">Utilisations</div>
 		</div>
 		<div class="sheet-ligne" style="text-align: top;">
 			<fieldset class='repeating_capacite'>
 				<input type="text" name="attr_capaName" class="sheet-biginp" placeholder="Capacité" />
 				<input type="text" name="attr_macroCapa" class='sheet-biginp' style="width: 90px; text-align: center;" placeholder="(macro)" title="Macro" />
-				<button type='roll' name='roll_testCapa' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=@{capaName}}} {{rollResult1=[[1d20[D20]]]}} {{tRollDesc=@{capaDesc}}}'></button>
+				<button type='roll' name='roll_testCapa' class="sheet-btRoll20deminiv" value='&{template:jet} {{characterName=@{character_name}}} {{rollname=@{capaName}}} {{rollResult1=[[@{macroCapa}]]}} {{tRollDesc=@{capaDesc}}}'></button>
 				<input type="text" name="attr_capaDesc" style="width: 350px;" placeholder="Description" />
-				<!-- <textarea name="attr_capaDesc" style="width: 350px; height: 50px;" placeholder="Description"></textarea> -->
 				<input type="number" name="attr_utilRest" class="sheet-inpnum2c" style="border: 1px solid;" value="0" min="0" />
-				<span>/</span>
+				<span class="sheet-infoDesc">/</span>
 				<input type="number" name="attr_utilMax" class="sheet-inpnum2c" style="border: 1px solid;" value="0" min="0" />
 			<fieldset>
 		</div>
     </div>
-    <div class="sheet-mycolbrd" style="width: 100%; border-top: 1px solid black;"> <!-- CADRE ÉQUIPEMENT TALENTS -->
+    <div class="sheet-mycolbrd" style="width: 100%;"> <!-- CADRE ÉQUIPEMENT TALENTS -->
 		<div class="sheet-mycol" style="width: 49%;">
 			<div class="sheet-ligne">
 				<div class="sheet-libel3" style="width: 100%;">Équipement</div>
@@ -244,7 +255,7 @@
 				<div class="sheet-mycol">
 					<div class="sheet-libel1" style="text-align: left; width: 80px;">Richesses</div>
 					<input type="text" name="attr_po" style="width: 40px; text-align: center;" value="0"/>
-					<div>pièces d’or</div>
+					<div class="sheet-infoDesc">pièces d’or</div>
 				</div>
 			</div>
 		</div>
@@ -269,7 +280,7 @@
 		<div class="sheet-ligne">
 			<div class="sheet-libel1" style="width: 30px;">Niv</div><input type="number" name="attr_pnjNiv" class="sheet-inpnum2cbig" style="width: 45px;" value='1' min="0">
 			<div class="sheet-libel1" style="width: 30px;">PV+</div><input type="number" name="attr_pnjPvBonus" class='sheet-short' value='0' min="0">
-			<button type='roll' name='roll_jetpvpnj' class="sheet-btRoll8" value='@{jetCache} &{template:jet} {{characterName=@{character_name}}} {{rollname=PV du PNJ}} {{rollResult1=[[{@{pnjNiv}d8cs0cf0,1d4cs0cf0}kh1+@{pnjPvBonus}]]}}'></button>
+			<button type='roll' name='roll_jetpvpnj' class="sheet-btRoll8" value='@{jetCache} &{template:jet} {{characterName=@{character_name}}} {{rollname=PV du PNJ}} {{rollResult1=[[{@{pnjNiv}d8,1d4}kh1+@{pnjPvBonus}]]}}'></button>
 			<div class="sheet-libel1" style="width: 20px;">PV</div><input type="number" name="attr_pnjpv" class='sheet-extrashort' value='0'> / <input type="number" name="attr_pnjpvmax" class='sheet-extrashort' value='0'>
 			<select name="attr_jetCache" id="attr_jetCache" style="width: 100px; margin-left: 15px;">
                 <option value="/w gm ">Jets cachés</option>
@@ -323,65 +334,65 @@
 <!-- Roll Templates -->
 
 <rolltemplate class="sheet-rolltemplate-jet">
-    <div>
-        <h3>{{characterName}}</h3>
+    <div class="sheet-template-main">
+        <div class="sheet-template-charName">{{characterName}}</div>
         {{#rollname}}
-            <h4>{{rollname}}</h4>
+            <div class="sheet-template-title">{{rollname}}</div>
         {{/rollname}}
 		{{#tSerie1}}{{#tSerie2}}
-			<h6>Série 1 : {{tSerie1}}</h6>
-			<h6>Série 2 : {{tSerie2}}</h6>
+			<div class="sheet-noCrit">Série 1 : {{tSerie1}}</div>
+			<div class="sheet-noCrit">Série 2 : {{tSerie2}}</div>
 		{{/tSerie2}}{{/tSerie1}}
         {{^carac}}{{^arme}}
 		{{#rollResult1}}
-            <h5>Résultat : {{rollResult1}}</h5>
+            <div class="sheet-noCrit">Résultat : {{rollResult1}}</div>
         {{/rollResult1}}
 		{{#jetChance}}
 			{{#rollGreater() jetChance 4}}
-				<h5><span style='color: green'>{{jetChance}}, Oui !</span></h5>
+				<div class="sheet-noCrit">Résultat : <span class="sheet-template-success">{{jetChance}}, Oui !</span></div>
 			{{/rollGreater() jetChance 4}}
 			{{#rollLess() jetChance 5}}
-				<h5><span style='color: red'>{{jetChance}}, Non !</span></h5>
+				<div class="sheet-noCrit">Résultat : <span class="sheet-template-failure">{{jetChance}}, Non !</span></div>
 			{{/rollLess() jetChance 5}}
 		{{/jetChance}}
 		{{/arme}}{{/carac}}
         {{#carac}}
             <div>Seuil : {{carac}}+</div>
-            <div>Jet : 
+            <div class="sheet-enableCrit">Jet : 
                 {{#rollGreater() rollResult1 carac}}
-                    <span style='color: green'>{{rollResult1}}</span>
+                    <span class="sheet-template-success">{{rollResult1}}</span>
                 {{/rollGreater() rollResult1 carac}}
 
                 {{#rollLess() rollResult1 carac}}
-                    <span style='color: red'>{{rollResult1}}</span>
+                    <span class="sheet-template-failure">{{rollResult1}}</span>
                 {{/rollLess() rollResult1 carac}}
 
                 {{#rollTotal() rollResult1 carac}}
-                    <span style='color: green'>{{rollResult1}}</span>
+                    <span class="sheet-template-success">{{rollResult1}}</span>
                 {{/rollTotal() rollResult1 carac}}
 				<span> | </span>
 				{{#rollGreater() rollResult2 carac}}
-                    <span style='color: green'>{{rollResult2}}</span>
+                    <span class="sheet-template-success">{{rollResult2}}</span>
                 {{/rollGreater() rollResult2 carac}}
 
                 {{#rollLess() rollResult2 carac}}
-                    <span style='color: red'>{{rollResult2}}</span>
+                    <span class="sheet-template-failure">{{rollResult2}}</span>
                 {{/rollLess() rollResult2 carac}}
 
                 {{#rollTotal() rollResult2 carac}}
-                    <span style='color: green'>{{rollResult2}}</span>
+                    <span class="sheet-template-success">{{rollResult2}}</span>
                 {{/rollTotal() rollResult2 carac}}				
             </div>	
         {{/carac}}
         {{#arme}}
-            <h4>Attaque avec {{arme}}</h4>
-			<div>Touche une défense de {{rollResult1}} | {{rollResult2}}</div>
+            <div class="sheet-template-title">Attaque avec {{arme}}</div>
+			<div class="sheet-enableCrit">Touche une défense de {{rollResult1}} | {{rollResult2}}</div>
             {{#coup}}{{#desdegats}}
-            <div>Pour {{desdegats}} dégâts : {{coup}}</div>
+            <div class="sheet-noCrit">Pour {{desdegats}} dégâts : {{coup}}</div>
             {{/desdegats}}{{/coup}}
         {{/arme}}
 		{{#tRollDesc}}
-		<div>{{tRollDesc}}</div>
+		<div class="sheet-template-rollDesc">{{tRollDesc}}</div>
 		{{/tRollDesc}}
     </div>
 </rolltemplate>