diff --git a/docs/.vuepress/theme/components/Monster.vue b/docs/.vuepress/theme/components/Monster.vue
index ccc7de0..9df2038 100644
--- a/docs/.vuepress/theme/components/Monster.vue
+++ b/docs/.vuepress/theme/components/Monster.vue
@@ -80,11 +80,14 @@
           </div>
         </div>
         <div class="break-avoid">
-          <div class="monster-saving-throws" v-if="monsterStats.savingThrows && monsterStats.savingThrows.length > 0">
+          <div class="monster-saving-throws" v-if="monsterStats.customSavingThrows || (monsterStats.savingThrows && monsterStats.savingThrows.length > 0)">
             <strong>Jets de sauvegarde</strong>
-            <span class="monster-saving-throw" v-for="(savingThrow, idx) in monsterStats.savingThrows">
-              <template>{{displaySavingThrowBonus(savingThrow)}}</template><template v-if="idx < monsterStats.savingThrows.length - 1">, </template>
-            </span>
+              <template v-if="monsterStats.customSavingThrows">{{monsterStats.customSavingThrows}}</template>
+              <template v-else>
+                <template v-for="(savingThrow, idx) in monsterStats.savingThrows">
+                  <template>{{displaySavingThrowBonus(savingThrow)}}</template><template v-if="idx < monsterStats.savingThrows.length - 1">, </template>
+                </template>
+              </template>
           </div>
           <div class="monster-skills" v-if="monsterStats.skills && monsterStats.skills.length > 0">
             <strong>Compétences</strong>
@@ -105,12 +108,13 @@
             <span v-html="displayDamageTypes(monsterStats.damageTypeImmunities)"></span>
           </div>
           <div class="monster-condition-immunities" v-if="monsterStats.conditionImmunities && monsterStats.conditionImmunities.length > 0">
-            <strong>Immunité contre les états</strong>
-            <span v-for="(condition, idx) in monsterStats.conditionImmunities">
+            <strong>Immunité contre <template v-if="monsterStats.conditionImmunities.length == 1">l'état</template><template v-else>les états</template></strong>
+            <span v-html="displayConditionImmunities()"></span>
+            <!-- <span v-for="(condition, idx) in monsterStats.conditionImmunities">
               <template v-if="idx < monsterStats.conditionImmunities.length - 2 && idx > 1">,</template>
               <template v-if="idx == monsterStats.conditionImmunities.length - 1">et</template>
               <em><router-link :to="{ path: conditionPath(condition) }">{{displayCondition(condition)}}</router-link></em>
-            </span>
+            </span> -->
           </div>
           <div class="monster-senses">
             <strong>Sens</strong>
