diff --git a/Knight/knight.html b/Knight/knight.html
index 3692739a30..77eacbe46c 100644
--- a/Knight/knight.html
+++ b/Knight/knight.html
@@ -1980,7 +1980,7 @@
 				</div>
 				<div class="Sante Separation">
 					<div class="Guardian">
-						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 						<table class="tableGuardian hidden">
 							<tr>
 								<th class="tab-padding-left" style="width:25%"></th>
@@ -1990,8 +1990,9 @@
 							</tr>
 							<tr>
 								<th class="tab-padding-left left"><h4>Santé</h4></th>
-								<td><input type="number" name="attr_sante" min="0" value="0" class="center" style="width:100%" /></td>
-								<td><input type="number" name="attr_sante_max" min="0" class="center" style="width:100%" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" disabled /></td>
+								<input type="hidden" name="attr_sante_calcul" value="(((((@{endurance} + (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) ) + abs(@{endurance} - (((@{deplacement}+@{force}) + abs(@{deplacement}-@{force})) / 2) )) / 2)*6)+10)+@{santeModif}" />
+								<td><input type="number" name="attr_santeChevalier" min="0" value="0" class="center" style="width:100%" /></td>
+								<td><input type="number" name="attr_santeChevalier_max" min="0" class="center" style="width:100%" value="(@{sante_calcul})" disabled /></td>
 								<td class="tab-padding-right" ><input type="number" name="attr_santeModif" min="0" value="0" class="center" style="width:100%" /></td>
 							</tr>
 							<tr>
@@ -2114,7 +2115,7 @@
 						</table>
 					</div>
 					<div class="Guardian">
-						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />			
+						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />			
 						
 						<input type="number" name="attr_discretionTotalGuardian" class="hidden" value="@{discretion}" disabled />
 						<input type="number" name="attr_perceptionTotalGuardian" class="hidden" value="@{perception}" disabled />
@@ -2158,7 +2159,7 @@
 				</div>
 				<div class="Defense Separation">
 					<div class="Guardian">
-						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+						<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 						<input type="number" name="attr_hargneTotalGuardian" class="hidden" value="@{hargne}" disabled />
 						<input type="number" name="attr_combatTotalGuardian" class="hidden" value="@{combat}" disabled />
 						<input type="number" name="attr_instinctTotalGuardian" class="hidden" value="@{instinct}" disabled />
@@ -5569,7 +5570,7 @@
 												<span class="revealESpec hidden">Oblitération /</span>
 											</span>
 											<span class="Orfevrerie">
-												<input type="checkbox" name="attr_orfevrerie" class="hidden checkShowESpec" value="{{orfevrerie=[[@{dexterite}]]}}" />
+												<input type="checkbox" name="attr_orfevrerie" class="hidden checkShowESpec" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 												<span class="revealESpec hidden">Orfévrerie /</span>
 											</span>
 											<span class="Penetrant">
@@ -5970,7 +5971,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -8002,7 +8003,7 @@
 											</tr>
 											<tr style="height:31px;">
 												<td>
-													<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+													<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 												</td>
 												<td colspan="2">
 													Orfévrerie
@@ -8532,7 +8533,7 @@
 											</tr>
 											<tr style="height:31px;">
 												<td>
-													<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+													<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 												</td>
 												<td colspan="2">
 													Orfévrerie
@@ -9033,7 +9034,7 @@
 				</div>
 				<br/>
 				<div class="Guardian">
-					<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+					<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 					<table class="tableGuardian hidden">
 						<tr>
 							<td class="tab-padding-left" style="width:40%"></td>
@@ -9665,7 +9666,7 @@
 		<input type="checkbox" name="attr_tabDistance" class="tabArmes tabDistance hidden" value="1" checked>
 		<div class="tabDistance hidden" style="margin-top:20px">
 			<div class="Guardian">
-				<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+				<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 				<table class="tableGuardian hidden">
 					<tr>
 						<th><h2>Armes à distances</h2></th>
@@ -9971,7 +9972,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -10500,7 +10501,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -11038,7 +11039,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -11567,7 +11568,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -12096,7 +12097,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -12625,7 +12626,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -12851,7 +12852,7 @@
 		<input type="checkbox" name="attr_tabMelee" class="tabArmes tabMelee hidden" value="2" checked>
 		<div class="tabMelee hidden" style="margin-top:20px">
 			<div class="Guardian">
-				<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+				<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 				<table class="tableGuardian hidden">
 					<tr>
 						<th><h2>Armes de mêlée</h2></th>
@@ -13157,7 +13158,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -13551,7 +13552,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -13955,7 +13956,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -14350,7 +14351,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -14745,7 +14746,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -15140,7 +15141,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -15506,7 +15507,7 @@
 												</tr>
 												<tr style="height:31px;">
 													<td>
-														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}]]}}" />
+														<input type="checkbox" name="attr_orfevrerie" value="{{orfevrerie=[[@{dexterite}+@{dextOD}]]}}" />
 													</td>
 													<td colspan="2">
 														Orfévrerie
@@ -17102,7 +17103,7 @@
 			<input type="checkbox" name="attr_fichePNJ" class="fichePNJHidden fichePNJH" value="1" />
 			<div class="PJ">
 				<div class="Guardian">				
-					<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" />
+					<input type="checkbox" name="attr_armure" class="checkGuardian hidden" value="guardian" checked />
 					<table class="tableGuardian hidden">
 						<tr>
 							<th colspan="6"><h4>Grenades</h4></th>