diff --git a/NOC/NOC.css b/NOC/NOC.css
index ceef74a9b3..17c0ac22c9 100644
--- a/NOC/NOC.css
+++ b/NOC/NOC.css
@@ -1,4 +1,5 @@
 /* FONTS */
+
 @font-face {
   font-family: 'Special Elite';
   font-style: normal;
@@ -7,6 +8,7 @@
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
+
 /* latin */
 @font-face {
   font-family: 'Caveat';
@@ -17,6 +19,11 @@
 }
 
 
+.charsheet {
+    font-family: Caveat;
+}
+
+
 /*
 -= TYPE DE FICHE =-
 */
@@ -74,7 +81,8 @@
 -= FICHE Fiel =-
 */
 
-.sheet-compteurfiel {
+.sheet-compteurfiel,
+.sheet-compteurmenace {
     width: 55px;
     font-size: 38px;
     font-weight: bold;
@@ -85,22 +93,73 @@
 	background-color:transparent;
 	color:white;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
+}
+
+
+.sheet-affichage-fiel span {
+    font-size: 17px;
+    font-weight: bold;
+    text-align: center;
+	color: white;
+	margin-top:-10px;
+	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+}
+
+.sheet-compteurfiel {
+	position: relative;
+}
+
+.sheet-compteurfiel2 {
+	position: absolute;
+	margin-left: 170px;
+	margin-top: -18px;
+	transform: rotate(-20deg);
+}
+
+.sheet-fielspan span {
+    font-size: 26px;
+    font-weight: bold;
+    text-align: center;
+	color: red;
+	display:inline;
+	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+}
+
+.sheet-fielspan {
+    position: absolute;
+    margin-top: 5px;
+    margin-left: 135px;
+    transform: rotate(-25deg);
+}
+
+.sheet-fielroll {
+    position: absolute;
+	margin-top: -7px;
+	margin-left: 18px;
+}
+
+
+.sheet-indiquefiel {
+	display:inline;
+	margin-left: 20px;
 }
 
 .sheet-section-fiel {
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fielcompteur.png");
-    background-repeat: repeat-y;
+	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fielcompteur2.png");
+    background-repeat: no-repeat;
 	background-size: 100%;
-	width:300px;
-	height:300px;
+	width:362px;
+	height:305px;
 	position:relative;
 	float:left top;
 }
 
 .sheet-affichage-fiel {
 	position:absolute;
-	margin-top:175px;
-	margin-left:122px;
+	margin-top:180px;
+	margin-left:125px;
 	text-align:center
 }
 
@@ -108,6 +167,10 @@
 	padding-left:5px;
 }
 
+.sheet-menace {
+	margin-top:-15px;
+}
+
 
 /*
 -= FICHE PNJ =-
@@ -119,12 +182,12 @@
     background-repeat: repeat-y;
 	background-size: 100%;
     width: auto;
-	height:auto;
+	height:100%;
 	color: black;
 	box-shadow: 0 0 10px #555;
 	border: 3px solid black;
 	min-width:505px;
-	max-width:600px;
+	max-width:605px;
 }
 
 .sheet-section-PNJ span {
@@ -193,12 +256,15 @@
 
 .sheet-caracteristique-lignes-PNJ  {
 	text-align:center;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-lignes,
 .sheet-lignesmax {
 	width: 33px;
     font-size: 19px;
+	font-weight: bold;
     text-align: center;
     border: 1px solid black;
 	position:relative;
@@ -215,12 +281,23 @@
 	color: grey;
 }
 
+.sheet-tab-armure-PNJ,
+.sheet-tab-tir-PNJ,
+.sheet-tab-cac-PNJ {
+	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
+    background-repeat: no-repeat;
+	background-position: top left;
+	background-size: 100%;
+	border:2px solid black;
+	margin-top:5px;
+}
+
 .sheet-tir-title-PNJ,
 .sheet-armure-title-PNJ,
 .sheet-cac-title-PNJ {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondtitrequipement.jpg");
     background-repeat: no-repeat;
-	background-size: 100%;
+	background-size: 105%;
     width: auto;
 	height : 30px;
 	border-radius: 5px 5px 0px 0px;
@@ -230,7 +307,7 @@
 
 .sheet-Combathelper-PNJ {
 	width: 490px;
-    height: 350px;
+    height: 300px;
 	position: relative;	
 	z-index: 5;
 	font-size: 10px;
@@ -242,16 +319,20 @@
 	border: 3px groove;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
     box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
+	margin-top:5px;
 }
 
 span.sheet-labelvisible,
 span.sheet-afficheflag {
 	display: inline-block;
 	position:relative;
-	font-size:17px;
+	font-size:20px;
 	margin-left:5px;
 	color:white;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
+	
 }
 
 .sheet-flagGM,
@@ -364,7 +445,7 @@ span.sheet-afficheflag {
     cursor: pointer;
     position: absolute;
 	vertical-align: middle;
-    font-family: 'Special Elite';
+    /* font-family: 'Special Elite'; */
     font-size: 14px;
 	border-radius: 0px 10px 10px 0px;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
@@ -463,21 +544,27 @@ span.sheet-afficheflag {
 	z-index: 12;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-malusname {
+	font-size:24px;
+	line-height:26px;
 	width: auto;
 	text-align: center;
 	color: #4F5F70;
 	background: -webkit-gradient(linear, left center, right bottom, from(#585049), to(#4F5F70));
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
+	cursor: help;
 }
 
 .sheet-afficheflag {
 	position : absolute;
 	z-index: 999;
 	margin-left: 395px;
+	margin-top:3px;
 }
 
 .sheet-afficheflagON,
@@ -485,10 +572,11 @@ span.sheet-afficheflag {
 	position : absolute;
 	z-index: 999;
     width: 150px;
-	font-size: 16px;
+	font-size: 14px;
 	font-weight: bold;
 	margin-left: 420px;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-afficheflagON {
@@ -539,8 +627,9 @@ span.sheet-afficheflag {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondmain.jpg");
     background-repeat: repeat-y;
 	background-size: 100%;
-	width: 1030px;
-	height:auto;
+	width: 1020px;
+	min-width: 1020px;
+	height:100%;
 	color: black;
 	box-shadow: 0 0 10px #555;
 	border: 3px solid black;
@@ -570,34 +659,47 @@ span.sheet-afficheflag {
 	background-size: 15px;
 	background-repeat: no-repeat;
 	border: 0px solid black;
+	box-shadow:none;
 }
 
 [data-groupname=repeating_class-ability] > button.btn.repcontrol_add::after {
-    content: "Add Another Class Ability for CPP";
-    background-color:transparent;
 	width: 30px;
 }
 
 [data-groupname=repeating_class-ability] > button.btn.repcontrol_edit::after {
-    content: "Adjust Class Abilities for CPP";
-    background-color:transparent;
 	width: 30px;
 }
 
 .charsheet .repcontrol_add,
 .charsheet .repcontrol_edit {
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondbouton.jpg");
-    background-repeat: no-repeat;
-	background-size: 75px;
+    background: linear-gradient(#3D221A, #778795);
 	border: 2px solid black;
-	height: 30px;
-	border-radius: 10px;
+	height: 18px;
+	border-radius: 10px 10px 0px 0px;
 	box-shadow: 0 0 10px black, 5px 5px 10px #514842;
 	color: white;
-	font-family: "Courier New",Courier,monospace;
+	font-family: Caveat;
     font-size: 14px;
 	font-weight: bold;
-	text-shadow: none;
+	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-size:20px;
+}
+
+.charsheet .repcontrol_add:hover,
+.charsheet .repcontrol_edit:hover {
+	background: #326097;
+}
+
+.charsheet .repcontrol {
+	height:  30px;
+}
+
+.repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+	background: red;
+}
+
+.repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit:hover {
+	background: #3FB315;
 }
 
 
@@ -606,6 +708,8 @@ span.sheet-afficheflag {
 .sheet-idsecurite,
 .sheet-idharmonie {
 	display:none;
+    font-family: "Courier New",Courier,monospace;
+    font-size: 14px;
 }
 .sheet-idsecuritesignale,
 .sheet-idsecuriterecherche,
@@ -692,13 +796,14 @@ span.sheet-afficheflag {
 }
 
 .sheet-infotitre {
-	font-size: 22px;
+	font-size: 21px;
 	max-height: 22px;
 }
 
 .sheet-infogrostitre {
 	font-size: 30px;
 	max-height: 30px;
+	width:400px;
 }
 
 .sheet-input-info {
@@ -720,7 +825,7 @@ span.sheet-afficheflag {
     border-style: none;
     background-color: transparent;
 	font-family: "Courier New",Courier,monospace;
-	width: 200px;
+	width: 210px;
     font-size: 14px;
 	max-height: 14px;
 }
@@ -815,7 +920,7 @@ span.sheet-afficheflag {
     border-color: none;
     border-radius: inherit;
     background-color: transparent;
-	font-family: 'Special Elite';
+	/* font-family: 'Special Elite'; */
 	font-size: 14px;
 	font-weight: bold;
 }
@@ -827,8 +932,8 @@ span.sheet-afficheflag {
     border-color: none;
     border-radius: inherit;
     background-color: transparent;
-	font-family: 'Special Elite';
-	font-size: 14px;
+	/* font-family: 'Special Elite'; */
+	font-size: 18px;
 	width: 200px;
 }
 
@@ -840,9 +945,9 @@ span.sheet-afficheflag {
     border-style: none;
     border-radius: inherit;
     background-color: transparent;
-	font-family: 'Special Elite';
+	/* font-family: 'Special Elite'; */
 	width: 380px;
-	font-size: 14px;
+	font-size: 18px;
 	padding: 0px 0px 0px 5px;
 	margin-bottom: 0px;
 	height: 55px;
@@ -895,16 +1000,16 @@ span.sheet-afficheflag {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondcompositionbasdroite.png");
 	background-position: bottom right;
 	background-repeat: no-repeat;
-	height: auto;
+	height: 950px;
 	min-height: 950px;
-	width:  fit-content;
+	width: 970px;
 	padding-bottom:20px;
 	margin-top: -60px;
 	padding-left:50px;
 }
 
 .sheet-caracteristique-competence {
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondcomposition.png");
+	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondcomposition2.png");
     background-size: 70%;
     background-repeat: no-repeat;
 	background-position:50% 60%;
@@ -977,8 +1082,8 @@ span.sheet-afficheflag {
 }
 
 .sheet-caracteristique-title {
-	font-family: 'Special Elite';
-    font-size: 22px;
+	/* font-family: 'Special Elite'; */
+    font-size: 24px;
 	color: white;
 	position: relative;
 	display: inline;
@@ -991,7 +1096,7 @@ span.sheet-afficheflag {
 .sheet-caracteristique-value-max {
     width: 45px;
     font-size: 23px;
-    font-weight: bold;
+    font-weight: bolder;
     text-align: center;
     border: 5px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
@@ -1000,6 +1105,7 @@ span.sheet-afficheflag {
 	z-index: 5;
 	border-radius: 25px;
 	box-shadow: 0 0 5px black, 5px 5px 10px #514842;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-caracteristique-vietab {
@@ -1050,24 +1156,30 @@ span.sheet-afficheflag {
 	border: 3px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
 	box-shadow:  1px 1px 5px #514842;
+	font-family: "Courier New",Courier,monospace;
+	line-height: 20px;
+	vertical-align:middle;
 }
 
 
 .sheet-competence-title {
-	font-family: 'Special Elite';
-    font-size: 17px;
+	/* font-family: 'Special Elite'; */
+    font-size: 24px;
+	line-height: 20px;
 	display: inline;
-	padding-right: 1px;
+	padding-right: 5px;
 	font-weight: bolder;
 	color: #758CA5;
 	background: -webkit-gradient(linear, left center, right bottom, from(#585049), to(#758CA5));
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
 	cursor:help;
+	margin-bottom:0px;
+	vertical-align:middle;
 }
 
 .sheet-points-vecu {
-	width: 130px;
+	width: 140px;
     text-align:center;	
 	position: absolute;
 	margin-left: 420px;
@@ -1130,8 +1242,8 @@ span.sheet-afficheflag {
 }
 
 .sheet-points-title {
-	font-family: 'Special Elite';
-    font-size: 20px;
+	/* font-family: 'Special Elite'; */
+    font-size: 22px;
 	display: inline;
     text-align: center;
 	position:relative;
@@ -1142,11 +1254,10 @@ span.sheet-afficheflag {
 }
 
 .sheet-points-title2 {
-	font-family: 'Special Elite';
-    font-size: 20px;
+	/* font-family: 'Special Elite'; */
+    font-size: 22px;
 	display: inline;
     text-align: center;
-	padding-left: 8px;
 	position:relative;
 	z-index: 5;	
 	color: white;
@@ -1155,20 +1266,28 @@ span.sheet-afficheflag {
 }
 
 .sheet-points-slash {
-	font-family: 'Special Elite';
+	/* font-family: 'Special Elite'; */
     font-size: 23px;
 	display: inline-block;
     text-align: center;
 	color:#514842;
-	margin-top: 5px;
 	font-weight: bolder;
 	text-shadow: 0 0 5px black, 5px 5px 10px #514842;
 }
 
+.sheet-points-slash-vecu {
+    margin-left:5px;
+	margin-right:5px;
+}
+
 .sheet-points-content {
 	vertical-align: middle;
 	width: 120px;
 }
+
+.sheet-points-content-vecu {
+	width: 140px;
+}
       
 .sheet-points-select {
 	width: 48px;
@@ -1183,6 +1302,7 @@ span.sheet-afficheflag {
 	display: inline-block;
 	position: relative;
 	box-shadow: 0 0 5px black, 5px 5px 10px #514842;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-points-select-max {
@@ -1198,6 +1318,8 @@ span.sheet-afficheflag {
 	display: inline-block;
 	position: relative;
 	box-shadow: 0 0 5px black, 5px 5px 10px #514842;
+	font-family: "Courier New",Courier,monospace;
+	margin-left:5px;
 }
 
 .sheet-points-select-max-input {
@@ -1215,6 +1337,7 @@ span.sheet-afficheflag {
 	display: inline-block;
 	position: relative;
 	box-shadow: 0 0 5px black, 5px 5px 10px #514842;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-points-title-effet {
@@ -1233,6 +1356,7 @@ span.sheet-afficheflag {
 .sheet-points-permanents {
 	width: 33px;
     font-size: 19px;
+	font-weight: bold;
     text-align: center;
     border: 1px solid black;
 	color: grey;
@@ -1244,15 +1368,16 @@ span.sheet-afficheflag {
     border-radius: 25px;	
 	box-shadow:  1px 1px 5px #514842;
 	color: black;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-checkboxdiv {
 	border:1px solid darkgrey; 
 	display:none;
-	height:13px;
-	width:13px;
+	height:11px;
+	width:11px;
 	vertical-align:bottom;
-	padding-right:1px;
+	margin-bottom: 2px;
 }
 
 .sheet-checkbox-ctrl {
@@ -1263,7 +1388,7 @@ span.sheet-afficheflag {
     background-color: transparent;
 	border: 0px solid black;
 	text-align: center;
-	font-size: 12px;
+	font-size: 14px;
 	width: 152px;
 	height:55px;
 	resize : none;
@@ -1276,7 +1401,7 @@ span.sheet-afficheflag {
     background-color: transparent;
 	border: 0px solid black;
 	text-align: center;
-	font-size: 12px;
+	font-size: 14px;
 	color: black;
 	width: 152px;
 }
@@ -1776,32 +1901,39 @@ span.sheet-afficheflag {
 }
 
 /* POSSESSIONS */
-.sheet-section-equip {
-	height: auto;
-	width:  fit-content;
-	padding-bottom:100px;
+.sheet-section-equip {	
+	padding-bottom:50px;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipementbasgauche.png"),url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipementbasdroite.png");
 	background-repeat: no-repeat;
 	background-size: 400px, 300px ;
 	background-position: bottom left, bottom right ;	
 	padding-left: 40px;
 	margin-top:-60px;
+	overflow: auto;
 }
 
-
-.sheet-divtircac {
-	width: 930px;
+.sheet-contactarmorCC {
 	min-height: 100px;
-	margin-bottom: 30px;
-	display:inline-block;
+	margin-left: 30px;
+	height: auto;
+	margin-bottom: 10px;
+	float:left;
+}
+
+.sheet-divtirCH {
+	position: relative;
+	min-height: 100px;
+	margin-right: 30px;
+	margin-bottom: 10px;
+	height: auto;
+	float: right;
 }
 
 .sheet-tab-contacts {
-	min-height: 300px; 
-	height: 300px; 
-	max-height: 300px; 
+	min-height: 100px;  
+	max-height: 280px; 
+	height:auto;
 	width: 400px;
-	margin-left: 30px;
 	margin-bottom: 10px;
 	border: 2px solid black;
 	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
@@ -1809,44 +1941,57 @@ span.sheet-afficheflag {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
     background-repeat: no-repeat;
 	background-position: top left;
-	background-size: 400px;
+	background-size: 100%;
+}
+
+.sheet-tab-cac {
+	min-height: 100px;
+	width: 400px;
+	border: 2px solid black;
+	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
+	border-radius: 5px 5px 0px 0px;
+	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
+    background-repeat: no-repeat;
+	background-position: top left;
+	background-size: 100%;
 }
 
 .sheet-tab-armure {
-	min-height: 120px; 
-	height: 120px; 
-	max-height: 120px; 
+	height: 100px; 
 	width: 400px;
-	margin-left: 30px;
-	margin-bottom: 10px;
 	border: 2px solid black;
 	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
 	border-radius: 5px 5px 0px 0px;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
     background-repeat: no-repeat;
 	background-position: top left;
-	background-size: 400px;
+    background-size: 100%;
+	margin-bottom: 10px;
 }
 
 .sheet-tab-tir {
+	float:left;
 	min-height: 100px;
 	width: 500px;
-	float: left;
 	border: 2px solid black;
 	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
 	border-radius: 5px 5px 0px 0px;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
     background-repeat: no-repeat;
 	background-position: top left;
-	background-size: 500px;
+	background-size: 100%;
+	margin-top: 10px;
 }
 
 .sheet-tir-all,
-.sheet-cac-all,
-.sheet-cac-all-mainsnues {
+.sheet-cac-all {
 	height:115px;
 }
 
+.sheet-cac-all-mainsnues {
+	height:70px;
+}
+
 .sheet-tir-gauche,
 .sheet-cac-gauche {
 	float: left;
@@ -1857,20 +2002,6 @@ span.sheet-afficheflag {
 	margin-top: 5px;
 }
 
-.sheet-tab-cac {
-	min-height: 100px;
-	width: 400px;
-	float: right;
-	border: 2px solid black;
-	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
-	border-radius: 5px 5px 0px 0px;
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
-    background-repeat: no-repeat;
-	background-position: top left;
-	background-size: 400px;
-	vertical-align: top;
-}
-
 .sheet-tab-equip {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondequipement.jpg");
     background-repeat: no-repeat;
@@ -1878,11 +2009,15 @@ span.sheet-afficheflag {
 	background-size: 950px;
 	border: 2px solid black;
 	width: 950px;
-	min-height: 100px;
+	min-height: 80px;
 	margin-bottom: 20px;
 	vertical-align: top;
 	box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
 	border-radius: 5px 5px 0px 0px;
+	position: relative;
+	height: auto;
+	float: left;
+	margin-left:10px;
 } 
 
 .sheet-equip-title {
@@ -1927,11 +2062,11 @@ span.sheet-afficheflag {
 .sheet-tir-title-label,
 .sheet-cac-title-label,
 .sheet-armure-title-label {
-	font-family: 'Special Elite';
-    font-size: 22px;
+	/* font-family: 'Special Elite'; */
+    font-size: 28px;
 	color: white;
 	font-weight : bold;
-	padding-top : 10px;
+	padding-top : 5px;
 	padding-left : 5px;
 	height : 30px;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
@@ -1949,6 +2084,7 @@ span.sheet-afficheflag {
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fonddescriptionequip.jpg");
     background-repeat: no-repeat;
 	background-size: 250px;
+	font-size: 16px;
 }
 
 .sheet-header-equip {
@@ -1970,7 +2106,6 @@ span.sheet-afficheflag {
 }
 
 .sheet-line-equip1 {
-	float: left;
 	display:inline-block;
 }
 
@@ -1980,7 +2115,6 @@ span.sheet-afficheflag {
 
 .sheet-line-equip3 {
 	display:inline-block;
-    float: right;	
 }
 
 .sheet-contacts-th {
@@ -2000,13 +2134,15 @@ span.sheet-afficheflag {
     width: 35px;
 	height: 35px;
 	text-align: center;
-	font-size: 20px;
+	font-size: 18px;
 	border-radius: 30px;
 	margin-right: 15px;
 	margin-left: 15px;
 	margin-bottom: 5px;
 	border: 3px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-armure-th {
@@ -2026,12 +2162,14 @@ span.sheet-afficheflag {
     width: 35px;
 	height: 35px;
 	text-align: center;
-	font-size: 20px;
+	font-size: 18px;
 	border-radius: 30px;
 	margin-right: 15px;
 	margin-left: 15px;
     border: 3px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-header-equip-roll {
@@ -2086,6 +2224,11 @@ span.sheet-afficheflag {
     background-repeat: no-repeat;
 	background-size: 310px 110px;	
 	margin-left: 5px;
+	font-size:16px;
+}
+
+.sheet-armeinfo-mainsnues {
+	height: 20px;
 }
 
 .sheet-input-degat,
@@ -2094,13 +2237,15 @@ span.sheet-afficheflag {
 	width: 35px;
 	height: 35px;
 	min-height: 35px;
-	font-size: 16px;
+	font-size: 18px;
 	text-align: center;
 	border-radius: 20px;
 	margin-left: 10px;
 	margin-right: 10px;
 	border: 3px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-input-talent {
@@ -2112,6 +2257,7 @@ span.sheet-afficheflag {
 	margin-right: 2px;
 	border: 3px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	cursor:help;
 }
 
 .sheet-input-trait {
@@ -2131,15 +2277,148 @@ span.sheet-afficheflag {
 	display:none;
 }
 
+.sheet-contactsindex:checked ~ .sheet-tab-contacts .repcontrol_add {
+	display:none;
+}
+
+.sheet-contacts0:checked  ~ .sheet-tab-contacts .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-contacts0:checked  ~ .sheet-tab-contacts .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-contacts0:checked  ~ .sheet-tab-contacts .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-tir0:checked  ~ .sheet-tab-tir .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-tir0:checked  ~ .sheet-tab-tir .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-tir0:checked  ~ .sheet-tab-tir .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-cac0:checked  ~ .sheet-tab-cac .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-cac0:checked  ~ .sheet-tab-cac .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-cac0:checked  ~ .sheet-tab-cac .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-equip01:checked  ~ .sheet-tab-equip .sheet-line-equip1 .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-equip01:checked  ~ .sheet-tab-equip .sheet-line-equip1 .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-equip01:checked  ~ .sheet-tab-equip .sheet-line-equip1 .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-equip02:checked  ~ .sheet-tab-equip .sheet-line-equip2 .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-equip02:checked  ~ .sheet-tab-equip .sheet-line-equip2 .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-equip02:checked  ~ .sheet-tab-equip .sheet-line-equip2 .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-equip03:checked  ~ .sheet-tab-equip .sheet-line-equip3 .repcontainer.ui-sortable.editmode ~ .repcontrol .repcontrol_edit {
+		display:inline;
+}
+.sheet-equip03:checked  ~ .sheet-tab-equip .sheet-line-equip3 .repcontainer ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+.sheet-equip03:checked  ~ .sheet-tab-equip .sheet-line-equip3 .repcontainer.ui-sortable ~ .repcontrol .repcontrol_edit {
+		display:none;
+}
+
+.sheet-trait {
+	height: 23px;
+	vertical-align: middle;
+}
+
+.sheet-input-traitselect {
+	display:inline;
+}
+
+.sheet-input-traitcheckbox,
+.sheet-input-traitvalue {
+	display:none;	
+}
+
+.sheet-input-traitselect {
+	width: 130px;
+	min-height: 23px;
+	padding: 0px 0px 0px 0px;
+	margin: 0px 0px 0px 0px;
+	color: black;
+	font-size: 14px;
+    border-style: none;
+	background-color: transparent;
+	font-family: "Courier New",Courier,monospace;
+}
+.sheet-input-traitvalue {
+	width: 20px;
+	min-height: 20px;
+    font-size: 14px;
+	font-weight: bold;
+    text-align: center;
+    border: 1px solid black;	
+    border-radius: 25px;	
+	box-shadow:  1px 1px 5px #514842;
+	color: black;
+	font-family: "Courier New",Courier,monospace;
+	background: white;
+	margin-left:5px;
+}
+
+.sheet-traitcheckbox1:checked ~ .sheet-input-traitvalue1 {
+	display:inline;
+}
+.sheet-traitcheckbox1enoire:checked ~ .sheet-input-traitvalue1enoire {
+	display:inline;
+}
+.sheet-traitcheckbox1quantique:checked ~ .sheet-input-traitvalue1quantique {
+	display:inline;
+}
+.sheet-traitcheckbox2:checked ~ .sheet-input-traitvalue2 {
+	display:inline;
+}
+.sheet-traitcheckbox2enoire:checked ~ .sheet-input-traitvalue2enoire {
+	display:inline;
+}
+.sheet-traitcheckbox2quantique:checked ~ .sheet-input-traitvalue2quantique {
+	display:inline;
+}
+.sheet-traitcheckbox3:checked ~ .sheet-input-traitvalue3 {
+	display:inline;
+}
+.sheet-traitcheckbox3enoire:checked ~ .sheet-input-traitvalue3enoire {
+	display:inline;
+}
+.sheet-traitcheckbox3quantique:checked ~ .sheet-input-traitvalue3quantique {
+	display:inline;
+}
+
+
+
+
 /* Combat helper */
 .sheet-Combathelper {
 	width: 490px;
-    height: 350px;
-	position: absolute;	
-	margin-left: 460px;
-	margin-top: -390px;
+    height: 300px;
+	position: relative;	
 	z-index: 5;
-	font-size: 10px;
+	font-size: 14px;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondCHetetat.jpg");
     background-repeat: no-repeat;
 	background-size: 490px 350px;
@@ -2148,6 +2427,7 @@ span.sheet-afficheflag {
 	border: 3px groove;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
     box-shadow: 0 0 10px #353535, 5px 5px 10px #353535;
+	font-family: "Courier New",Courier,monospace;
 }
 
 .sheet-Combathelper-title {
@@ -2158,18 +2438,19 @@ span.sheet-afficheflag {
     width: 260px;
 	height : 80px;
 	position: absolute;
+	font-family: Caveat;
 }
 
 .sheet-Combathelper-title-label {
-	font-family: 'Special Elite';
-    font-size: 22px;
+	/* font-family: 'Special Elite'; */
+    font-size: 26px;
 	color: white;
 	font-weight : bold;
 	padding-top : 10px;
 	padding-left : 5px;
 	height : 30px;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
-	padding-top: 30px;
+	padding-top: 25px;
 	padding-left: 25px;
 }
 
@@ -2178,15 +2459,15 @@ span.sheet-afficheflag {
 	position: absolute;
 	z-index: 5;
 	margin-left: 10px;
-	margin-top: 70px;
+	margin-top: 75px;
 }
 .sheet-CHdivcombobox {
 	width: 250px;
-    height: 150px;
+    height: 140px;
 	position: absolute;
 	z-index: 5;
 	margin-left: -5px;
-	margin-top: 115px;
+	margin-top: 105px;
 	vertical-align: middle;
 }
 .sheet-CHdivcheckbox {
@@ -2195,7 +2476,7 @@ span.sheet-afficheflag {
 	position: absolute;
 	z-index: 5;
 	margin-left: 225px;
-	margin-top: 115px;
+	margin-top: 105px;
 	vertical-align: middle;
 }
 
@@ -2209,12 +2490,12 @@ span.sheet-afficheflag {
 }
 
 .sheet-CHtotalBM {
-	width: 420px;
-    height: 80px;
+	width: 100%;
+    height: 60px;
 	position: absolute;
 	z-index: 5;
-	margin-left: 20px;
-	margin-top: 270px;
+	margin-top: 230px;
+	text-align: center;
 }
 
 .sheet-CHdescription {
@@ -2248,44 +2529,58 @@ span.sheet-afficheflag {
 	
 .sheet-CHdescriptionroll {
 	text-align: right;
-	font-size: 14px;
-	margin-top: 10px;
-	margin-left: 15px;
-	font-family: 'Special Elite';
+	font-size: 15px;
+	margin-left: 10px;
+	/* font-family: 'Special Elite'; */
 }
 
 .sheet-CHdescriptionbonusmalus {
-	margin-top: 10px;
-	text-align: right;
-	width: 370px;
+	display: inline;
+}
+
+.sheet-CHdescriptionbonusmalustitle {
+	display: inline;
+	font-size: 20px;
 }
 	
 .sheet-CHportee {
-	width: 135px;
+	width: 145px;
 	margin-left: 5px;
+	margin-bottom: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 	
 .sheet-CHNombreopposants {
 	width: 50px;
 	margin-left: 5px;
+	margin-bottom: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 	
 .sheet-CHcouvert {
 	width: 80px;
 	margin-left: 5px;
+	margin-bottom: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 	
 .sheet-CHconditions {
-	width: 125px;
+	width: 135px;
 	margin-left: 5px;
+	margin-bottom: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 	
 .sheet-CHinitiative,
@@ -2299,15 +2594,18 @@ span.sheet-afficheflag {
 	width: 35px;
 	height: 35px;
 	min-height:35;
-	font-size: 22px;
+	font-size: 20px;
 	text-align: center;	
 	margin-left: 5px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 .sheet-CHbonusmalusdsbl {
 	color: grey;
+	display:inline;
 }
  
 .sheet-CHcheckbox {
@@ -2315,12 +2613,14 @@ span.sheet-afficheflag {
 	width: 65px;
 	border: 2px ridge;
 	border-color: #685C52 #685C52 #616B6F #616B6F;
+	font-family: "Courier New",Courier,monospace;
+	font-weight: bold;
 }
 
 /* NOTES */
 .sheet-section-notes {
 	height: auto;
-	width:  fit-content;
+	width:  100%;
 	padding-bottom:20px;
 }
 
@@ -2356,7 +2656,7 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-comp div.sheet-templatemain { 
 	width: 220px;
 	height: auto;
-    background-size: 280px;
+    background-size: auto 100%;
 	background-position: bottom left;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondtemplatecompetrelance.jpg");
     background-repeat: no-repeat;
@@ -2369,10 +2669,11 @@ span.sheet-afficheflag {
 	padding: 2px 2px 2px 2px;	
 }
 
-.sheet-rolltemplate-noc-relance div.sheet-templatemain { 
+.sheet-rolltemplate-noc-relance div.sheet-templatemain,
+.sheet-rolltemplate-noc-relancedegat div.sheet-templatemain { 
 	width: 220px;
 	height: auto;
-    background-size: 225px;
+    background-size: 100% auto;
 	background-position: bottom left;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondtemplatecompetrelance.jpg");
     background-repeat: no-repeat;
@@ -2388,7 +2689,7 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-noirceur div.sheet-templatemain { 
 	width: 220px;
 	height: auto;
-    background-size: 225px auto;
+    background-size: 100% auto;
 	background-color:black;
     font-family: "Courier New", Courier, monospace;
     font-weight: bold;	
@@ -2400,20 +2701,21 @@ span.sheet-afficheflag {
 }
 
 .sheet-rolltemplate-noc-fiel div.sheet-templatemain { 
-	width: 220px;
-	height: 220px;
-    background-size: 100%;
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fielcompteur.png");
+	width: 219px;
+	height: 159px;
+    background-size: auto 100%;
+	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fieltchat.png");
     background-repeat: no-repeat;
     font-family: "Courier New", Courier, monospace;
     font-weight: bold;	
 	border: none;
+	color: white;
 }
 
 .sheet-rolltemplate-noc-attaque div.sheet-templatemain { 
 	width: 220px;
 	height: auto;
-    background-size: auto 330px;
+    background-size: auto 100%;
 	background-position: bottom left;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fondtemplateattaque.jpg");
     background-repeat: no-repeat;
@@ -2427,134 +2729,152 @@ span.sheet-afficheflag {
 }
 
 
-.sheet-rolltemplate-noc-comp a:last-of-type,
-.sheet-rolltemplate-noc-attaque a:last-of-type,
-.sheet-rolltemplate-noc-relance a:last-of-type {
+.sheet-rolltemplate-noc-comp  a:nth-of-type(1),
+.sheet-rolltemplate-noc-attaque  a:nth-of-type(1),
+.sheet-rolltemplate-noc-relance  a:nth-of-type(1) {
     margin-top: 10px;
     text-align: center;
-	font-size: 16px;
-	font-family: 'Special Elite';
+	font-size: 22px;
+	/* font-family: 'Special Elite'; */
+	font-family: Caveat;
 	color: white;
 	border-width: 2px;
 	background-color:#3FB315;
 	border-color: black;
 	border-radius: 15px;
 	box-shadow: 3px 5px 5px black;
-    height:18px;
-	padding-top:10px;
-	width:100px;
+    min-height:18px;
+	height:auto;
+	width:auto;
 	text-decoration: none;
 	vertical-align:middle;
+	padding: 10px;
 }
 
-.sheet-rolltemplate-noc-comp a:hover,
-.sheet-rolltemplate-noc-attaque a:hover,
-.sheet-rolltemplate-noc-relance a:hover {
+.sheet-rolltemplate-noc-attaque  a:nth-of-type(2),
+.sheet-rolltemplate-noc-relancedegat  a:nth-of-type(1) {
+    margin-top: 10px;
+    text-align: center;
+	font-size: 16px;
+	/* font-family: 'Special Elite'; */
+	font-family: Caveat;
+	color: white;
+	border-width: 2px;
+	background-color:#3FB315;
+	border-color: black;
+	border-radius: 15px;
+	box-shadow: 3px 5px 5px black;
+    min-height:18px;
+	height:auto;
+	width:auto;
+	text-decoration: none;
+	vertical-align:middle;
+	padding: 6px;
+}
+
+
+.sheet-rolltemplate-noc-comp  a:hover,
+.sheet-rolltemplate-noc-attaque  a:hover,
+.sheet-rolltemplate-noc-relance  a:hover,
+.sheet-rolltemplate-noc-relancedegat  a:hover {
 	background-color:#336299;
-	width:105px;
 }
 
 .sheet-rolltemplate-noc-comp div.sheet-templatethdiv,
 .sheet-rolltemplate-noc-attaque div.sheet-templatethdiv,
 .sheet-rolltemplate-noc-relance div.sheet-templatethdiv,
+.sheet-rolltemplate-noc-relancedegat div.sheet-templatethdiv,
 .sheet-rolltemplate-noc-noirceur div.sheet-templatethdiv {
-    padding: 5px 5px 15px 5px;
+	width: 210px;
+	height: auto;
+    padding: 5px;
     text-align: center;
 	color: rgb(112, 0, 0);
 	font-size: 26px;
-	font-family: 'Special Elite';
+	/* font-family: 'Special Elite'; */
+	font-family: Caveat;
 	color: white;
-}
-
-.sheet-rolltemplate-noc-comp div.sheet-templatethdiv {
-	width: 220px;
-	height: 55px;
 	background-size: 240px;
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fond_titre4.png");
-    background-repeat: no-repeat;
+	background-repeat: no-repeat;
 	background-position:-15px -20px;
-}
-
-.sheet-rolltemplate-noc-relance div.sheet-templatethdiv,
-.sheet-rolltemplate-noc-noirceur div.sheet-templatethdiv {
-	width: 220px;
-	height: 55px;
-	background-size: 240px;
 	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fond_titre4.png");
-    background-repeat: no-repeat;
-	background-position:-15px -20px;
-}
-
-.sheet-rolltemplate-noc-attaque div.sheet-templatethdiv {
-	width: 220px;
-	height: 95px;
-	background-size: 240px;
-	background-image:url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/NOC/images/fond_titre4.png");
-    background-repeat: no-repeat;
-	background-position:-15px -20px;
 }
 
 .sheet-rolltemplate-noc-comp div.sheet-templatenamediv,
 .sheet-rolltemplate-noc-attaque div.sheet-templatenamediv,
 .sheet-rolltemplate-noc-relance div.sheet-templatenamediv,
+.sheet-rolltemplate-noc-relancedegat div.sheet-templatenamediv,
 .sheet-rolltemplate-noc-noirceur div.sheet-templatenamediv {
-	width: 220px;
-	padding-top: 10px;
-	padding-bottom: 13px;
+	width: 210px;
+	max-width: 210px;
+	white-space: nowrap; 
+	overflow: hidden;
+    text-overflow: ellipsis;
+	padding-top: 5px;
+	padding-bottom: 8px;
 }
 
 .sheet-rolltemplate-noc-comp span.sheet-templatename,
 .sheet-rolltemplate-noc-attaque span.sheet-templatename,
 .sheet-rolltemplate-noc-relance span.sheet-templatename,
+.sheet-rolltemplate-noc-relancedegat span.sheet-templatename,
 .sheet-rolltemplate-noc-noirceur span.sheet-templatename {
-	font-size: inherit;
-    font-size: 24px;
+    font-size: 34px;
 	font-weight: bold;
 	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
 	margin-top: -5px;
+	width: 210px;
+    max-width: 210px;	
 }
 
 .sheet-rolltemplate-noc-comp span.sheet-templateaction,
 .sheet-rolltemplate-noc-attaque span.sheet-templateaction,
 .sheet-rolltemplate-noc-relance span.sheet-templateaction,
+.sheet-rolltemplate-noc-relancedegat span.sheet-templateaction,
 .sheet-rolltemplate-noc-noirceur span.sheet-templateaction {
-	font-size: inherit;
-    font-size: 20px;
+    font-size: 28px;
+	line-height: 30px;
 	font-weight: normal;
 	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
 }
 
 .sheet-rolltemplate-noc-attaque span.sheet-templatearme {
-	font-size: inherit;
-	font-size: 20px;
+	font-size: 28px;
 	font-weight: normal;
 	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
 }
 
 .sheet-rolltemplate-noc-attaque span.sheet-templatedps {
-	font-size: inherit;
-	font-size: 16px;
+	font-size: 18px;
 	font-weight: normal;
 	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
 	background-color: transparent;
+	font-family: "Courier New", Courier, monospace;
+}
+
+.sheet-rolltemplate-noc-attaque span.sheet-templatedpseffet {
+	font-size: 12px;
 }
 
 .sheet-rolltemplate-noc-attaque span.sheet-templatedps .inlinerollresult {
 	background-color: transparent;
 	border: 0px;
+	font-size: 18px;
+	text-shadow: 1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-family: "Courier New", Courier, monospace;
 }
 
-
 .sheet-rolltemplate-noc-comp .sheet-result,
 .sheet-rolltemplate-noc-attaque .sheet-result,
 .sheet-rolltemplate-noc-relance .sheet-result,
+.sheet-rolltemplate-noc-relancedegat .sheet-result,
 .sheet-rolltemplate-noc-noirceur .sheet-result,
 .sheet-rolltemplate-noc-fiel .sheet-result {
     font-size: 28px;
     text-align: center;
     color: white;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
-	padding-top: 15px;
+	padding-top: 5px;
 }
 
 .sheet-rolltemplate-noc-comp .sheet-result2,
@@ -2567,33 +2887,28 @@ span.sheet-afficheflag {
 
 .sheet-rolltemplate-noc-comp div.sheet-fiel,
 .sheet-rolltemplate-noc-attaque div.sheet-fiel,
-.sheet-rolltemplate-noc-relance div.sheet-fiel {
+.sheet-rolltemplate-noc-relance div.sheet-fiel,
+.sheet-rolltemplate-noc-relancedegat div.sheet-fiel {
     text-align: center;
     color: red;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
-	padding-top: 15px;
+	padding-top: 5px;
 	padding-bottom: 5px;
-	font-size: 18px;
+	font-size: 24px;
+	font-family: Caveat;
+	height:auto;
+	line-height:20px;
 }
 
-
 .sheet-rolltemplate-noc-noirceur .sheet-resultnoirceur {
     font-size: 20px;
     text-align: center;
     color: red;
 	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
-	padding-top: 15px;
+	padding-top: 10px;
 	padding-bottom: 5px;
 }
 
-.sheet-rolltemplate-noc-fiel .sheet-resultfiel {
-	font-size: 30px;
-    text-align: center;
-    color: white;
-	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
-	padding-top:140px;
-}
-
 .sheet-rolltemplate-noc-comp .sheet-attr,
 .sheet-rolltemplate-noc-attaque .sheet-attr {
     padding-left: 10px;
@@ -2610,6 +2925,7 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-comp .inlinerollresult,
 .sheet-rolltemplate-noc-attaque .inlinerollresult,
 .sheet-rolltemplate-noc-relance .inlinerollresult,
+.sheet-rolltemplate-noc-relancedegat .inlinerollresult,
 .sheet-rolltemplate-noc-noirceur .inlinerollresult,
 .sheet-rolltemplate-noc-fiel .inlinerollresult {
     background-color: transparent;
@@ -2629,6 +2945,7 @@ span.sheet-afficheflag {
 .sheet-rolltemplate-noc-comp .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-attaque .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-relance .sheet-result .inlinerollresult,
+.sheet-rolltemplate-noc-relancedegat .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-noirceur .sheet-result .inlinerollresult,
 .sheet-rolltemplate-noc-fiel .sheet-result .inlinerollresult {
     background-color: transparent;
@@ -2638,24 +2955,82 @@ span.sheet-afficheflag {
 
 .sheet-rolltemplate-noc-comp .inlinerollresult.fullcrit,
 .sheet-rolltemplate-noc-attaque .inlinerollresult.fullcrit,
-.sheet-rolltemplate-noc-relance .inlinerollresult.fullcrit {
+.sheet-rolltemplate-noc-relance .inlinerollresult.fullcrit,
+.sheet-rolltemplate-noc-relancedegat .inlinerollresult.fullcrit,
+.sheet-rolltemplate-noc-attaque .inlinerollquantique.fullcrit {
     color: #3FB315;
     border: none;
 }
 
 .sheet-rolltemplate-noc-comp .inlinerollresult.fullfail,
 .sheet-rolltemplate-noc-attaque .inlinerollresult.fullfail,
-.sheet-rolltemplate-noc-relance .inlinerollresult.fullfail {
+.sheet-rolltemplate-noc-relance .inlinerollresult.fullfail,
+.sheet-rolltemplate-noc-relancedegat .inlinerollresult.fullfail,
+.sheet-rolltemplate-noc-attaque .inlinerollquantique.fullfail {
     color: red;
     border: none;
 }
 
 .sheet-rolltemplate-noc-comp .inlinerollresult.importantroll,
 .sheet-rolltemplate-noc-attaque .inlinerollresult.importantroll,
-.sheet-rolltemplate-noc-relance .inlinerollresult.importantroll {
+.sheet-rolltemplate-noc-relance .inlinerollresult.importantroll,
+.sheet-rolltemplate-noc-relancedegat .inlinerollresult.importantroll {
 	color: #3FB315;
     border: none;
 }
 
+.sheet-rolltemplate-noc-fiel .sheet-resultfiel {
+	position: absolute;
+	z-index: 5;
+	margin-left: 180px;
+	margin-top: 67px;
+	transform: rotate(-15deg);
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultfiel .inlinerollresult{
+	font-size: 30px;
+	font-family: "Courier New", Courier, monospace;
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultmenace {
+	position: absolute;
+	z-index: 5;
+	font-size: 30px;
+	font-family: "Courier New", Courier, monospace;
+	margin-left: 57px;
+	margin-top: 80px;
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultmenace .inlinerollresult{
+	font-size: 30px;
+	font-family: "Courier New", Courier, monospace;
+}
+
+
+.sheet-rolltemplate-noc-fiel span {
+    font-size: 16px;
+    font-weight: bold;
+    text-align: center;
+	margin-top:-10px;
+	text-shadow:1px 1px 2px black, 0 0 4px black, 0 0 10px black;
+	font-family: Caveat;
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultfiellib span {
+    font-size: 20px;
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultmenacelib {
+	position: absolute;
+	margin-left: 40px;
+	margin-top: 105px;
+}
+
+.sheet-rolltemplate-noc-fiel .sheet-resultfiellib {
+	position: absolute;
+	margin-left: 140px;
+	margin-top: 77px;
+	transform: rotate(-20deg);
+}
 
 
diff --git a/NOC/NOC.html b/NOC/NOC.html
index b4aab8668d..a38acc80c8 100644
--- a/NOC/NOC.html
+++ b/NOC/NOC.html
@@ -1,13 +1,22 @@
 <rolltemplate class="sheet-rolltemplate-noc-fiel">
 <div class="templatemain">
+    <div class="resultmenace"> 
+	    {{menace}}
+	</div>   
+	<div class="resultmenacelib"> 
+		<span>MENACE</span>
+	</div> 
     <div class="resultfiel">       
-		{{#rollTotal() result 0}}<span style="color:#3FB315">{{result}}</span>{{/rollTotal() result 0}}
-		{{#rollTotal() result 1}}<span>{{result}}</span>{{/rollTotal() result 1}}
-		{{#rollTotal() result 2}}<span>{{result}}</span>{{/rollTotal() result 2}}
-		{{#rollTotal() result 3}}<span>{{result}}</span>{{/rollTotal() result 3}}
-		{{#rollTotal() result 4}}<span>{{result}}</span>{{/rollTotal() result 4}}
-		{{#rollTotal() result 5}}<span style="color:red">{{result}}</span>{{/rollTotal() result 5}}
-	</div>        
+		{{#rollTotal() result 0}}<div style="color:#3FB315">{{result}}</div>{{/rollTotal() result 0}}
+		{{#rollTotal() result 1}}<div>{{result}}</div>{{/rollTotal() result 1}}
+		{{#rollTotal() result 2}}<div>{{result}}</div>{{/rollTotal() result 2}}
+		{{#rollTotal() result 3}}<div>{{result}}</div>{{/rollTotal() result 3}}
+		{{#rollTotal() result 4}}<div>{{result}}</div>{{/rollTotal() result 4}}
+		{{#rollTotal() result 5}}<div style="color:red">{{result}}</div>{{/rollTotal() result 5}}
+	</div>   
+    <div class="resultfiellib">
+	    <span>FIEL</span>
+    </div>	
 </div>
 </rolltemplate>
 
@@ -34,7 +43,7 @@
 		<div class="templatenamediv">
 			<span class="templatename">{{name}}</span><br/>
 	    </div>
-        <span class="templateaction">{{action}}</span><br/>
+        <span class="templateaction">{{action}}</span>
 	</div>
     <div class="result"> 
 		{{#rollGreater() result 0}}
@@ -55,6 +64,33 @@
 </div>
 </rolltemplate>
 
+<rolltemplate class="sheet-rolltemplate-noc-relancedegat">
+<div class="templatemain">
+    <div class="templatethdiv">
+		<div class="templatenamediv">
+			<span class="templatename">{{name}}</span><br/>
+	    </div>
+        <span class="templateaction">{{action}}</span>
+	</div>
+    <div class="result"> 
+		{{#rollGreater() result 0}}
+		    <span>+1 dégât</span>
+		{{/rollGreater() result 0}}
+		{{#rollLess() result 1}}
+		    <span>Echec</span>
+		{{/rollLess() result 1}}
+	    {{#rollWasCrit() result}} 
+	        {{relanceJetdegat}}
+	    {{/rollWasCrit() result}}
+	</div>  
+    <div class="fiel">	
+		{{#rollWasFumble() result}}
+		    <span>!! Fiel détecté !!</span>
+		{{/rollWasFumble() result}}	
+	</div>
+</div>
+</rolltemplate>
+
 <rolltemplate class="sheet-rolltemplate-noc-comp">
 <div class="templatemain">
     <div class="templatethdiv">
@@ -106,7 +142,10 @@
 		</div>
         <span class="templateaction">{{action}} avec</span><br/>
 		<span class="templatearme">{{arme}}</span><br/>
-		<span class="templatedps">(dégats: {{DPS}})</span>
+		<span class="templatedps">Dégats: {{DPS}}{{#rollGreater() enoire 0}} +{{enoire}} (Noirceur){{/rollGreater() enoire 0}}{{#rollGreater() quantiquecomp 0}} +{{quantique}} (Noirceur){{/rollGreater() quantiquecomp 0}}</span><br>
+	    {{#effet1}}<span class="templatedps templatedpseffet">{{effet1}}</span><br>{{/effet1}}
+		{{#effet2}}<span class="templatedps templatedpseffet">{{effet2}}</span><br>{{/effet2}}
+		{{#effet3}}<span class="templatedps templatedpseffet">{{effet3}}</span>{{/effet3}}
 	</div>
 	<div class="attr">
             {{#attr}}
@@ -137,22 +176,39 @@
 	    {{#rollWasCrit() result}} 
 	        {{relanceJet}}
 	    {{/rollWasCrit() result}}
+		{{#rollWasCrit() quantique}} 
+	        {{relanceJetdegat}}
+	    {{/rollWasCrit() quantique}}
 	</div>   
     <div class="fiel">	
 		{{#rollWasFumble() result}}
-		<span>!! Fiel détecté !!</span>
+		<span>!! Fiel détecté !!</span><br>
 		{{/rollWasFumble() result}}	
+		{{#rollWasFumble() quantique}}
+		<span>!! Fiel détecté (dégât) !!</span>
+		{{/rollWasFumble() quantique}}	
 	</div>	
 </div>
 </rolltemplate>
 
 <input type="radio" class="sheet-typefiche sheet-flag-PJ" name="attr_typefiche" value="1" checked/><span class="PJ">PJ</span>
 <input type="radio" class="sheet-typefiche sheet-flag-PNJ" name="attr_typefiche" value="2"/><span class="PNJ">PNJ</span>
-<input type="radio" class="sheet-typefiche sheet-flag-fiel" name="attr_typefiche" value="3"/><span class="fiel">Fiel</span>
+<input type="radio" class="sheet-typefiche sheet-flag-fiel" name="attr_typefiche" value="3"/><span class="fiel">FIEL</span>
 <div class="sheet-section-fiel">
     <div class="affichage-fiel">
-	    <input type="text" class="compteurfiel" name="attr_compteurfiel" value="0"/><br>
-	    <div class="afficheurfiel"><button type="roll" name="roll_fiel" title="Informer les joueurs du taux de fiel" value="&{template:noc-fiel} {{name=FIEL}} {{result=[[@{compteurfiel}]]}}"></button></div>
+	    <input type="text" class="compteurmenace" name="attr_compteurmenace" value="0"/>
+		<div class="menace">
+		    <span>MENACE</span>
+		</div>
+		<div class="compteurfiel2">
+		    <input type="text" class="compteurfiel" name="attr_compteurfiel" value="0"/>
+		</div>
+		<div class="fielspan">
+		    <span>FIEL</span>
+		</div>
+        <div class="fielroll">
+		     <button type="roll" class="indiquefiel" name="roll_fiel" title="Informer les joueurs du taux de fiel" value="&{template:noc-fiel} {{menace=[[@{compteurmenace}]]}} {{result=[[@{compteurfiel}]]}}"></button>
+	    </div>
 	</div>
 </div>
 <div class="sheet-section-PNJ">
@@ -286,10 +342,10 @@
                 <div class="tir-title-PNJ"><label class="tir-title-label" data-i18n="tir-u">ARMES DE TIR</label></div> 
 				<div class="tir-th">
                     <span style="width:215px;" class="input-info header-equip" data-i18n="Description-u">Description</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="dps-u">DPS</span> 
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="munitions-u">Mun</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="munitionsmax-u">Mun max</span>
-                    <span style="width:70px;" class="input-info header-equip-armure2"data-i18n="armetalent-u">Talent</span>              
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="dps-u">DPS</span> 
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="munitions-u">Mun</span>
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="munitionsmax-u">Mun max</span>
+                    <span style="width:70px;" class="input-info header-equip-armure2" data-i18n="armetalent-u">Talent</span>              
                     <span style="width:40px;" class="input-info header-equip-roll"></span> 
                 </div> 
                 <fieldset class="repeating_projectiles">
@@ -302,13 +358,68 @@
                         <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degattir"/>
                         <input value="0" style="text-align:center" type="text" class="input-munitions" name="attr_munitions"/>
 				        <input value="0" style="text-align:center" type="text" class="input-munitionsmax" name="attr_munitionsmax"/>             
-				        <input type="checkbox" class="input-talent" name="attr_tirtalent"/>
+				        <input type="checkbox" class="input-talent" name="attr_tirtalent" data-i18n-title="talent-t"/>
 					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="0"/>
-						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button><button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
-                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{relanceJet=[Relance !](~repeating_tir_repeatingd10GM)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait1" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait2" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait3" data-i18n-placeholder="trait-p"/>
+						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+						<button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>
+                        <button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10degatGM" value="/w gm &{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
+                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button>
+						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
+                        <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait1'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait1effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue1" name="attr_trait1value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2" name="attr_trait2flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2enoire" name="attr_trait2flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2quantique" name="attr_trait2flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait2'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait2effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue2" name="attr_trait2value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3" name="attr_trait3flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3enoire" name="attr_trait3flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3quantique" name="attr_trait3flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait3'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait3effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue3" name="attr_trait3value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3quantique" name="attr_degatquantique" value="0"/></div>	
                     </div>
 				</div>
                 </fieldset>
@@ -317,14 +428,14 @@
                 <div class="cac-title-PNJ"><label class="cac-title-label" data-i18n="cac-u">ARMES DE CONTACT</label></div> 
 				<div class="cac-th">
                     <span style="width:215px;" class="input-info header-equip" data-i18n="Description-u">Description</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="dps-u">DPS</span> 
-                    <span style="width:70px;" class="input-info header-equip-armure2"data-i18n="armetalent-u">Talent</span>              
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="dps-u">DPS</span> 
+                    <span style="width:70px;" class="input-info header-equip-armure2" data-i18n="armetalent-u">Talent</span>              
                     <span style="width:40px;" class="input-info header-equip-roll"></span> 
                 </div> 
 				<div class="cac-all-mainsnues">
 				    <div class="cac-gauche">
                         <input type="text" class="input-info inputarmenom" name="attr_armenom-mainsnues" value="Mains nues" disabled="true"/><br>
-                        <TEXTAREA class="armeinfo" name="attr_armeinfo-mainsnues" disabled="true">Pieds, poings et même coup de tête</textarea>
+                        <TEXTAREA class="armeinfo armeinfo-mainsnues" name="attr_armeinfo-mainsnues" disabled="true">Pieds, poings et même coup de tête</textarea>
 					</div>
 					<div class="cac-droite">
 					    <input value="[[@{constitution}+1]]" style="text-align:center" type="text" class="input-degat" name="attr_degatcac-mainsnues" disabled="true"/>            
@@ -340,13 +451,68 @@
 					</div>
 					<div class="cac-droite">
 					    <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degatcac"/>            
-                        <input type="checkbox" class="input-talent" name="attr_cactalent"/>
+                        <input type="checkbox" class="input-talent" name="attr_cactalent" data-i18n-title="talent-t"/>
                         <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="0"/>
-                        <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button><button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>						
-                        <button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{relanceJet=[Relance !](~repeating_cac_repeatingd10GM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait4" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait5" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait6" data-i18n-placeholder="trait-p"/>
+                        <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+						<button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10GM" value="/w gm &{template:noc-relance} {{relanceJet=[Relance !](~d10GM)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>						
+						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
+                        <button style="display:none" type="roll" class="CHd10GM" name="roll_repeatingd10degatGM" value="/w gm &{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>
+						<button type="roll" class="input-jetdps-PJ" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button>
+						<button type="roll" class="input-jetdps-GM" value="/w gm &{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10GM)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degatGM)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
+                        <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait1'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait1effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue1" name="attr_trait1value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2" name="attr_trait2flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2enoire" name="attr_trait2flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2quantique" name="attr_trait2flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait2'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait2effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue2" name="attr_trait2value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3" name="attr_trait3flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3enoire" name="attr_trait3flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3quantique" name="attr_trait3flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait3'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait3effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue3" name="attr_trait3value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3quantique" name="attr_degatquantique" value="0"/></div>
                     </div>
 				</div>
                 </fieldset>
@@ -423,8 +589,9 @@
                 </div>					
 			</div>
 			<div class="CHtotalBM">
-                <span class="CHdescription CHdescriptionbonusmalus">Total bonus/malus en attaque au contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button><br>
-                <span class="CHdescription CHdescriptionbonusmalus">Total bonus/malus en attaque au tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
+				<span class="CHdescription CHdescriptionbonusmalustitle">Total bonus/malus en attaque</span><br>
+                <span class="CHdescription CHdescriptionbonusmalus">Contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>
+			    <span class="CHdescription CHdescriptionbonusmalus">Tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
 			</div>
 		</div>			
 </div>
@@ -438,69 +605,69 @@
 	<div class="sheet-section-gen">
         <div class="sheet-identity">
 		    <div class="sheet-identity-gauche">
-			    <input type="text" style="width:320px" class="info infogrostitre" value="LIVRET DE CITOYEN" disabled="disabled"><br>
-			    <input type="text" style="width:70px" class="info" value="MÉMO A" disabled="disabled"/><br>
-			    <input type="text" style="width:180px" class="info" value="FICHE GÉNÉRALE P14" disabled="disabled"/><br>
-			    <input type="text" style="width:120px;margin-top:60px;" class="info infotitre" value="IDENTITÉ" disabled="disabled"/><br>
-			    <input type="text" style="width:95px" class="info" value="MATRICULE:" disabled="disabled"/><input type="text" class="input-info-id" value="4251352-1246627" disabled="disabled"/><br>
-			    <input type="text" style="width:160px" class="info" value="NOM DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_nom" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:115px" class="info" value="NOM D'USAGE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_nomusage" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:80px" class="info" value="PRÉNOMS:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_prenoms" data-i18n-placeholder="aremplir-p"/><br>
-                <input type="text" style="width:165px" class="info" value="DATE DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" value="3-241-74K523L" disabled="disabled"/><br>
-                <input type="text" style="width:165px" class="info" value="LIEU DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_lieunaissance" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:105px" class="info" value="ASCENDANCE:" disabled="disabled"/><br>
+			    <input type="text"  class="info infogrostitre" value="LIVRET DE CITOYEN" disabled="disabled"><br>
+			    <input type="text" style="width:60px" class="info" value="MÉMO A" disabled="disabled"/><br>
+			    <input type="text" style="width:170px" class="info" value="FICHE GÉNÉRALE P14" disabled="disabled"/><br>
+			    <input type="text" style="width:110px;margin-top:60px;" class="info infotitre" value="IDENTITÉ" disabled="disabled"/><br>
+			    <input type="text" style="width:85px" class="info" value="MATRICULE:" disabled="disabled"/><input type="text" class="input-info-id" value="4251352-1246627" disabled="disabled"/><br>
+			    <input type="text" style="width:145px" class="info" value="NOM DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_nom" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:105px" class="info" value="NOM D'USAGE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_nomusage" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:70px" class="info" value="PRÉNOMS:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_prenoms" data-i18n-placeholder="aremplir-p"/><br>
+                <input type="text" style="width:155px" class="info" value="DATE DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" value="3-241-74K523L" disabled="disabled"/><br>
+                <input type="text" style="width:155px" class="info" value="LIEU DE NAISSANCE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_lieunaissance" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:95px" class="info" value="ASCENDANCE:" disabled="disabled"/><br>
 			    <textarea type="text" style="height:40px" class="input-infobloc-id" name="attr_ascendance" data-i18n-placeholder="aremplir-p"></textarea><br>
-                <input type="text" style="width:115px" class="info" value="DESCENDANCE:" disabled="disabled"/><br>
+                <input type="text" style="width:105px" class="info" value="DESCENDANCE:" disabled="disabled"/><br>
 			    <textarea type="text" style="height:40px" class="input-infobloc-id" name="attr_descendance" data-i18n-placeholder="aremplir-p"></textarea><br>
-			    <input type="text" style="width:140px" class="info" value="STATUT MARITAL:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_statutmarital" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:210px" class="info" value="ANNEXE DE RATTACHEMENT:" disabled="disabled"/><br>
+			    <input type="text" style="width:130px" class="info" value="STATUT MARITAL:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_statutmarital" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:200px" class="info" value="ANNEXE DE RATTACHEMENT:" disabled="disabled"/><br>
 			    <textarea type="text" style="height:40px" class="input-infobloc-id" name="attr_annexerattachement" data-i18n-placeholder="aremplir-p"></textarea><br>
-			    <input type="text" style="width:265px" class="info" value="LIEU DE RÉSIDENCE ET ADRESSE:" disabled="disabled"/><br>
+			    <input type="text" style="width:255px" class="info" value="LIEU DE RÉSIDENCE ET ADRESSE:" disabled="disabled"/><br>
                 <textarea type="text" style="height:55px" class="input-infobloc-id" name="attr_adresse" data-i18n-placeholder="aremplir-p"></textarea><br>
-			    <input type="text" style="width:300px;margin-top:20px;" class="info infotitre"value="EFFORT ET CONTRIBUTION" disabled="disabled"/><br>
-			    <input type="text" style="width:195px" class="info" value="MINISTÈRE DE TUTELLE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_ministeretutelle" data-i18n-placeholder="aremplir-p"/><br>
-                <input type="text" style="width:120px" class="info" value="POSTE OCCUPÉ:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_poste" data-i18n-placeholder="aremplir-p"/><br>
-                <input type="text" style="width:200px" class="info" value="ÉLÉMENTS DE CARRIÈRE:" disabled="disabled"/><br>
+			    <input type="text" style="width:290px;margin-top:35px;" class="info infotitre"value="EFFORT ET CONTRIBUTION" disabled="disabled"/><br>
+			    <input type="text" style="width:175px" class="info" value="MINISTÈRE DE TUTELLE:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_ministeretutelle" data-i18n-placeholder="aremplir-p"/><br>
+                <input type="text" style="width:110px" class="info" value="POSTE OCCUPÉ:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_poste" data-i18n-placeholder="aremplir-p"/><br>
+                <input type="text" style="width:190px" class="info" value="ÉLÉMENTS DE CARRIÈRE:" disabled="disabled"/><br>
 			    <textarea type="text" style="height:50px" class="input-infobloc-id" name="attr_carriere" data-i18n-placeholder="aremplir-p"></textarea><br>
 			</div> 
 			<div class="sheet-identity-droite">
-			    <input type="text" style="width:260px;margin-left:130px;" class="info" value="DIRECTION DE LA COORDINATION" disabled="disabled"/><br>
-			    <input type="text" style="width:230px;margin-left:130px;" class="info" value="SÉRIE 3-K-001-PG-*25K845P"/ disabled="disabled"><br>
-			    <input type="text" style="width:55px;margin-left:130px;" class="info" value="BLOC:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_bloc" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:70px;margin-left:130px;" class="info" value="CLASSE:" disabled="disabled"/><input type="text" class="input-info-id"  value="22C" disabled="disabled"/><br>
-			    <input type="text" style="width:180px;margin-top:50px;" class="info infotitre" value="SIGNALEMENT" disabled="disabled"/><br>
-			    <input type="text" style="width:70px;margin-top:270px;" class="info" value="TAILLE:" disabled="disabled"/><input style="margin-top:270px;" type="text" class="input-info-id" name="attr_tailleid" data-i18n-placeholder="aremplir-p"/><br>
-		        <input type="text" style="width:160px" class="info" value="COULEUR DES YEUX:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_couleuryeux" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:185px" class="info" value="SIGNES PARTICULIERS:" disabled="disabled"/><br>
+			    <input type="text" style="width:250px;margin-left:170px;" class="info" value="DIRECTION DE LA COORDINATION" disabled="disabled"/><br>
+			    <input type="text" style="width:220px;margin-left:170px;" class="info" value="SÉRIE 3-K-001-PG-*25K845P"/ disabled="disabled"><br>
+			    <input type="text" style="width:45px;margin-left:170px;" class="info" value="BLOC:" disabled="disabled"/><input type="text" class="input-info-id" style="width:150px;" name="attr_bloc" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:60px;margin-left:170px;" class="info" value="CLASSE:" disabled="disabled"/><input type="text" class="input-info-id" style="width:150px;"  value="22C" disabled="disabled"/><br>
+			    <input type="text" style="width:170px;margin-top:50px;" class="info infotitre" value="SIGNALEMENT" disabled="disabled"/><br>
+			    <input type="text" style="width:65px;margin-top:275px;" class="info" value="TAILLE:" disabled="disabled"/><input style="margin-top:270px;" type="text" class="input-info-id" name="attr_tailleid" data-i18n-placeholder="aremplir-p"/><br>
+		        <input type="text" style="width:145px" class="info" value="COULEUR DES YEUX:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_couleuryeux" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:175px" class="info" value="SIGNES PARTICULIERS:" disabled="disabled"/><br>
 			    <textarea type="text" style="height:80px" class="input-infobloc-id" name="attr_signesparti" data-i18n-placeholder="aremplir-p"></textarea><br>
-			    <input type="text" style="width:120px;margin-top:15px;" class="info infotitre" value="SECURITÉ" disabled="disabled"/><br>
-			    <input type="text" style="width:130px" class="info" value="AUTORISATIONS:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_autori" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:175px" class="info" value="SÉJOURS EXTRA-BLOC:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_sejours" data-i18n-placeholder="aremplir-p"/><br>
-			    <input type="text" style="width:210px" class="info" value="SIGNALEMENTS(SÉCURITÉ):" disabled="disabled"/>
+			    <input type="text" style="width:110px;margin-top:15px;" class="info infotitre" value="SECURITÉ" disabled="disabled"/><br>
+			    <input type="text" style="width:120px" class="info" value="AUTORISATIONS:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_autori" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:165px" class="info" value="SÉJOURS EXTRA-BLOC:" disabled="disabled"/><input type="text" class="input-info-id" name="attr_sejours" data-i18n-placeholder="aremplir-p"/><br>
+			    <input type="text" style="width:200px" class="info" value="SIGNALEMENTS(SÉCURITÉ):" disabled="disabled"/>
 				<input style="display:none" type="checkbox" class="idsecuriteflg idsecuriteflgneant" name="attr_idsecuriteneantflg"/><span class="idsecurite idsecuriteneant">Néant</span>
                 <input style="display:none" type="checkbox" class="idsecuriteflg idsecuriteflgsignale" name="attr_idsecuritesignaleflg"/><span class="idsecurite idsecuritesignale" data-i18n-title="idsignale-t">Signalé</span>
 				<input style="display:none" type="checkbox" class="idsecuriteflg idsecuriteflgrecherche" name="attr_idsecuriterechercheflg"/><span class="idsecurite idsecuriterecherche" data-i18n-title="idrecherche-t">Criminel</span>
 				<input style="display:none" type="checkbox" class="idsecuriteflg idsecuriteflgpourchasse" name="attr_idsecuritepourchasseflg"/><span class="idsecurite idsecuritepourchasse" data-i18n-title="idpourchasse-t">Ennemi public</span><br>
-			    <input type="text" style="width:210px" class="info" value="SIGNALEMENTS(HARMONIE):" disabled="disabled"/>
+			    <input type="text" style="width:200px" class="info" value="SIGNALEMENTS(HARMONIE):" disabled="disabled"/>
 				<input style="display:none" type="checkbox" class="idharmonieflg idharmonieflgneant" name="attr_idharmonieneantflg"/><span class="idharmonie idharmonieneant">Néant</span>
                 <input style="display:none" type="checkbox" class="idharmonieflg idharmonieflgteinte" name="attr_idharmonieteinteflg"/><span class="idharmonie idharmonieteinte" data-i18n-title="idteinte-t">Teinté</span>
 				<input style="display:none" type="checkbox" class="idharmonieflg idharmonieflgpossede" name="attr_idharmoniepossedeflg"/><span class="idharmonie idharmoniepossede" data-i18n-title="idpossede-t">Possédé</span>
 				<input style="display:none" type="checkbox" class="idharmonieflg idharmonieflgcorrompu" name="attr_idharmoniecorrompuflg"/><span class="idharmonie idharmoniecorrompu" data-i18n-title="idcorrompu-t">Corrompu</span><br>
-				<input type="text" style="width:180px;font-size:13px;" class="info" value="1er trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur1' data-i18n-title="idtraitnoirceur-t">
+				<input type="text" style="width:190px;font-size:13px;" class="info" value="1er trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur1' data-i18n-title="idtraitnoirceur-t">
 			        <option value="0">Néant</option>
                     <option value="1" data-i18n-title="idviolence-t">Violence</option>
 					<option value="2" data-i18n-title="idmalaise-t">Malaise</option>
 					<option value="3" data-i18n-title="idHallucinations-t">Hallucinations</option>
 					<option value="4" data-i18n-title="idMauvaispenchants-t">Mauvais penchants</option>
                 </select><br>
-				<input type="text" style="width:180px;font-size:13px;" class="info" value="2ème trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur2' data-i18n-title="idtraitnoirceur-t">
+				<input type="text" style="width:190px;font-size:13px;" class="info" value="2ème trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur2' data-i18n-title="idtraitnoirceur-t">
 			        <option value="0">Néant</option>
                     <option value="1" data-i18n-title="idviolence-t">Violence</option>
 					<option value="2" data-i18n-title="idmalaise-t">Malaise</option>
 					<option value="3" data-i18n-title="idHallucinations-t">Hallucinations</option>
 					<option value="4" data-i18n-title="idMauvaispenchants-t">Mauvais penchants</option>
                 </select><br>
-				<input type="text" style="width:180px;font-size:13px;" class="info" value="3ème trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur3' data-i18n-title="idtraitnoirceur-t">
+				<input type="text" style="width:190px;font-size:13px;" class="info" value="3ème trait de noirceur:" disabled="disabled"/><select class="selectid selectidtraitnoirceur" name='attr_idtraitnoirceur3' data-i18n-title="idtraitnoirceur-t">
 			        <option value="0">Néant</option>
                     <option value="1" data-i18n-title="idviolence-t">Violence</option>
 					<option value="2" data-i18n-title="idmalaise-t">Malaise</option>
@@ -513,10 +680,10 @@
 		<div class="sheet-identityprivate">
 		    <div class="confidentiel"></div>
 		    <div class="identityprivatevcontent">
-                <input type="text" class="infoprivate" value="NOM DU JOUEUR:" style="width:120px"/><input type="text" class="input-info-idprivate" name="attr_nomjoueur" data-i18n-placeholder="aremplir-p"/><br>
-                <input type="text" class="infoprivate"value="CABALE:" style="width:70px"/><input type="text" class="input-info-idprivate" name="attr_cabale" data-i18n-placeholder="aremplir-p" /><br>
-				<input type="text" class="infoprivate"value="POIDS:" style="width:60px"/><input type="text" class="input-info-idprivate" name="attr_poids" data-i18n-placeholder="aremplir-p" /><br>
-				<input type="text" class="infoprivate"value="ARMES CONNUES:" style="width:125px"/><br>
+                <input type="text" class="infoprivate" value="NOM DU JOUEUR:" style="width:101px" disabled="true"/><input type="text" class="input-info-idprivate" name="attr_nomjoueur" data-i18n-placeholder="aremplir-p"/><br>
+                <input type="text" class="infoprivate" value="CABALE:" style="width:54px" disabled="true"/><input type="text" class="input-info-idprivate" name="attr_cabale" data-i18n-placeholder="aremplir-p" /><br>
+				<input type="text" class="infoprivate" value="POIDS:" style="width:47px" disabled="true"/><input type="text" class="input-info-idprivate" name="attr_poids" data-i18n-placeholder="aremplir-p" /><br>
+				<input type="text" class="infoprivate" value="ARMES CONNUES:" style="width:125px" disabled="true"/><br>
 				<textarea type="text" class="input-info-idprivatebloc" name="attr_armesconnues" data-i18n-placeholder="aremplir-p"></textarea>
 			</div>
 		</div>
@@ -538,8 +705,8 @@
 		        <option value="0">Non actif</option>
                     <option value="1" style="color:red">Traumatisé !</option><br>
                 </select>
-			    <label class="malusname namefatigue">Fatigue</label>
-			    <select class="malus malusfatigue" name='attr_malusfatigue'>
+			    <label class="malusname namefatigue" data-i18n-title="fatigue-t">Fatigue</label>
+			    <select class="malus malusfatigue" name='attr_malusfatigue' data-i18n-title="fatigue-t">
 			        <option value="0">Non actif</option>
                     <option value="1" style="color:red">Fatigué !</option>
                 </select>
@@ -553,8 +720,8 @@
 			        <option value="0">Non actif</option>
                     <option value="1" style="color:red">Blessé grave !</option><br>
                 </select>
-			    <label class="malusname namearrestation">Arrestation</label>
-			    <select class="malus malusarrestation" name='attr_malusarrestation'>
+			    <label class="malusname namearrestation" data-i18n-title="arrestation-t">Arrestation</label>
+			    <select class="malus malusarrestation" name='attr_malusarrestation' data-i18n-title="arrestation-t">
 			        <option value="0">Non actif</option>
                     <option value="1" style="color:red">Arrêté !</option>
                </select>
@@ -669,7 +836,7 @@
 		    <div class="points-vecu">
 			    <div class="caracteristique-backtitle2"></div>
 			    <label class="points-title" data-i18n="vecu-u"data-i18n-title="vecu-t">Vécu</label><br>
-				<div class="points-content">
+				<div class="points-content points-content-vecu">
                     <select class="points-select" name='attr_pointsvecu'>
 						<option value="0">0</option>
                         <option value="1">1</option>
@@ -681,7 +848,7 @@
 						<option value="7">7</option>
 						<option value="8">8</option>
                     </select>
-                    <span class="points-slash">/</span>
+                    <span class="points-slash points-slash-vecu">/</span>
                     <select class="points-select-max" name='attr_pointsvecumax'>
 						<option value="0">0</option>
                         <option value="1">1</option>
@@ -871,115 +1038,212 @@
 	
    <!-- Tab possessions -->
     <div class="sheet-section-equip">
-	    <div class="tab-contacts">
-	        <div class="contacts-title"><label class="contacts-title-label" data-i18n="CONTACTS-u">CONTACTS</label></div> 
-			<div class="contacts-th">
-                <span style="width:250px;text-align:center" class="input-info header-equip" data-i18n="Description-u"></span>
-				<span class="input-info header-equip-contact" data-i18n="faveur-u"></span>
-				<span class="input-info header-equip-contact"  data-i18n="faveurmax-u"></span>
-			</div>
-			<fieldset class="repeating_contacts" name="repeating_contacts">
-                <input type="text" style="width:250px;font-size:16px;margin-bottom:3px;" class="input-info input-infocontacts" name="attr_contact-nom"  data-i18n-placeholder="Name-p"/>
-				<input type="text" style="text-align:center;" class="inputcontact" name="attr_contactsfaveur" value="0"/>
-			    <input style="text-align:center;" class="inputcontact" name="attr_contactsfaveur_max" value="0+@{contacts}*2" disabled="true"/>
-			</fieldset>
+	    <div class="contactarmorCC">
+		    <input type="checkbox" class="contactsindex" name="attr_contactsindex" style="display:none;"/>
+			<input type="checkbox" class="contacts0" name="attr_contacts0" style="display:none;"  checked="true"/>
+	        <div class="tab-contacts">
+	            <div class="contacts-title"><label class="contacts-title-label" data-i18n="CONTACTS-u">CONTACTS</label></div> 
+			    <div class="contacts-th">
+                    <span style="width:250px;text-align:center" class="input-info header-equip" data-i18n="Description-u"></span>
+				    <span class="input-info header-equip-contact" data-i18n="faveur-u"></span>
+				    <span class="input-info header-equip-contact"  data-i18n="faveurmax-u"></span>
+			    </div>
+			    <fieldset class="repeating_contacts" name="repeating_contacts">
+                    <input type="text" style="width:250px;font-size:16px;margin-bottom:3px;" class="input-info input-infocontacts" name="attr_contact-nom"  data-i18n-placeholder="Name-p"/>
+				    <input type="text" style="text-align:center;" class="inputcontact" name="attr_contactsfaveur" value="0"/>
+			        <input style="text-align:center;" class="inputcontact" name="attr_contactsfaveur_max" value="@{contacts}*2" disabled="true"/>
+			    </fieldset>
+	        </div>
+		    <div class="tab-armure">
+	            <div class="armure-title"><label class="armure-title-label" data-i18n="armure-u">ARMURE</label></div> 
+			    <div class="armure-th">
+                    <span style="width:250px;text-align:center" class="input-info header-equip" data-i18n="Description-u"></span> 
+                    <span style="width:65px;text-align:center" class="input-info header-equip-armure" data-i18n="armurepts-u"></span>				
+				    <span style="width:65px;text-align:center" class="input-info header-equip-armure" data-i18n="defense-u"></span>
+			    </div>
+                <input style="width:250px;font-size:16px;margin-bottom:3px;" type="text" class="input-info input-infoarmure" name="attr_contact-nom"  data-i18n-placeholder="Name-p"/>
+		        <input value="0" type="text" style="text-align:center;" class="inputarmure" name='attr_armure'/>
+		        <input type="text" style="text-align:center;" class="inputarmure" name='attr_armureconst' type="text" value="@{armure}+@{constitution}" disabled="disabled"/>
+	        </div>
+			<input type="checkbox" class="cac0" name="attr_cac0" style="display:none;" checked="true"/>
+		    <div class="tab-cac">
+                <div class="cac-title"><label class="cac-title-label" data-i18n="cac-u">ARMES DE CONTACT</label></div> 
+				<div class="cac-th">
+                    <span style="width:215px;" class="input-info header-equip" data-i18n="Description-u">Description</span>
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="dps-u">DPS</span> 
+                    <span style="width:70px;" class="input-info header-equip-armure2" data-i18n="armetalent-u">Talent</span>              
+                    <span style="width:40px;" class="input-info header-equip-roll"></span> 
+                </div> 
+				<div class="cac-all-mainsnues">
+				    <div class="cac-gauche">
+                        <input type="text" class="input-info inputarmenom" name="attr_armenom-mainsnues" value="Mains nues" disabled="true"/><br>
+                        <TEXTAREA class="armeinfo armeinfo-mainsnues" name="attr_armeinfo-mainsnues" disabled="true">Pieds, poings et même coup de tête</textarea>
+					</div>
+					<div class="cac-droite">
+					    <input value="[[@{constitution}+1]]" style="text-align:center" type="text" class="input-degat" name="attr_degatcac-mainsnues" disabled="true"/>            
+                        <input type="checkbox" class="input-talent" name="attr_cactalent-mainsnues" checked disabled="true" data-i18n-title="talent-t"/>							
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}]]}}"></button><br>
+                    </div>
+				</div>
+                <fieldset class="repeating_cac">
+				<div class="cac-all">
+				    <div class="cac-gauche">
+                        <input type="text" class="input-info inputarmenom" name="attr_armenom" data-i18n-placeholder="Name-u"/><br>
+                        <TEXTAREA class="armeinfo" name="attr_armeinfo" data-i18n-placeholder="Description-u"></textarea>
+					</div>
+					<div class="cac-droite">
+					    <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degatcac"/>            
+                        <input type="checkbox" class="input-talent" name="attr_cactalent" data-i18n-title="talent-t"/>
+                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="0"/>
+                        <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+                        <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
+                        <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait1'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait1effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue1" name="attr_trait1value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2" name="attr_trait2flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2enoire" name="attr_trait2flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2quantique" name="attr_trait2flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait2'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait2effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue2" name="attr_trait2value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3" name="attr_trait3flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3enoire" name="attr_trait3flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3quantique" name="attr_trait3flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait3'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait3effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue3" name="attr_trait3value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3quantique" name="attr_degatquantique" value="0"/></div>
+                    </div>
+				</div>
+                </fieldset>
+            </div>
 	    </div>
-		<div class="tab-armure">
-	        <div class="armure-title"><label class="armure-title-label" data-i18n="armure-u">ARMURE</label></div> 
-			<div class="armure-th">
-                <span style="width:250px;text-align:center" class="input-info header-equip" data-i18n="Description-u"></span> 
-                <span style="width:65px;text-align:center" class="input-info header-equip-armure" data-i18n="armurepts-u"></span>				
-				<span style="width:65px;text-align:center" class="input-info header-equip-armure" data-i18n="defense-u"></span>
-			</div>
-            <input style="width:250px;font-size:16px;margin-bottom:3px;" type="text" class="input-info input-infoarmure" name="attr_contact-nom"  data-i18n-placeholder="Name-p"/>
-		    <input value="0" type="text" style="text-align:center;" class="inputarmure" name='attr_armure'/>
-		    <input type="text" style="text-align:center;" class="inputarmure" name='attr_armureconst' type="text" value="@{armure}+@{constitution}" disabled="disabled"/>
-	    </div>
-		<div class="Combathelper">
-		    <div class="Combathelper-title"><label class="Combathelper-title-label" data-i18n="Combathelper-u">AIDE AU COMBAT</label></div> 
-		    <div class="CHdivbonusmalus">
-                <span class="CHdescription CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="text" class="CHbonusmalus" name="attr_CHbonusmalus"/>
-			</div>
-			<div class="CHdivjets">
-                <span class="CHdescription CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
-				<span class="CHdescription CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive" name="esquive" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>
-				<span class="CHdescription CHdescriptionroll">Parade</span><button type="roll" class="CHparade" name="parade" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>										
-				<span class="CHdescription CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
-			</div>
-			<div class="CHdivcombobox">
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Portée</span>						
-					<select class="CHportee" name='attr_porte'>
-						<option value="-1">Bout portant</option>
-                        <option value="0">Portée courte</option>
-                        <option value="1">Portée moyenne</option>
-						<option value="2">Portée longue</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Opposants</span>
-					<select class="CHNombreopposants" name='attr_nbropposants'>
-                        <option value="0">1</option>
-                        <option value="1">2</option>
-					    <option value="2">3</option>
-                        <option value="3">4</option>
-					    <option value="4">5</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Couvert</span>
-					<select class="CHcouvert" name='attr_couvert'>
-						<option value="0">Aucun</option>
-						<option value="1">Faible</option>
-                        <option value="2">Fort</option>
-                    </select>
-				</div>
-                <div>
-					<span class="CHdescription CHdescriptioncombobox">Conditions</span>
-					<select class="CHconditions" name='attr_conditions'>
-						<option value="0">Claires</option>
-						<option value="1">Génantes</option>
-                        <option value="2">Épouvantables</option>
-                    </select>
-				</div>			
-			</div>	
-            <div class="CHdivcheckbox">
-				<div>
-                    <span class="CHdescription CHdescriptioncheckbox">Aversaire utilise son couvert</span>
-                    <select type="checkbox" class="CHcheckbox" name="attr_utilisecouvert">
-					    <option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>
-				<div>					
-                    <span class="CHdescription CHdescriptioncheckbox">Attaque préparée</span>
-					<select type="checkbox" class="CHcheckbox" name="attr_attaqueprepare">
-						<option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>
-				<div>					
-                    <span class="CHdescription CHdescriptioncheckbox">L'adversaire s'est jeté au sol</span>
-                    <select type="checkbox" class="CHcheckbox" name="attr_jetesol">
-						<option value="0">NON</option>
-						<option value="1">OUI</option>
-                    </select>
-                </div>					
-			</div>
-			<div class="CHtotalBM">
-                <span class="CHdescription CHdescriptionbonusmalus">Total bonus/malus en attaque au contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button><br>
-                <span class="CHdescription CHdescriptionbonusmalus">Total bonus/malus en attaque au tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
-			</div>
-		</div>
-		<div class="divtircac">
+		<div class="divtirCH">
+		    <div class="Combathelper">
+		        <div class="Combathelper-title"><label class="Combathelper-title-label" data-i18n="Combathelper-u">AIDE AU COMBAT</label></div> 
+		        <div class="CHdivbonusmalus">
+                    <span class="CHdescription CHdescriptionBM">Ajouter Bonus/Malus</span><input value="0" type="text" class="CHbonusmalus" name="attr_CHbonusmalus"/>
+			    </div>
+			    <div class="CHdivjets">
+                    <span class="CHdescription CHdescriptionroll">Initiative</span><button type="roll" class="CHinitiative" name="initiative" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=INITIATIVE}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{instinct-u}}} {{skill_num=[[@{instinct_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{instinct|max} &{tracker}]]}}"></button>
+				    <span class="CHdescription CHdescriptionroll">Esquive</span><button type="roll" class="CHesquive" name="esquive" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente d'esquiver}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>
+				    <span class="CHdescription CHdescriptionroll">Parade</span><button type="roll" class="CHparade" name="parade" value="&{template:noc-comp} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=tente de parer}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action_max}]]}} {{skill=^{deplacement-u}}} {{skill_num=[[@{deplacement_max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{deplacement|max}-@{nbropposants}]]}}"></button>										
+				   <span class="CHdescription CHdescriptionroll">Relance D10</span><button type="roll" class="CHd10" name="roll_d10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
+			    </div>
+			    <div class="CHdivcombobox">
+                    <div>
+					    <span class="CHdescription CHdescriptioncombobox">Portée</span>						
+					    <select class="CHportee" name='attr_porte'>
+						    <option value="-1">Bout portant</option>
+                            <option value="0">Portée courte</option>
+                            <option value="1">Portée moyenne</option>
+						    <option value="2">Portée longue</option>
+                        </select>
+				    </div>
+                    <div>
+					    <span class="CHdescription CHdescriptioncombobox">Opposants</span>
+					    <select class="CHNombreopposants" name='attr_nbropposants'>
+                            <option value="0">1</option>
+                            <option value="1">2</option>
+					        <option value="2">3</option>
+                            <option value="3">4</option>
+					        <option value="4">5</option>
+                        </select>
+				    </div>
+                    <div>
+					    <span class="CHdescription CHdescriptioncombobox">Couvert</span>
+					    <select class="CHcouvert" name='attr_couvert'>
+						    <option value="0">Aucun</option>
+						    <option value="1">Faible</option>
+                            <option value="2">Fort</option>
+                        </select>
+				    </div>
+                    <div>
+					    <span class="CHdescription CHdescriptioncombobox">Conditions</span>
+					    <select class="CHconditions" name='attr_conditions'>
+						    <option value="0">Claires</option>
+						    <option value="1">Génantes</option>
+                            <option value="2">Épouvantables</option>
+                        </select>
+				    </div>			
+			    </div>	
+                <div class="CHdivcheckbox">
+				    <div>
+                        <span class="CHdescription CHdescriptioncheckbox">Adversaire utilise son couvert</span>
+                        <select type="checkbox" class="CHcheckbox" name="attr_utilisecouvert">
+					        <option value="0">NON</option>
+						    <option value="1">OUI</option>
+                        </select>
+                    </div>
+				    <div>					
+                        <span class="CHdescription CHdescriptioncheckbox">Attaque préparée</span>
+					    <select type="checkbox" class="CHcheckbox" name="attr_attaqueprepare">
+						    <option value="0">NON</option>
+						    <option value="1">OUI</option>
+                        </select>
+                    </div>
+				    <div>					
+                        <span class="CHdescription CHdescriptioncheckbox">Adversaire s'est jeté au sol</span>
+                        <select type="checkbox" class="CHcheckbox" name="attr_jetesol">
+						    <option value="0">NON</option>
+						    <option value="1">OUI</option>
+                        </select>
+                    </div>					
+			    </div>
+			    <div class="CHtotalBM">
+				    <span class="CHdescription CHdescriptionbonusmalustitle">Total bonus/malus en attaque</span><br>
+                    <span class="CHdescription CHdescriptionbonusmalus">Contact</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusCAC" disabled="disabled" value="@{attaqueprepare}+@{jetesol}-(@{conditions}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>
+					<span class="CHdescription CHdescriptionbonusmalus">Tir</span><input type="text" class="CHbonusmalus CHbonusmalusdsbl" name="attr_CHbonusmalusTIR" disabled="disabled" value="@{attaqueprepare}-(@{couvert}+@{conditions}+@{porte}+@{jetesol}+@{utilisecouvert}+@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue})+@{CHbonusmalus}"/></button>							
+			    </div>
+		    </div>
+			<input type="checkbox" class="tir0" name="attr_tir0" style="display:none;" checked="true"/>
             <div class="tab-tir">
                 <div class="tir-title"><label class="tir-title-label" data-i18n="tir-u">ARMES DE TIR</label></div> 
 				<div class="tir-th">
                     <span style="width:215px;" class="input-info header-equip" data-i18n="Description-u">Description</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="dps-u">DPS</span> 
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="munitions-u">Mun</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="munitionsmax-u">Mun max</span>
-                    <span style="width:70px;" class="input-info header-equip-armure2"data-i18n="armetalent-u">Talent</span>              
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="dps-u">DPS</span> 
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="munitions-u">Mun</span>
+				    <span style="width:55px;" class="input-info header-equip-armure" data-i18n="munitionsmax-u">Mun max</span>
+                    <span style="width:70px;" class="input-info header-equip-armure2" data-i18n="armetalent-u">Talent</span>              
                     <span style="width:40px;" class="input-info header-equip-roll"></span> 
                 </div> 
                 <fieldset class="repeating_projectiles">
@@ -992,56 +1256,73 @@
                         <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degattir"/>
                         <input value="0" style="text-align:center" type="text" class="input-munitions" name="attr_munitions"/>
 				        <input value="0" style="text-align:center" type="text" class="input-munitionsmax" name="attr_munitionsmax"/>             
-				        <input type="checkbox" class="input-talent" name="attr_tirtalent"/>
+				        <input type="checkbox" class="input-talent" name="attr_tirtalent" data-i18n-title="talent-t"/>
 					    <input style="display:none" type="number" class="input-talentflag" name="attr_tirflag" value="0"/>
 						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait1" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait2" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait3" data-i18n-placeholder="trait-p"/>
-                    </div>
-				</div>
-                </fieldset>
-            </div>
-            <div class="tab-cac">
-                <div class="cac-title"><label class="cac-title-label" data-i18n="cac-u">ARMES DE CONTACT</label></div> 
-				<div class="cac-th">
-                    <span style="width:215px;" class="input-info header-equip" data-i18n="Description-u">Description</span>
-				    <span style="width:55px;" class="input-info header-equip-armure"data-i18n="dps-u">DPS</span> 
-                    <span style="width:70px;" class="input-info header-equip-armure2"data-i18n="armetalent-u">Talent</span>              
-                    <span style="width:40px;" class="input-info header-equip-roll"></span> 
-                </div> 
-				<div class="cac-all-mainsnues">
-				    <div class="cac-gauche">
-                        <input type="text" class="input-info inputarmenom" name="attr_armenom-mainsnues" value="Mains nues" disabled="true"/><br>
-                        <TEXTAREA class="armeinfo" name="attr_armeinfo-mainsnues" disabled="true">Pieds, poings et même coup de tête</textarea>
-					</div>
-					<div class="cac-droite">
-					    <input value="[[@{constitution}+1]]" style="text-align:center" type="text" class="input-degat" name="attr_degatcac-mainsnues" disabled="true"/>            
-                        <input type="checkbox" class="input-talent" name="attr_cactalent-mainsnues" checked disabled="true"/>							
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=ses mains nues}} {{DPS=[[@{degatcac-mainsnues}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}]]}}"></button><br>
-                    </div>
-				</div>
-                <fieldset class="repeating_cac">
-				<div class="cac-all">
-				    <div class="cac-gauche">
-                        <input type="text" class="input-info inputarmenom" name="attr_armenom" data-i18n-placeholder="Name-u"/><br>
-                        <TEXTAREA class="armeinfo" name="attr_armeinfo" data-i18n-placeholder="Description-u"></textarea>
-					</div>
-					<div class="cac-droite">
-					    <input value="0" style="text-align:center" type="text" class="input-degat" name="attr_degatcac"/>            
-                        <input type="checkbox" class="input-talent" name="attr_cactalent"/>
-                        <input style="display:none" type="number" class="input-talentflag" name="attr_cacflag" value="0"/>
-                        <button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10" value="&{template:noc-relance} {{relanceJet=[Relance !](~d10)}} {{name=@{character_name}}} {{action=relance un D10 !}} {{result=[[{1d10}>8]]}}"></button>						
-                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{relanceJet=[Relance !](~repeating_cac_repeatingd10)}} {{name=@{character_name}}} {{action=attaque}} {{arme=@{armenom}}} {{DPS=[[@{degatcac}+@{constitution}]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmaluscac}+{@cacflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmaluscac}-@{cacflag}]]}}"></button><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait4" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait5" data-i18n-placeholder="trait-p"/><br>
-                        <input type="text" class="input-info input-trait" name="attr_trait6" data-i18n-placeholder="trait-p"/>
+						<button style="display:none" type="roll" class="CHd10" name="roll_repeatingd10degat" value="&{template:noc-relancedegat} {{relanceJetdegat=[Relance dégât !](~repeating_cac_repeatingd10degat)}} {{name=@{character_name}}} {{action=relance dégâts !}} {{result=[[{1d10}>8]]}}"></button>						
+                        <button type="roll" class="input-jetdps" value="&{template:noc-attaque} {{effet1=@{trait1effet}}} {{effet2=@{trait2effet}}} {{effet3=@{trait3effet}}} {{relanceJet=[Relance !](~repeating_tir_repeatingd10)}} {{relanceJetdegat=[Relance dégât !](~repeating_tir_repeatingd10degat)}} {{name=@{character_name}}} {{action=tire}} {{arme=@{armenom}}} {{DPS=@{degattir}}} {{enoire=[[@{degatenoire}]]}} {{quantiquecomp=[[@{degatquantique}]]}} {{quantique=[[{(@{degatquantique})d10}>8]]}} {{mod_num1=[[@{malustraumaleger}+@{malusblessleger}]]}} {{mod_num2=[[@{malustraumagrave}+@{malusblessgrave}+@{malusfatigue}]]}} {{mod_num3=[[@{CHbonusmalusTIR}+{@tirflag}]]}} {{attr=^{action-u}}} {{attr_num=[[@{action|max}]]}} {{skill=^{combat-u}}} {{skill_num=[[@{combat|max}]]}}  {{result=[[({(?{Combien de dés voulez-vous lancer ? (max=@{action|max})|0})d10}>8)+@{combat|max}-@{CHbonusmalusTIR}-@{tirflag}]]}}"></button><br>
+                        <div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1" name="attr_trait1flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1enoire" name="attr_trait1flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox1quantique" name="attr_trait1flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait1'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait1effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue1" name="attr_trait1value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue1quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2" name="attr_trait2flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2enoire" name="attr_trait2flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox2quantique" name="attr_trait2flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait2'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait2effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue2" name="attr_trait2value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue2quantique" name="attr_degatquantique" value="0"/></div>
+						<div class="trait"><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3" name="attr_trait3flag"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3enoire" name="attr_trait3flagenoire"/><input type="checkbox" class="input-info input-traitcheckbox traitcheckbox3quantique" name="attr_trait3flagquantique"/>
+						<select class="input-info input-traitselect" name='attr_trait3'>
+						    <option value="-1" style="color:grey"></option>
+							<option value="0">Choc</option>
+						    <option value="1">Complexe</option>
+							<option value="2">Encombrant</option>
+							<option value="3">Energie noire</option>
+							<option value="4">Limité</option>
+							<option value="5">Long</option>
+							<option value="6">Longue portée</option>
+							<option value="7">Multiple</option>
+							<option value="8">Perforant</option>
+							<option value="9">Quantique</option>
+							<option value="10">Récurrent</option>
+							<option value="11">Tranchant</option>
+						</select>
+						<input type="text" name="attr_trait3effet" value="" style="display:none;"/>
+						<input type="text" class="input-info input-traitvalue input-traitvalue3" name="attr_trait3value" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3enoire" name="attr_degatenoire" value="0"/><input type="text" class="input-info input-traitvalue input-traitvalue3quantique" name="attr_degatquantique" value="0"/></div>						
                     </div>
 				</div>
                 </fieldset>
             </div>
 		</div>
+		<input type="checkbox" class="equip01" name="attr_equip01" style="display:none;" checked="true"/>
+		<input type="checkbox" class="equip02" name="attr_equip02" style="display:none;" checked="true"/>
+		<input type="checkbox" class="equip03" name="attr_equip03" style="display:none;" checked="true"/>
         <div class="tab-equip">
             <div class="equip-title"><label class="equip-title-label" data-i18n="EQUIPMENTS-u">EQUIPMENT</label></div> 
             <div class="line-equip1">
@@ -1053,14 +1334,14 @@
 			</div> 
             <div class="line-equip2">
                 <span style="width:250px;" class="input-info header-equip" data-i18n="Description-u">Description</span> 
-                <fieldset class="repeating_equip" name="repeating_equip2">
+                <fieldset class="repeating_equip2" name="repeating_equip2">
                     <input type="text" class="input-info input-infoequip" name="attr_equip2-Description"  data-i18n-placeholder="Name-p"/><br>
                     <TEXTAREA class="equip-Effet" name='attr_equip2-Effet' data-i18n-placeholder="Description-u"></textarea>
                 </fieldset>
 			</div>
             <div class="line-equip3">
                 <span style="width:250px;" class="input-info header-equip" data-i18n="Description-u">Description</span> 
-                <fieldset class="repeating_equip" name="repeating_equip3">
+                <fieldset class="repeating_equip3" name="repeating_equip3">
                     <input type="text" class="input-info input-infoequip" name="attr_equip3-Description"  data-i18n-placeholder="Name-p"/><br>
                     <TEXTAREA class="equip-Effet" name='attr_equip3-Effet' data-i18n-placeholder="Description-u"></textarea>
                 </fieldset>
@@ -1077,7 +1358,350 @@
 </div>
 
 <script type="text/worker">
-on("sheet:opened change:bless1 change:bless2 change:bless3 change:bless4 change:bless5 change:bless6 change:bless7 change:bless8 change:bless9 change:bless10", function() {
+on("sheet:opened", function() {
+    getAttrs(["vie","erudition","technique","action","statut","ame","social","malustraumaleger","malusblessleger"], function(values) {
+        setAttrs({vie_max:parseInt(values.vie)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({erudition_max:parseInt(values.erudition)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({technique_max:parseInt(values.technique)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({action_max:parseInt(values.action)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({statut_max:parseInt(values.statut)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({ame_max:parseInt(values.ame)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)})
+		setAttrs({social_max:parseInt(values.social)+parseInt(values.malustraumaleger)+parseInt(values.malusblessleger)});
+    });
+});
+
+
+
+on("change:repeating_cac:trait1 change:repeating_cac:trait1value", function() {
+	getAttrs(["repeating_cac_trait1","repeating_cac_trait1value"], function(values) {
+	    setAttrs({repeating_cac_trait1flag:0});
+		setAttrs({repeating_cac_trait1flagenoire:0});
+		setAttrs({repeating_cac_trait1flagquantique:0});
+		setAttrs({repeating_cac_degatenoire:0});
+		setAttrs({repeating_cac_degatquantique:0});
+		switch (values.repeating_cac_trait1) {
+		case "0":
+		    setAttrs({repeating_cac_trait1effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_cac_trait1flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_cac_trait1flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_cac_trait1effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_cac_trait1flag:"on"});
+			setAttrs({repeating_cac_trait1effet:"(" + values.repeating_cac_trait1value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_cac_trait1effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_cac_trait1flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_cac_trait1effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_cac_trait1effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_cac:trait2 change:repeating_cac:trait2value", function() {
+	getAttrs(["repeating_cac_trait2","repeating_cac_trait2value"], function(values) {
+	    setAttrs({repeating_cac_trait2flag:0});
+		setAttrs({repeating_cac_trait2flagenoire:0});
+		setAttrs({repeating_cac_trait2flagquantique:0});
+		setAttrs({repeating_cac_degatenoire:0});
+		setAttrs({repeating_cac_degatquantique:0});
+		switch (values.repeating_cac_trait2) {
+		case "0":
+		    setAttrs({repeating_cac_trait2effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_cac_trait2flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_cac_trait2flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_cac_trait2effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_cac_trait2flag:"on"});
+			setAttrs({repeating_cac_trait2effet:"(" + values.repeating_cac_trait2value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_cac_trait2effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_cac_trait2flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_cac_trait2effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_cac_trait2effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_cac:trait3 change:repeating_cac:trait3value", function() {
+	getAttrs(["repeating_cac_trait3","repeating_cac_trait3value"], function(values) {
+	    setAttrs({repeating_cac_trait3flag:0});
+		setAttrs({repeating_cac_trait3flagenoire:0});
+		setAttrs({repeating_cac_trait3flagquantique:0});
+		setAttrs({repeating_cac_degatenoire:0});
+		setAttrs({repeating_cac_degatquantique:0});
+		switch (values.repeating_cac_trait3) {
+		case "0":
+		    setAttrs({repeating_cac_trait3effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_cac_trait3flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_cac_trait3flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_cac_trait3effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_cac_trait3flag:"on"});
+			setAttrs({repeating_cac_trait3effet:"(" + values.repeating_cac_trait3value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_cac_trait3effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_cac_trait3flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_cac_trait3effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_cac_trait3effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_projectiles:trait1 change:repeating_projectiles:trait1value", function() {
+	getAttrs(["repeating_projectiles_trait1","repeating_projectiles_trait1value"], function(values) {
+	    setAttrs({repeating_projectiles_trait1flag:0});
+		setAttrs({repeating_projectiles_trait1flagenoire:0});
+		setAttrs({repeating_projectiles_trait1flagquantique:0});
+		setAttrs({repeating_projectiles_degatenoire:0});
+		setAttrs({repeating_projectiles_degatquantique:0});
+		switch (values.repeating_projectiles_trait1) {
+		case "0":
+		    setAttrs({repeating_projectiles_trait1effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_projectiles_trait1flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_projectiles_trait1flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_projectiles_trait1effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_projectiles_trait1flag:"on"});
+			setAttrs({repeating_projectiles_trait1effet:"(" + values.repeating_projectiles_trait1value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_projectiles_trait1effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_projectiles_trait1flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_projectiles_trait1effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_projectiles_trait1effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_projectiles:trait2 change:repeating_projectiles:trait2value", function() {
+	getAttrs(["repeating_projectiles_trait2","repeating_projectiles_trait2value"], function(values) {
+	    setAttrs({repeating_projectiles_trait2flag:0});
+		setAttrs({repeating_projectiles_trait2flagenoire:0});
+		setAttrs({repeating_projectiles_trait2flagquantique:0});
+		setAttrs({repeating_projectiles_degatenoire:0});
+		setAttrs({repeating_projectiles_degatquantique:0});
+		switch (values.repeating_projectiles_trait2) {
+		case "0":
+		    setAttrs({repeating_projectiles_trait2effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_projectiles_trait2flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_projectiles_trait2flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_projectiles_trait2effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_projectiles_trait2flag:"on"});
+			setAttrs({repeating_projectiles_trait2effet:"(" + values.repeating_projectiles_trait2value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_projectiles_trait2effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_projectiles_trait2flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_projectiles_trait2effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_projectiles_trait2effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_projectiles:trait3 change:repeating_projectiles:trait3value", function() {
+	getAttrs(["repeating_projectiles_trait3","repeating_projectiles_trait3value"], function(values) {
+	    setAttrs({repeating_projectiles_trait3flag:0});
+		setAttrs({repeating_projectiles_trait3flagenoire:0});
+		setAttrs({repeating_projectiles_trait3flagquantique:0});
+		setAttrs({repeating_projectiles_degatenoire:0});
+		setAttrs({repeating_projectiles_degatquantique:0});
+		switch (values.repeating_projectiles_trait3) {
+		case "0":
+		    setAttrs({repeating_projectiles_trait3effet:"(choc => 0 dégat)"});
+        break;	
+		case "3":
+		    setAttrs({repeating_projectiles_trait3flagenoire:"on"});
+        break;	
+		case "4":
+		    setAttrs({repeating_projectiles_trait3flag:"on"});
+        break;	
+		case "5":
+		    setAttrs({repeating_projectiles_trait3effet:"(arme longue => relance)"});
+        break;	
+		case "7":
+		    setAttrs({repeating_projectiles_trait3flag:"on"});
+			setAttrs({repeating_projectiles_trait3effet:"(" + values.repeating_projectiles_trait3value + " touches)"});
+        break;
+		case "8":
+		    setAttrs({repeating_projectiles_trait3effet:"(pas d'armure => min dégats 2)"});
+        break;
+        case "9":
+		    setAttrs({repeating_projectiles_trait3flagquantique:"on"});
+        break;
+        case "10":
+		    setAttrs({repeating_projectiles_trait3effet:"(blessures récurrentes)"});
+        break;			
+		case "11":
+		    setAttrs({repeating_projectiles_trait3effet:"(pas d'armure => min dégats 1)"});
+        break;		
+		}
+	});
+});
+
+on("change:repeating_contacts change:repeating_contacts:contact-nom change:repeating_contacts:contactsfaveur", function() {
+    getSectionIDs("repeating_contacts", function(idarray) {
+        if(idarray.length==4) {
+            setAttrs({contactsindex:"on"});
+        }
+	    else {
+	        setAttrs({contactsindex:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_contacts remove:repeating_contacts", function() {
+    getSectionIDs("repeating_contacts", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({contacts0:"on"});
+        }
+	    else {
+	        setAttrs({contacts0:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_cac remove:repeating_cac", function() {
+    getSectionIDs("repeating_cac", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({cac0:"on"});
+        }
+	    else {
+	        setAttrs({cac0:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_projectiles remove:repeating_projectiles", function() {
+    getSectionIDs("repeating_projectiles", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({tir0:"on"});
+        }
+	    else {
+	        setAttrs({tir0:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_equip1 remove:repeating_equip1", function() {
+    getSectionIDs("repeating_equip1", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({equip01:"on"});
+        }
+	    else {
+	        setAttrs({equip01:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_equip2 remove:repeating_equip2", function() {
+    getSectionIDs("repeating_equip2", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({equip02:"on"});
+        }
+	    else {
+	        setAttrs({equip02:0});
+	    }
+    });
+});
+
+on("sheet:opened change:repeating_equip3 remove:repeating_equip3", function() {
+    getSectionIDs("repeating_equip3", function(idarray) {
+        if(idarray.length==0) {
+            setAttrs({equip03:"on"});
+        }
+	    else {
+	        setAttrs({equip03:0});
+	    }
+    });
+});
+
+on("change:compteurfiel", function() {
+	getAttrs(["compteurfiel"], function(values) {
+	    let compteur = values.compteurfiel;
+		if (compteur==5){
+		    getAttrs(["compteurmenace"], function(valuess) {
+			    let newcompteur = parseInt(valuess.compteurmenace)||0;
+ 		        setAttrs({compteurmenace:newcompteur+1}); 
+			});
+		}
+	});
+});	
+
+on("change:bless1 change:bless2 change:bless3 change:bless4 change:bless5 change:bless6 change:bless7 change:bless8 change:bless9 change:bless10", function() {
 	getAttrs(["bless1","bless2","bless3","bless4","bless5","bless6","bless7","bless8","bless9","bless10"], function(values) {
 		if (values.bless1=="on"){setAttrs({blessactuel:1})}else{setAttrs({blessactuel:0})}
 		if (values.bless2=="on"){setAttrs({blessactuel:2})}
@@ -1092,7 +1716,7 @@ on("sheet:opened change:bless1 change:bless2 change:bless3 change:bless4 change:
 	});
 });	
 
-on("sheet:opened change:trauma1 change:trauma2 change:trauma3 change:trauma4 change:trauma5 change:trauma6 change:trauma7 change:trauma8 change:trauma9 change:trauma10", function() {
+on("change:trauma1 change:trauma2 change:trauma3 change:trauma4 change:trauma5 change:trauma6 change:trauma7 change:trauma8 change:trauma9 change:trauma10", function() {
 	getAttrs(["trauma1","trauma2","trauma3","trauma4","trauma5","trauma6","trauma7","trauma8","trauma9","trauma10"], function(values) {
 		if (values.trauma1=="on"){setAttrs({traumaactuel:1})}else{setAttrs({traumaactuel:0})}
 		if (values.trauma2=="on"){setAttrs({traumaactuel:2})}
@@ -1107,7 +1731,7 @@ on("sheet:opened change:trauma1 change:trauma2 change:trauma3 change:trauma4 cha
 	});
 });	
 
-on("sheet:opened change:traque1 change:traque2 change:traque3 change:traque4 change:traque5 change:traque6 change:traque7 change:traque8 change:traque9 change:traque10", function() {
+on("change:traque1 change:traque2 change:traque3 change:traque4 change:traque5 change:traque6 change:traque7 change:traque8 change:traque9 change:traque10", function() {
 	getAttrs(["traque1","traque2","traque3","traque4","traque5","traque6","traque7","traque8","traque9","traque10"], function(values) {
 		if (values.traque1=="on"){setAttrs({traqueactuel:1})}else{setAttrs({traqueactuel:0})}
 		if (values.traque2=="on"){setAttrs({traqueactuel:2})}
@@ -1122,7 +1746,7 @@ on("sheet:opened change:traque1 change:traque2 change:traque3 change:traque4 cha
 	});
 });	
 
-on("sheet:opened change:noirceur1 change:noirceur2 change:noirceur3 change:noirceur4 change:noirceur5 change:noirceur6 change:noirceur7 change:noirceur8 change:noirceur9 change:noirceur10", function() {
+on("change:noirceur1 change:noirceur2 change:noirceur3 change:noirceur4 change:noirceur5 change:noirceur6 change:noirceur7 change:noirceur8 change:noirceur9 change:noirceur10", function() {
 	getAttrs(["noirceur1","noirceur2","noirceur3","noirceur4","noirceur5","noirceur6","noirceur7","noirceur8","noirceur9","noirceur10"], function(values) {
 		if (values.noirceur1=="on"){setAttrs({noirceuractuel:1})}else{setAttrs({noirceuractuel:0})}
 		if (values.noirceur2=="on"){setAttrs({noirceuractuel:2})}
@@ -1137,14 +1761,6 @@ on("sheet:opened change:noirceur1 change:noirceur2 change:noirceur3 change:noirc
 	});
 });	
 
-on("change:repeating_contacts change:contacts", function() {
-    getAttrs(["contacts"], function(values) {
-		let faveur = parseInt(values.contacts)||0;
-        setAttrs({repeating_contacts_contactsfaveur_max:faveur*2})
-    });
-});
-
-
 on("change:repeating_cac:cactalent", function() {
 	getAttrs(["repeating_cac_cactalent"], function(values) {
 	    let talent = values.repeating_cac_cactalent;
@@ -1160,7 +1776,7 @@ on("change:repeating_tir:tirtalent", function() {
 	});
 });		
 		
-on("sheet:opened change:vie change:malusblessleger change:malustraumaleger", function() {
+on("change:vie change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["vie","malusblessleger","malustraumaleger"], function(values) {
 	    let vie = parseInt(values.vie)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1169,7 +1785,7 @@ on("sheet:opened change:vie change:malusblessleger change:malustraumaleger", fun
 	});
 });	
 
-on("sheet:opened change:erudition change:malusblessleger change:malustraumaleger", function() {
+on("change:erudition change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["erudition","malusblessleger","malustraumaleger"], function(values) {
 	    let erudition = parseInt(values.erudition)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1178,7 +1794,7 @@ on("sheet:opened change:erudition change:malusblessleger change:malustraumaleger
 	});
 });	
 
-on("sheet:opened change:technique change:malusblessleger change:malustraumaleger", function() {
+on("change:technique change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["technique","malusblessleger","malustraumaleger"], function(values) {
 	    let technique = parseInt(values.technique)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1187,7 +1803,7 @@ on("sheet:opened change:technique change:malusblessleger change:malustraumaleger
 	});
 });	
 
-on("sheet:opened change:action change:malusblessleger change:malustraumaleger", function() {
+on("change:action change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["action","malusblessleger","malustraumaleger"], function(values) {
 	    let action = parseInt(values.action)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1196,7 +1812,7 @@ on("sheet:opened change:action change:malusblessleger change:malustraumaleger",
 	});
 });	
 
-on("sheet:opened change:statut change:malusblessleger change:malustraumaleger", function() {
+on("change:statut change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["statut","malusblessleger","malustraumaleger"], function(values) {
 	    let statut = parseInt(values.statut)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1205,7 +1821,7 @@ on("sheet:opened change:statut change:malusblessleger change:malustraumaleger",
 	});
 });	
 
-on("sheet:opened change:ame change:malusblessleger change:malustraumaleger", function() {
+on("change:ame change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["ame","malusblessleger","malustraumaleger"], function(values) {
 	    let ame = parseInt(values.ame)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1214,7 +1830,7 @@ on("sheet:opened change:ame change:malusblessleger change:malustraumaleger", fun
 	});
 });	
 
-on("sheet:opened change:social change:malusblessleger change:malustraumaleger", function() {
+on("change:social change:malusblessleger change:malustraumaleger", function() {
     getAttrs(["social","malusblessleger","malustraumaleger"], function(values) {
 	    let social = parseInt(values.social)||0;
         let bless = parseInt(values.malusblessleger)||0;
@@ -1225,7 +1841,7 @@ on("sheet:opened change:social change:malusblessleger change:malustraumaleger",
 
 
 
-on("sheet:opened change:traque5 change:traque8 change:traque10", function() {
+on("change:traque5 change:traque8 change:traque10", function() {
 	getAttrs(["traque5","traque8","traque10"], function(values) {
 	    let t5 = values.traque5;
         let t8 = values.traque8;
@@ -1261,7 +1877,7 @@ on("sheet:opened change:traque5 change:traque8 change:traque10", function() {
 	});	
 });	
 
-on("sheet:opened change:noirceur5 change:noirceur8 change:noirceur10", function() {
+on("change:noirceur5 change:noirceur8 change:noirceur10", function() {
 	getAttrs(["noirceur5","noirceur8","noirceur10"], function(values) {
 	    let t5 = values.noirceur5;
         let t8 = values.noirceur8;
diff --git a/NOC/images/fielcompteur.png b/NOC/images/fielcompteur.png
index 37512698dd..ca31faa5c2 100644
Binary files a/NOC/images/fielcompteur.png and b/NOC/images/fielcompteur.png differ
diff --git a/NOC/images/fielcompteur2.png b/NOC/images/fielcompteur2.png
new file mode 100644
index 0000000000..a4366c745d
Binary files /dev/null and b/NOC/images/fielcompteur2.png differ
diff --git a/NOC/images/fieltchat.png b/NOC/images/fieltchat.png
new file mode 100644
index 0000000000..75e84d3704
Binary files /dev/null and b/NOC/images/fieltchat.png differ
diff --git a/NOC/images/fondcomposition2.png b/NOC/images/fondcomposition2.png
new file mode 100644
index 0000000000..0b3e922d5c
Binary files /dev/null and b/NOC/images/fondcomposition2.png differ
diff --git a/NOC/translation.json b/NOC/translation.json
index 5c5cab83f2..f2e2e0aa2b 100644
--- a/NOC/translation.json
+++ b/NOC/translation.json
@@ -91,7 +91,7 @@
 "faveurmax-u":"Faveur max",
 "Combathelper-u":"AIDE AU COMBAT",
 "tir-u":"ARMES DE TIR",
-"dps-u":"Dég.",
+"dps-u":"Dégâts",
 "munitions-u":"Mun.",
 "munitionsmax-u":"Mun. max",
 "armetalent-u":"Talent",
@@ -103,6 +103,10 @@
 
 "Notes-p":"La nuit est tombée sur le monde. La Terre a été engloutie par l’Artefact, un objet impossible surgi du fond de l’espace et du temps. Il s’est replié sur elle en une étreinte cosmique, se substituant au ciel et aux étoiles.\n\rL’Artefact est une prison qui a plongé l’humanité dans un éternel crépuscule et a disloqué la civilisation. Tel est le fardeau des vivants.\n\rL’Artefact est un bouclier érigé contre une menace extérieure supposée conduire à l’anéantissement de toute vie. Telle est la voix de la propagande.\n\rL’Artefact est un horizon inatteignable aux motivations cryptiques, incarnation de l’apocalypse et porteur d’espoir pour qui croit en son message.\n\rIl est l’Objet-Dieu.",
 
+"talent-t":"Cocher la case si cette arme fait partie de votre liste d'armes connues",
+"arrestation-t":"Vous vous êtes fait arrêté alors que vous aviez le trait signalé/recherché/pourchassé",
+"fatigue-t":"Vous êtes fatigué",
+
 "vie-t":"Ce Domaine est celui du don de soi, de l’abnégation\net de la bonté. Un personnage doté d’une affinité\nen Vie sera une lueur dans un monde de ténèbres,\nune incarnation de la volonté de survie de l’espèce\nconfrontée à son ultime épreuve.",
 "erudition-t":"Ce Domaine regroupe toutes leseff connaissances,\nà l’exclusion de la technologie qui relève d’un\nDomaine propre.\nUn personnage possédant des niveaux dans les\nTalents d’Érudition fait partie d’une caste élitiste.\nIl est probablement bibliothécaire, érudit, professeur.\nLe savoir, dans la société délitée de NOC, est\nun important marqueur de statut.",
 "technique-t":"Ce domaine est celui des savoirs pratiques, des\nobjets et de leur fonctionnement, de la débrouille\net des technologies inspirées de l’Artefact.",