@@ -402,30 +406,45 @@ export default {
         if (this.monsterStats.senses.tremorsense) {
           result += 'perception des vibrations ' + this.monsterStats.senses.tremorsense + ' m'
         }
-        if (this.monsterStats.senses.blindsight) {
+        if (this.monsterStats.senses.blindsight || this.monsterStats.senses.customBlindSight) {
           if (result != '') {
             result += ', '
           }
-          result += 'vision aveugle ' + this.monsterStats.senses.blindsight + ' m'
+          if (this.monsterStats.senses.customBlindSight) {
+            result += 'vision aveugle ' + this.monsterStats.senses.customBlindSight
+          } else {
+            result += 'vision aveugle ' + this.monsterStats.senses.blindsight + ' m'
+          }
         }
-        if (this.monsterStats.senses.darkvision) {
+        if (this.monsterStats.senses.darkvision || this.monsterStats.senses.customDarkvision) {
           if (result != '') {
             result += ', '
           }
-          result += 'vision dans le noir ' + this.monsterStats.senses.darkvision + ' m'
+          if (this.monsterStats.senses.customDarkvision) {
+            result += 'vision dans le noir ' + this.monsterStats.senses.customDarkvision
+          } else {
+            result += 'vision dans le noir ' + this.monsterStats.senses.darkvision + ' m'
+          }
         }
-        if (this.monsterStats.senses.truesight) {
+        if (this.monsterStats.senses.truesight || this.monsterStats.senses.customTrueSight) {
           if (result != '') {
             result += ', '
           }
-          result += 'vision parfaite ' + this.monsterStats.senses.truesight + ' m'
+          if (this.monsterStats.senses.customTrueSight) {
+            result += 'vision parfaite ' + this.monsterStats.senses.customTrueSight
+          } else {
+            result += 'vision parfaite ' + this.monsterStats.senses.truesight + ' m'
+          }
         }
         if (result != '') {
           result += ', '
         }
       }
-
-      result += 'Perception passive ' + this.passivePerception
+      if (this.monsterStats.senses && this.monsterStats.senses.customPassivePerception) {
+        result += 'Perception passive ' + this.monsterStats.senses.customPassivePerception
+      } else {
+        result += 'Perception passive ' + this.passivePerception
+      }
       return result
     },
 
diff --git a/docs/bestiaire/armure-animee/README.md b/docs/bestiaire/armure-animee/README.md
index acfe69b..2768b1c 100644
--- a/docs/bestiaire/armure-animee/README.md
+++ b/docs/bestiaire/armure-animee/README.md
@@ -12,14 +12,14 @@ abilityScores:
   int: 1
   sag: 3
   cha: 1
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 8
-movement: 
-  walk: 7
-senses: 
+movement:
+  walk: 7,50
+senses:
   blindsight: 18
-conditionImmunities: 
+conditionImmunities:
   - "assourdi"
   - "aveugle"
   - "charme"
@@ -28,10 +28,10 @@ conditionImmunities:
   - "paralyse"
   - "petrifie"
   - "terrorise"
-damageTypeImmunities: 
+damageTypeImmunities:
   - "poison"
   - "psychique"
-languages: 
+languages:
   - "—"
 dungeonTypes:
   - Donjon maçonné
diff --git a/docs/bestiaire/blaireau/README.md b/docs/bestiaire/blaireau/README.md
index 1ad67ff..869bd27 100644
--- a/docs/bestiaire/blaireau/README.md
+++ b/docs/bestiaire/blaireau/README.md
@@ -12,14 +12,14 @@ abilityScores:
   int: 2
   sag: 12
   cha: 5
-ac: 
+ac:
   armorType: null
-movement: 
+movement:
   walk: 6
-  burrow: 1
-senses: 
+  burrow: 1,50
+senses:
   darkvision: 9
-languages: 
+languages:
   - ""
 environments:
   - Bois / Forêt
diff --git a/docs/bestiaire/chauve-souris/README.md b/docs/bestiaire/chauve-souris/README.md
index 7f591be..09cc567 100644
--- a/docs/bestiaire/chauve-souris/README.md
+++ b/docs/bestiaire/chauve-souris/README.md
@@ -12,14 +12,14 @@ abilityScores:
   int: 2
   sag: 12
   cha: 4
-ac: 
+ac:
   armorType: null
-movement: 
-  walk: 1
+movement:
+  walk: 1,50
   fly: 9
-senses: 
+senses:
   blindsight: 18
-languages: 
+languages:
   - ""
 environments:
   - Bois / Forêt
diff --git a/docs/bestiaire/cheval-de-guerre-celeste/README.md b/docs/bestiaire/cheval-de-guerre-celeste/README.md
index 5b1374f..5bdcbcb 100644
--- a/docs/bestiaire/cheval-de-guerre-celeste/README.md
+++ b/docs/bestiaire/cheval-de-guerre-celeste/README.md
@@ -12,30 +12,31 @@ abilityScores:
   int: 8
   sag: 14
   cha: 10
-savingThrows: 
+savingThrows:
   - "for"
   - "sag"
   - "cha"
-ac: 
+customSavingThrows: "For +7, Sag +5, Cha +3"
+ac:
   armorType: "custom"
   value: "13"
-skills: 
+skills:
   - name: "perception"
     isExpert: true
-movement: 
+movement:
   walk: 18
-senses: 
+senses:
   darkvision: 36
-conditionImmunities: 
+conditionImmunities:
   - "charme"
   - "empoisonne"
   - "epuise"
   - "terrorise"
-damageTypeResistances: 
+damageTypeResistances:
   - "necrotique"
-damageTypeImmunities: 
+damageTypeImmunities:
   - "poison"
-languages: 
+languages:
   - "comprend le commun et le céleste mais ne peut pas parler"
 source: "Créatures & Oppositions"
 source_page: 300
diff --git a/docs/bestiaire/chouette-geante/README.md b/docs/bestiaire/chouette-geante/README.md
index 1497378..c7ac322 100644
--- a/docs/bestiaire/chouette-geante/README.md
+++ b/docs/bestiaire/chouette-geante/README.md
@@ -12,18 +12,18 @@ abilityScores:
   int: 8
   sag: 13
   cha: 10
-ac: 
+ac:
   armorType: null
-skills: 
+skills:
   - name: "discretion"
   - name: "perception"
     isExpert: true
-movement: 
-  walk: 1
+movement:
+  walk: 1,50
   fly: 18
-senses: 
+senses:
   darkvision: 36
-languages: 
+languages:
   - "chouette géante"
   - "comprend le commun"
   - "l'elfe et le sylvestre mais ne peut pas les parler"
diff --git a/docs/bestiaire/chouette/README.md b/docs/bestiaire/chouette/README.md
index 687ea72..5241988 100644
--- a/docs/bestiaire/chouette/README.md
+++ b/docs/bestiaire/chouette/README.md
@@ -12,19 +12,19 @@ abilityScores:
   int: 2
   sag: 12
   cha: 7
-ac: 
+ac:
   armorType: null
-skills: 
+skills:
   - name: "discretion"
     isExpert: true
   - name: "perception"
     isExpert: true
-movement: 
-  walk: 1
+movement:
+  walk: 1,50
   fly: 18
-senses: 
+senses:
   darkvision: 36
-languages: 
+languages:
   - ""
 environments:
   - Bois / Forêt
diff --git a/docs/bestiaire/cube-gelatineux/README.md b/docs/bestiaire/cube-gelatineux/README.md
index 95ec03a..14982b1 100644
--- a/docs/bestiaire/cube-gelatineux/README.md
+++ b/docs/bestiaire/cube-gelatineux/README.md
@@ -12,20 +12,20 @@ abilityScores:
   int: 1
   sag: 6
   cha: 1
-ac: 
+ac:
   armorType: null
-movement: 
-  walk: 4
-senses: 
+movement:
+  walk: 4,50
+senses:
   blindsight: 18
-conditionImmunities: 
+conditionImmunities:
   - "a-terre"
   - "assourdi"
   - "aveugle"
   - "charme"
   - "epuise"
   - "terrorise"
-languages: 
+languages:
   - ""
 dungeonTypes:
   - Donjon maçonné
diff --git a/docs/bestiaire/devoreur-arcanique/README.md b/docs/bestiaire/devoreur-arcanique/README.md
index 0d04610..cd24a4d 100644
--- a/docs/bestiaire/devoreur-arcanique/README.md
+++ b/docs/bestiaire/devoreur-arcanique/README.md
@@ -12,23 +12,24 @@ abilityScores:
   int: 15
   sag: 14
   cha: 18
-ac: 
+ac:
   armorType: "custom"
   value: "15"
-skills: 
+skills:
   - name: "perception"
     invalid: true
     value: 4
-movement: 
-  fly: 1
-senses: 
+movement:
+  walk: 1,50
+  fly: 9
+senses:
   blindsight: 18
-conditionImmunities: 
+conditionImmunities:
   - "aveugle"
   - "a-terre"
-damageTypeResistances: 
+damageTypeResistances:
   - "feu"
-languages: 
+languages:
   - "profond"
   - "commun des profondeurs"
 telepathy: 36
diff --git a/docs/bestiaire/dragon-blanc-dragonnet/README.md b/docs/bestiaire/dragon-blanc-dragonnet/README.md
index 51f5e49..eef36dc 100644
--- a/docs/bestiaire/dragon-blanc-dragonnet/README.md
+++ b/docs/bestiaire/dragon-blanc-dragonnet/README.md
@@ -12,29 +12,29 @@ abilityScores:
   int: 5
   sag: 10
   cha: 11
-savingThrows: 
+savingThrows:
   - "dex"
   - "con"
   - "sag"
   - "cha"
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 6
-skills: 
+skills:
   - name: "discretion"
   - name: "perception"
     isExpert: true
-movement: 
+movement:
   walk: 9
-  burrow: 4
+  burrow: 4,50
   swim: 9
   fly: 18
-senses: 
+senses:
   blindsight: 3
   darkvision: 18
-damageTypeImmunities: 
+damageTypeImmunities:
   - "froid"
-languages: 
+languages:
   - "draconique"
 environments:
   - Arctique / Subarctique
diff --git a/docs/bestiaire/dragon-bleu-dragonnet/README.md b/docs/bestiaire/dragon-bleu-dragonnet/README.md
index 5633a79..8a28dc3 100644
--- a/docs/bestiaire/dragon-bleu-dragonnet/README.md
+++ b/docs/bestiaire/dragon-bleu-dragonnet/README.md
@@ -12,28 +12,28 @@ abilityScores:
   int: 12
   sag: 11
   cha: 15
-savingThrows: 
+savingThrows:
   - "dex"
   - "con"
   - "sag"
   - "cha"
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 7
-skills: 
+skills:
   - name: "discretion"
   - name: "perception"
     isExpert: true
-movement: 
+movement:
   walk: 9
-  burrow: 4
+  burrow: 4,50
   fly: 18
-senses: 
+senses:
   blindsight: 3
   darkvision: 18
-damageTypeImmunities: 
+damageTypeImmunities:
   - "foudre"
-languages: 
+languages:
   - "draconique"
 environments:
   - Désert chaud
diff --git a/docs/bestiaire/dragon-d-airain-dragonnet/README.md b/docs/bestiaire/dragon-d-airain-dragonnet/README.md
index eccebd0..c0ac95b 100644
--- a/docs/bestiaire/dragon-d-airain-dragonnet/README.md
+++ b/docs/bestiaire/dragon-d-airain-dragonnet/README.md
@@ -12,28 +12,28 @@ abilityScores:
   int: 10
   sag: 11
   cha: 13
-savingThrows: 
+savingThrows:
   - "dex"
   - "con"
   - "sag"
   - "cha"
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 6
-skills: 
+skills:
   - name: "discretion"
   - name: "perception"
     isExpert: true
-movement: 
+movement:
   walk: 9
-  burrow: 4
+  burrow: 4,50
   fly: 18
-senses: 
+senses:
   blindsight: 3
   darkvision: 18
-damageTypeImmunities: 
+damageTypeImmunities:
   - "feu"
-languages: 
+languages:
   - "draconique"
 environments:
   - Désert chaud
diff --git a/docs/bestiaire/duergar/README.md b/docs/bestiaire/duergar/README.md
index b28879f..65e434f 100644
--- a/docs/bestiaire/duergar/README.md
+++ b/docs/bestiaire/duergar/README.md
@@ -17,7 +17,7 @@ ac:
   armorType: "armure d'écailles"
   hasShield: true
 movement:
-  walk: 7,5
+  walk: 7,50
 senses:
   darkvision: 36
 damageTypeResistances:
diff --git a/docs/bestiaire/ecclesiastique/README.md b/docs/bestiaire/ecclesiastique/README.md
index eabb6e5..8c84188 100644
--- a/docs/bestiaire/ecclesiastique/README.md
+++ b/docs/bestiaire/ecclesiastique/README.md
@@ -13,19 +13,19 @@ abilityScores:
   int: 13
   sag: 16
   cha: 13
-ac: 
+ac:
   armorType: "chemise de mailles"
-skills: 
+skills:
   - name: "medecine"
     isExpert: true
   - name: "persuasion"
   - name: "religion"
     invalid: true
     value: 4
-movement: 
-  walk: 7
-senses: 
-languages: 
+movement:
+  walk: 7,50
+senses:
+languages:
   - "deux langues au choix"
 source: "Créatures & Oppositions"
 source_page: 333
diff --git a/docs/bestiaire/lemure/README.md b/docs/bestiaire/lemure/README.md
index 7d851f9..2ac557c 100644
--- a/docs/bestiaire/lemure/README.md
+++ b/docs/bestiaire/lemure/README.md
@@ -13,22 +13,22 @@ abilityScores:
   int: 1
   sag: 11
   cha: 3
-ac: 
+ac:
   armorType: null
-movement: 
-  walk: 4
-senses: 
+movement:
+  walk: 4,50
+senses:
   darkvision: 36
-conditionImmunities: 
+conditionImmunities:
   - "charme"
   - "terrorise"
   - "empoisonne"
-damageTypeResistances: 
+damageTypeResistances:
   - "froid"
-damageTypeImmunities: 
+damageTypeImmunities:
   - "feu"
   - "poison"
-languages: 
+languages:
   - "comprend l'infernal mais ne peut pas parler"
 source: "Créatures & Oppositions"
 source_page: 72
diff --git a/docs/bestiaire/mimique/README.md b/docs/bestiaire/mimique/README.md
index 6fde76d..6daa869 100644
--- a/docs/bestiaire/mimique/README.md
+++ b/docs/bestiaire/mimique/README.md
@@ -13,21 +13,21 @@ abilityScores:
   int: 5
   sag: 13
   cha: 8
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 1
-skills: 
+skills:
   - name: "discretion"
     isExpert: true
-movement: 
-  walk: 4
-senses: 
+movement:
+  walk: 4,50
+senses:
   darkvision: 18
-conditionImmunities: 
+conditionImmunities:
   - "a-terre"
-damageTypeImmunities: 
+damageTypeImmunities:
   - "acide"
-languages: 
+languages:
   - "—"
 dungeonTypes:
   - Caverne aménagée
diff --git a/docs/bestiaire/moisissure-violette/README.md b/docs/bestiaire/moisissure-violette/README.md
index ca575d9..79ffe7b 100644
--- a/docs/bestiaire/moisissure-violette/README.md
+++ b/docs/bestiaire/moisissure-violette/README.md
@@ -13,17 +13,17 @@ abilityScores:
   int: 1
   sag: 3
   cha: 1
-ac: 
+ac:
   armorType: null
-movement: 
-  walk: 1
-senses: 
+movement:
+  walk: 1,50
+senses:
   blindsight: 9
-conditionImmunities: 
+conditionImmunities:
   - "assourdi"
   - "aveugle"
   - "terrorise"
-languages: 
+languages:
   - "—"
 environments:
   - Caverne naturelle
diff --git a/docs/bestiaire/pieuvre/README.md b/docs/bestiaire/pieuvre/README.md
index c4378a9..a790dba 100644
--- a/docs/bestiaire/pieuvre/README.md
+++ b/docs/bestiaire/pieuvre/README.md
@@ -12,19 +12,19 @@ abilityScores:
   int: 3
   sag: 10
   cha: 4
-ac: 
+ac:
   armorType: null
-skills: 
+skills:
   - name: "discretion"
     isExpert: true
   - name: "perception"
     isExpert: true
-movement: 
-  walk: 1
+movement:
+  walk: 1,50
   swim: 9
-senses: 
+senses:
   darkvision: 9
-languages: 
+languages:
   - ""
 environments:
   - Mer / Océan
diff --git a/docs/bestiaire/pseudodragon/README.md b/docs/bestiaire/pseudodragon/README.md
index bb89358..3b30e07 100644
--- a/docs/bestiaire/pseudodragon/README.md
+++ b/docs/bestiaire/pseudodragon/README.md
@@ -12,19 +12,19 @@ abilityScores:
   int: 10
   sag: 12
   cha: 10
-ac: 
+ac:
   armorType: "armure naturelle"
   value: 1
-skills: 
+skills:
   - name: "discretion"
   - name: "perception"
-movement: 
-  walk: 4
+movement:
+  walk: 4,50
   fly: 18
-senses: 
+senses:
   blindsight: 3
   darkvision: 18
-languages: 
+languages:
   - "comprend le commun et le draconique mais ne peut pas parler"
 environments:
   - Bois / Forêt
diff --git a/docs/bestiaire/torve/README.md b/docs/bestiaire/torve/README.md
index 85d40b2..68abae9 100644
--- a/docs/bestiaire/torve/README.md
+++ b/docs/bestiaire/torve/README.md
@@ -13,20 +13,22 @@ abilityScores:
   int: 9
   sag: 8
   cha: 6
-ac: 
+ac:
   armorType: null
-skills: 
+skills:
   - name: "athletisme"
   - name: "discretion"
   - name: "perception"
     isExpert: true
-movement: 
+movement:
   walk: 9
-senses: 
+senses:
   blindsight: 9
-conditionImmunities: 
+  customBlindSight: "9 m ou 3 m s'il est assourdi (aveugle au-delà de cette distance)"
+  customPassivePerception: 12
+conditionImmunities:
   - "aveugle"
-languages: 
+languages:
   - "commun des profondeurs"
 dungeonTypes:
   - Caverne aménagée