Merge pull request 'Version 10.7.13 - L'armure de Semolosse' (#644 ) from VincentVk/foundryvtt-reve-de-dragon:v10 into v10

Reviewed-on: #644
2023-05-25 20:35:39 +02:00
2109 changed files with 13226 additions and 247761 deletions
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -1,76 +0,0 @@
-name: Release Creation
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
-
-    #- uses: actions/checkout@v3
-    - uses: RouxAntoine/checkout@v3.5.4
-      with:
-        ref: 'v13'
-
-    # get part of the tag after the `v`
-    - name: Extract tag version number
-      id: get_version
-      uses: battila7/get-version-action@v2
-
-    # Substitute the Manifest and Download URLs in the module.json
-    - name: Substitute Manifest and Download Links For Versioned Ones
-      id: sub_manifest_link_version
-      uses: microsoft/variable-substitution@v1
-      with:
-        files: 'system.json'
-      env:
-        version: ${{steps.get_version.outputs.version-without-v}}
-        url: https://www.uberwald.me/gitea/${{gitea.repository}}
-        manifest: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json
-        download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/rddsystem.zip
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '18'  # Use the node version your project requires
-
-    - name: Install dependencies
-      run: npm install
-
-    - name: Build the compendiums
-      run: node ./tools/packCompendiumsToDist.mjs
-
-    # Create a zip file with all files required by the module to add to the release
-    - run: |
-         apt update -y
-         apt install -y zip
-
-    - run: zip -r ./rddsystem.zip system.json template.json README.md LICENSE.txt assets/ css/ fonts/ icons lang/ module/ packs/ pic/ sounds/ styles/ templates/
-
-    - name: setup go
-      uses: actions/setup-go@v3
-      with:
-        go-version: '>=1.20.1'
-
-    - name: Use Go Action
-      id: use-go-action
-      uses: https://gitea.com/actions/release-action@main
-      with:
-        files: |-
-          ./rddsystem.zip
-          system.json
-        api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'
-
-    - name: Publish to Foundry server
-      uses: djlechuck/foundryvtt-publish-package-action@v1
-      with:
-        token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
-        id: 'foundryvtt-reve-de-dragon'
-        version: ${{github.event.release.tag_name}}
-        manifest: 'https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json'
-        notes: 'https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v13/changelog.md'
-        compatibility-minimum: '13'
-        compatibility-verified: '13'
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,3 @@ todo.md
 /jsconfig.json
 /package.json
 /package-lock.json
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK
--- a/pack_ref/animaux/000023.log
+++ b/pack_ref/animaux/000023.log
--- a/.gitlab/issue_templates/.gitkeep
+++ b/.gitlab/issue_templates/.gitkeep
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -0,0 +1,14 @@
+Pour que le bug soit traité, merci de préciser quelques détails.
+
+### Environment
+
+> Indiquez quelques éléments de votre installation
+
+* Foundry VTT Version: (Example 0.5.4)
+* OS: [Windows, MacOS, Linux (which distro)]
+* Modules ?: Liste des modules utilisés
+
+### Description du problème
+
+
+/label ~Bug ~Nonrepro
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -0,0 +1,14 @@
+
+### Résumé de la fonctionnalité
+
+> Décrivez de manière simple et concise la fonction que vous voulez voir ajoutée.
+
+### Expérience Utilisateur
+
+> Indiquez ce que l'utilisateur aura comme bénéfice avec cette fonction.
+
+### Priority/Importance
+
+> Selon vous, quelle est l'importance de cette fonctionnalité.
+
+/label ~Feature
--- a/assets/actions/attaque.svg
+++ b/assets/actions/attaque.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="m214.02 19.115-.02.06a433.415 433.415 0 0 1 106.393 58.446L368.02 158.4C292.254 72.063 181.72 20.678 64.66 20.604c-14.96-.01-30.027.834-45.14 2.535v18.8c108.174-12.774 213.91 21.292 293.527 88.554l42.314 97.416C290.887 132.486 182.425 73.885 66.395 73.21a349.119 349.119 0 0 0-46.879 2.906v18.85c98.998-13.552 196.12 18.532 267.11 82.264l30.708 87.82c-53.922-85.58-148.482-138.656-249.986-139.69a297.451 297.451 0 0 0-47.83 3.398v18.914c93.33-15.18 185.38 18.05 247.677 83.27l20.694 83.917C246.555 230.42 160.67 176.716 67.7 175.423a248.202 248.202 0 0 0-48.182 4.06v19.036c89.513-17.794 178.655 19.16 230.357 89.468l4.62 73.348c-28.973-83.013-107.888-136.692-193.257-135.87a201.938 201.938 0 0 0-41.72 4.78v19.188c77.22-18.904 155.333 13.983 197.095 77.14l5.873 57.49c23.33-6.283 47.534-13.218 68.727-20.873 19.194-6.93 35.884-14.525 46.596-22.038 5.354-3.756 9.142-7.478 11.174-10.574 2.033-3.096 2.47-5.184 2.098-7.59l-1.252-8.123 137.074-39.556C446.897 159.92 363.67 69.964 260.654 19.114H214.02zm278.86 273.922-40.196 11.6c1.63 18.66-4.666 36.567-16.397 52.043-14.18 18.707-35.934 34.627-62.363 48.257-45.23 23.33-104.45 39.877-164.397 47.97l4.38 16.35c68.63-7.66 143.34-22.038 198.17-48.538 30.517-14.75 54.633-33.123 68.722-55.33 12.74-20.084 17.775-43.384 12.08-72.353zm-58.513 16.885-65.027 18.765c-.736 4.345-2.345 8.51-4.733 12.147-3.925 5.98-9.462 10.986-16.068 15.62-13.213 9.266-30.996 17.098-50.978 24.316-31.927 11.53-68.41 20.998-99.558 29.134l6.644 24.79c59.027-7.79 117.64-24.153 160.71-46.366 24.828-12.805 44.388-27.573 56.037-42.94 8.804-11.614 13.283-23.135 12.972-35.466zm-261.754 77.43-33.033 8.85 8.197 30.59c10.812 3.95 18.623 14.38 18.623 26.485 0 6.87-2.52 13.2-6.673 18.114l4.716 17.6 33.034-8.85-24.864-92.788zM138.22 443.79c-1.49 0-2.88.33-4.12.91l-75.6 20.255a30.49 30.49 0 0 1 4.625 16.14c0 .67-.03 1.33-.072 1.987l75.96-20.352c4.96-.386 8.698-4.37 8.698-9.453 0-5.35-4.138-9.488-9.49-9.488zM32.327 468.985c-6.798 0-12.11 5.312-12.11 12.11 0 6.798 5.312 12.11 12.11 12.11 6.798 0 12.111-5.312 12.111-12.11 0-6.798-5.313-12.11-12.11-12.11z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/comp.svg
+++ b/assets/actions/comp.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M119.1 25v.1c-25 3.2-47.1 32-47.1 68.8 0 20.4 7.1 38.4 17.5 50.9L99.7 157 84 159.9c-13.7 2.6-23.8 9.9-32.2 21.5-8.5 11.5-14.9 27.5-19.4 45.8-8.2 33.6-9.9 74.7-10.1 110.5h44l11.9 158.4h96.3L185 337.7h41.9c0-36.2-.3-77.8-7.8-111.7-4-18.5-10.2-34.4-18.7-45.9-8.6-11.4-19.2-18.7-34.5-21l-16-2.5L160 144c10-12.5 16.7-30.2 16.7-50.1 0-39.2-24.8-68.8-52.4-68.8-2.9 0-4.7-.1-5.2-.1zM440 33c-17.2 0-31 13.77-31 31s13.8 31 31 31 31-13.77 31-31-13.8-31-31-31zM311 55v48H208v18h103v158h-55v18h55v110H208v18h103v32h80.8c-.5-2.9-.8-5.9-.8-9 0-3.1.3-6.1.8-9H329V297h62.8c-.5-2.9-.8-5.9-.8-9 0-3.1.3-6.1.8-9H329V73h62.8c-.5-2.92-.8-5.93-.8-9 0-3.07.3-6.08.8-9H311zm129 202c-17.2 0-31 13.8-31 31s13.8 31 31 31 31-13.8 31-31-13.8-31-31-31zm0 160c-17.2 0-31 13.8-31 31s13.8 31 31 31 31-13.8 31-31-13.8-31-31-31z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/defense.svg
+++ b/assets/actions/defense.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M80 32c-64 256 48 416 176 464 128-48 240-208 176-464-112 32-240 32-352 0zm99.3 52.9c14.7 27.9 40.1 26.4 65 26.4l53.9 1.5 7.8 25 77.1 10.3 3.5 49.9c-27.9 7.4-83.7 5.9-83.8 17.7-.2 20.6 36.3 16.2 78.1 5.9L356.7 276l-61.4 4.4c3.8 46.4-1.2 77.6-35.6 110.7l-21.9-55.3c-12.6 22.6-30 38.8-57.3 41.4 10.6-26 19.1-46.7 9.7-76.3-13.5 13.3-35.1 18.7-64.8 16.7 31.6-49 48.3-101.9 62.1-151.9l-23.2-20.6c-6.6-23.5-1.3-44.1 15-60.2z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/defense1.svg
+++ b/assets/actions/defense1.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M261.563 64.28A191.758 191.758 0 0 0 64.25 256a191.758 191.758 0 1 0 383.5 0A191.758 191.758 0 0 0 261.562 64.28zm-4.625 9.126 8.937 5.156v10.313l-8.938 5.156-8.906-5.155V78.562l8.907-5.156zm3.53 29.25A153.407 153.407 0 0 1 409.407 256a153.407 153.407 0 0 1-306.812 0A153.407 153.407 0 0 1 260.47 102.656zm-11.53 20.03a133.607 133.607 0 0 0-65.157 20.908V368.22a133.607 133.607 0 0 0 65.157 21.092V122.688zm17.687.314v266.125a133.607 133.607 0 0 0 63.438-22.03V145a133.607 133.607 0 0 0-63.438-22zm-100.5 34.344A133.607 133.607 0 0 0 122.405 256a133.607 133.607 0 0 0 43.72 98.78V157.345zm-60.72 1.625 8.907 5.155v10.28l-8.906 5.157-8.937-5.156v-10.28l8.936-5.157zm300.5 0 8.94 5.155v10.28l-8.94 5.157-8.905-5.156v-10.28l8.906-5.157zm-58.155.093V353.03A133.607 133.607 0 0 0 389.594 256a133.607 133.607 0 0 0-41.844-96.938zm57.813 173.125 8.937 5.156v10.312l-8.938 5.156-8.906-5.156v-10.312l8.906-5.156zm-299.813.718 8.938 5.156v10.313l-8.938 5.156-8.938-5.155v-10.313l8.938-5.156zm149.906 85.188 8.938 5.156v10.313l-8.938 5.156-8.906-5.158v-10.31l8.906-5.156z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/jeu.svg
+++ b/assets/actions/jeu.svg
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 310.12469 310.12469"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="jeu.svg"
-   width="310.12469"
-   height="310.12469"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2532"
-     inkscape:window-height="1492"
-     id="namedview8"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="155.06205"
-     inkscape:cy="142.25079"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg6" />
-  <g
-     class=""
-     transform="translate(-100.93795,-121.74921)"
-     id="g4">
-    <path
-       d="m 477.518,181.966 a 25,25 0 0 1 -34.91,23 l -62.29,150.26 h -248.92 l -62.24,-150.19 a 25,25 0 1 1 9.73,-7.29 l 87,71.2 20.92,-126.4 a 25,25 0 1 1 14.7,-1.85 l 54.31,117 54.42,-117.3 a 25,25 0 1 1 14.58,2.08 l 20.93,126.42 87.26,-71.3 a 25,25 0 1 1 44.51,-15.63 z m -71.66,241.25 h -300 v 60 h 300 z m -27.75,-52 h -244.22 v 36 h 244.22 z"
-       fill="#ffffff"
-       fill-opacity="1"
-       transform="matrix(0.7,0,0,0.7,76.8,76.8)"
-       id="path2" />
-  </g>
-</svg>
--- a/assets/actions/meditation.svg
+++ b/assets/actions/meditation.svg
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="meditation1.svg"
-   width="512"
-   height="512"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3840"
-     inkscape:window-height="2054"
-     id="namedview10"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="254.56378"
-     inkscape:cy="255.99978"
-     inkscape:window-x="-11"
-     inkscape:window-y="-11"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg8">
-    <inkscape:grid
-       type="xygrid"
-       id="grid856" />
-  </sodipodi:namedview>
-  <path
-     id="polygon2"
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     d="M 256,0 0,256 256,512 512,256 Z m 5.11719,62.361328 c 8.239,0 15.89463,4.297288 21.83203,12.054688 5.2108,6.811 8.83798,16.231192 9.64648,26.841794 -8.4868,-3.970403 -17.26742,-6.37191 -26.14062,-7.13281 v 12.81836 c 8.5484,0.9429 17.03537,3.85822 25.48437,8.64062 -1.442,8.41469 -4.67333,15.84043 -8.99023,21.48243 -5.9367,7.7574 -13.59443,12.05468 -21.83203,12.05468 -8.2376,0 -15.8726,-4.29728 -21.8086,-12.05468 -4.452,-5.8184 -7.76497,-13.52864 -9.14257,-22.26953 7.8043,-4.21541 15.53348,-6.75681 23.20898,-7.72071 V 94.191406 c -7.938,0.763 -15.87192,2.852576 -23.66992,6.300784 0.9261,-10.297007 4.51857,-19.430374 9.60547,-26.076174 5.936,-7.7581 13.57099,-12.052735 21.80859,-12.052735 z M 228.50391,144.4375 c 0.14,0.1883 0.27391,0.38286 0.41601,0.56836 7.8876,10.3082 19.34232,17.19336 32.19922,17.19336 12.8569,0 24.31162,-6.88586 32.19922,-17.19336 0.1421,-0.1862 0.27797,-0.37936 0.41797,-0.56836 7.2765,3.3453 12.81763,7.79108 15.76953,12.86328 h 0.0449 l 29.11524,45.10547 35.48046,-15.37891 c 20.5632,-11.2833 43.10446,16.80074 21.43946,29.18164 l -66.12891,30.84571 -25.74609,-33.90821 c -11.6662,23.2505 -11.80448,46.48779 6.66992,69.73829 37.3275,-3.0275 65.31156,3.90026 69.47656,19.44726 3.4104,12.7316 -9.91357,28.42679 -33.35937,42.45899 l -66.10743,-21.9629 33.66602,-11.17773 -4.11328,-12.4043 -50.29102,16.69141 -50.26757,-16.69141 -4.11133,12.4043 126.1289,41.89063 15.53321,37.60351 -64.44532,-20.10351 0.0234,-0.22071 c -0.2989,-0.0168 -0.5782,-0.0463 -0.875,-0.0645 l -0.30664,-0.0879 h -1.09375 c -43.1116,-2.7132 -70.90445,-9.13273 -109.87695,-29.64063 -19.6938,-13.027 -30.49667,-27.09126 -27.38867,-38.69726 h -0.0215 c 3.4755,-12.9682 23.51598,-19.95189 51.73438,-20.14649 5.3179,-0.0364 10.93654,0.18537 16.77734,0.63477 19.418,-23.6082 20.76969,-47.21649 7.67969,-70.80859 l -26.6211,35.04296 -66.1289,-30.84375 c -21.665,-12.3816 0.87304,-40.46424 21.43554,-29.18164 l 35.46094,15.37891 29.13672,-45.10547 0.26172,0.0664 c 2.9421,-5.1016 8.50701,-9.56969 15.81641,-12.92969 z m -44.58008,217.70117 c 12.7582,5.6602 24.87218,9.90172 37.20898,13.10352 l -48.91406,15.24609 z" />
-</svg>
--- a/assets/actions/oeuvre.svg
+++ b/assets/actions/oeuvre.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(2,-1)" style=""><path d="m375.2 23.61-12.7 12.7 24.5 24.5c.5-1.2 1-2.3 1.5-3.5 2.4-6.6 4.1-12.4 4.9-15.5zm33.3 30.5c-.9 3-1.9 5.9-3.3 9.6-4 10.8-9.1 23.4-20.2 30.4-4 2.4-8.1 2.6-11.2 2.3-3.1-.3-5.6-1.1-7.5-1.6-1.7-.4-2.6-.6-3.2-.7-.6.9-1.2 2.2-1.6 4.5-.8 3.19-1 7.49-.8 11.59.1 6 .7 10.5 1.2 13.1l26.8 26.8c2.6.4 7.1 1 13 1.2 7.5.1 14.3-1.8 16-2.7-.1-.8-.2-1.4-.6-2.9-.5-2-1.3-4.5-1.7-7.6-.3-3.1 0-7.3 2.3-11.2 7-11.1 19.6-16.2 30.5-20.3 3.6-1.4 6.6-2.2 9.6-3.1l-16.4-32.89zm-67.2 3.4-12.7 12.7 17.4 17.5c1.3-2.9 3-5.6 5.6-7.9 2.5-2.2 5.6-3.3 8.3-3.7zm128.9 60.99c-3.2.8-9.1 2.4-15.7 5-1.1.4-2.2.8-3.4 1.3l24.6 24.6 12.7-12.7zm-120.7 17.9L217.4 262.3l9.8 9.8 129-129zm86.3 15.5c-.4 2.8-1.5 6-3.8 8.5s-4.8 4.3-7.5 5.6l17.3 17.3 12.7-12.7zm-66.9 3.9L240 284.9l9.7 9.6 125.9-132zm-226.3 94.5c-30.4 0-60.87 11.6-84.13 34.9-46.53 46.5-46.53 121.7 0 168.3C105 500 180.2 500 226.8 453.5c35.8-35.9 43.9-88.5 24.7-132.2L156.8 416l14.9 14.9-12.8 12.7-90.46-90.5 12.73-12.7 14.75 14.7 94.78-94.7c-15.3-6.8-31.7-10.1-48.1-10.1zm60.6 23.2-94.5 94.4 11.3 11.3 94.5-94.4zm24 24L132.7 392l11.2 11.2 94.6-94.4z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/actions/sort.svg
+++ b/assets/actions/sort.svg
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="66.69709mm"
-   height="66.69709mm"
-   viewBox="0 0 378.10574 378.10571"
-   version="1.1"
-   id="svg3"
-   sodipodi:docname="sort.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="3840"
-     inkscape:window-height="2054"
-     id="namedview5"
-     showgrid="false"
-     inkscape:zoom="3.887601"
-     inkscape:cx="72.254869"
-     inkscape:cy="97.300114"
-     inkscape:window-x="-11"
-     inkscape:window-y="-11"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3"
-     inkscape:document-rotation="0"
-     inkscape:snap-text-baseline="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <path
-     id="Sélection #2"
-     fill="none"
-     stroke="black"
-     stroke-width="1"
-     d="M 189.05286,0 378.10571,189.05286 189.05285,378.10571 0,189.05286 Z m 98.94184,241.93328 c -0.88,-10.41 -2.89,-10.17 -9.87,-16.75 l -5.39,-5.72 c -2.61,-2.12 -6.9,-3.02 -8.72,-5.91 -1.19,-1.9 -0.91,-4.46 -1.28,-6.62 -3.40308,-4.90559 -2.01923,-20.20245 -2.01923,-26.63889 3.88586,-9.60746 4.36923,-1.69111 7.45923,-14.36111 0.62,-2.55 2.32,-6.14 1.21,-8.69 -1.07,-2.43 -3.44,-2.03 -6.71,-5.17 -5.66937,-7.30653 -11.39498,-14.88252 -18.68,-20.92 -23.49144,-15.67176 -34.12005,-20.68725 -60,-20.32 -8.54383,0.23148 -13.2432,0.66798 -20,2.68 -19.05,6.09 -27.58,11.85 -41.76999,25.79 -8.08,7.96 -7.17,10.3 -10.91,14.41 -3.1,3.4 -6.12,3.44 -6.73,7.27 -0.64,1.83 -0.09,3.98 0,5.78 1.91418,8.65633 2.50026,3.00305 7.73101,9.8295 1.38405,9.6854 0.3222,25.26042 -0.70608,33.05113 -2.53556,2.89228 -2.29493,5.91937 -3.63493,7.97937 -1.62,2.49 -4.35,2.16 -7.77,5.03 -5.170004,4.32 -4.470004,8.06 -13.210004,13.28 1.78,5.5 4.63,5.91 10,6 z M 195.6316,118.20709 c 11.22808,5.82176 1.31866,21.02928 -11.27386,31.1911 13.0336,5.31132 -0.79998,6.64062 23.09132,6.48796 l 32.86359,-0.54563 13.5005,1.22254 7.27084,3.68304 c -4.13,5.49 -2.71929,1.23718 -2.08929,8.68718 h -4 c -0.28,-1.68 -0.54282,-4.85331 -1.87282,-6.17331 -3.32127,-0.17387 -9.61514,-0.5831 -13.55025,0.47743 -0.17052,3.22972 -0.29693,4.01588 -0.57693,5.69588 l -3.40923,-0.34102 c -0.28,-1.68 0.27564,-3.83025 -1.05436,-5.15025 -3.7305,-0.17387 -10.29718,-0.7195 -13.48204,0.40923 -1.33,1.32 -0.77437,3.40204 -1.05437,5.08204 h -3 c -0.28,-1.68 0.071,-3.08 -0.91796,-5.08204 -2.83922,-1.53335 -14.39204,-0.93796 -18.08204,-0.91796 -1.96,0.01 -5.02,-0.11 -6.68,1.02 -0.19823,6.27508 -0.4088,8.38327 1.52129,9.86916 l 20.15871,0.0399 v 37.07089 h -19.09 c 0.0887,-5.45486 2.17,-22.09 0,-25.77 -2.24,-3.53 -10.37,-4.58 -13.31,-1.63 -0.59765,14.41964 -0.37159,20.85123 -0.92619,27.34486 -16.5374,0 -13.4074,0.42 -16.5374,0 l -0.13641,-21.94486 c -0.0284,-4.56991 -0.5617,-9.93269 1.12488,-14.46674 3.57532,-2.18241 14.40143,0.2341 20.38143,-0.7259 1.06669,-3.31458 1.12908,-6.5781 0.80651,-10.05451 -2.74793,-0.83105 -4.76282,-0.70285 -7.31282,-0.75285 h -11 c -7.39,0.05 -9.43418,2.79797 -7.61418,10.68797 l -6.48228,0.24114 c 0.72,-2.06 1.97646,-7.02474 0.81646,-9.16474 -1.7,-3.14 -11.93127,-2.75719 -14.21127,-0.43719 -2.03,2.07 -1.8049,7.64421 -1.24493,10.08421 l -7.37013,0.12387 c -0.24405,12.94493 0.23633,18.13752 0.10633,29.28752 -0.09,7.42 0.28,6.88722 -7.99999,7.17722 v -28 c 0,-2.48 0.22,-6.59 -1.17,-8.69 -1.62,-2.42 -4.26,-2.22 -6.83,-2.31 2.73,-7.8 6.25917,-8.9 -1.27083,-9 10.53404,-8.39725 16.12632,-16.70355 22.85717,-22.49183 5.05278,-4.9362 12.06169,-10.2231 15.11169,-11.61765 14.97984,-6.56268 20.63207,-10.69702 43.93886,-10.61671 z m -73.26379,44.49619 c -0.79548,4.04536 -1.9331,12.40663 2.6469,12.48663 10.50353,0.43469 11.50999,-8.2279 8.90999,-11.7879 -1.43,-1.96 -9.22689,-0.64873 -11.55689,-0.69873 z m 19.62689,11.59316 9.01278,-0.14468 0.91722,5.78152 c 0.10638,11.6222 0,0 0.0146,31.52202 -8.59422,-0.32911 -7.4946,-0.52202 -9.9446,-0.52202 z m 80.95177,-0.77164 8.14469,0.22835 -0.0965,36.18013 h -8 z m 19.38582,0.5305 7.6014,-0.33759 0.061,36.21557 h -8 z m -129.12528,49.01235 11.33333,-0.31493 45.72718,-0.54563 59.09028,-0.81845 33.54662,-0.27282 c 7.10809,1.39089 4.61048,5.28283 13.46463,11.36941 -49.05198,-0.38776 -122.72138,-0.48241 -173.42548,-0.8649 z"
-     style="fill:#d6d2d0;fill-opacity:1;stroke:none"
-     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccsccccccccccccccccccccccccccccccccccc" />
-</svg>
--- a/assets/actions/surprise-demi.svg
+++ b/assets/actions/surprise-demi.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M355.102 21.097c-33.682.164-64.173 18.585-74.615 50.5 21.357-.79 23.203 53.922 23.203 53.922l41.619 6.262c-13.41 12.963-50.025 5.967-50.025 5.967-17.14 19.182-33.124 40.966-47.758 57.578-15.952 18.127-35.2 38.103-57.018 60.086-6.79 6.823 41.594-9.821 34.342-2.604-24.567 12.751-42.297 16.097-61.764 32.069-31.312 25.674-62.853 60.71-81.146 79.431-7.711 7.91-44.362 37.674 20.469 34.74 2.404 7.52-1.621 9.456-7.493 15.293-4.327 4.303-18.082.283-22.263 2.828-22.172 35.055-17.246 37.975-27.43 58.047-4.252 11.635 41.68-14.404 64.305-34.18 13.974-7.58 25.147-21.652 35.002-17.202 43.11 18.984 129.826 35.53 141.328 27.619 18.368-12.646-10.321-46.343 3.832-97.912 23.47 5.817 43.825 13.657 66.767 11.459-1.581 49.307 3.56 55.306-3.888 104.777l59.129 21.127 1.91-13.809-33.815-22.478c14.568-50.659 16.809-72.578 15.227-121.719-.16-5.372-45.168-24.325-74.492-33.133l18.593-30.412c30.393-44.788 124.141-62.055 127.932-88.258-13.02-19.676 3.022-27.384-25.092-21.912-6.295 1.318-13.771 24.346-18.023 27.213-7.843 5.276-40.655 24.477-51.951 18.377-1.9-1.026 7.246-33.441 6.85-44.78-.116-3.205-1.19-6.625-2.866-10.001.185-.64 15.24-52.482 54.809-94.016-43.978 25.134-65.332 79.925-65.354 79.98-2.207-2.134-4.476-3.983-6.639-5.423-1.916-14.7-4.819-73.02 68.598-78.776-21.427-21.177-47.704-30.78-72.283-30.66z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/actions/surprise-totale.svg
+++ b/assets/actions/surprise-totale.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M332.031 66.13c-28.807-.01-55.439 14.149-67.88 40.65 20.79 1.744 16 55.07 16 55.07-11.814 16.687-24.73 33.186-36.589 50.146 0 0-99.046 132.283-178.378 168.025-28.049 22.593-33.305 36.532-44.137 52.649-4.877 9.54 9.257 14.324 11.701 13.2 22.726-10.461 25.176-20.866 47.07-35.675 12.805-5.026 23.839-15.9 31.854-11.049 34.962 20.86 107.556 44.28 118.271 38.706 17.857-9.263-5.78-43.585 16.174-89.057 31.97-3.352 58.916-.885 88.332-12.094 3.483 50.279 10.106 54.59 6.766 107.092l71.2 1.045.698-14.61-41.814-11.105c11.528-56.054 11.816-78.996 4.672-127.996-.956-6.622-53.746-8.275-81.012-3.79 24.449-24.202 40.274-45.24 47.506-68.44l.027.189c7.637 15.923 30.083 33.958 35.336 37.125 27.704 11.048 38.214 7.982 62.955 3.887 4.907-.784 27.47 24.537 44.807 9.597 2.642-20.238 16.522-20.369-4.938-32.71-4.847-2.73-27.063 7.462-31.418 6.898-20.21-2.481-30.954-5.211-58.45-12.703-10.23-13.187-32.676-56.136-55.43-59.744 6.535-14.15 28.226-53.108 73.664-66.237-20.943-26.54-49.925-39.057-76.987-39.068zm82.405 46.722c-46.658 19.516-58.266 50.4-58.266 50.4l9.916 7.644s9.646-4.765 48.35-58.044zm23.04 160.005-4.658 11.418c5.233-.083 10.425.47 15.328 1.608-12.774 30.856-23.938 59.635-28.181 93.094l-.908 7.558 4.863-5.889c20.805-25.671 32.303-55.25 44.95-85.78 4.203 2.656 8.24 5.885 12.071 9.35l4.78-11.374-20.518-8.526-31.767 66.579 24.062-69.713-20.021-8.325z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/actions/tache.svg
+++ b/assets/actions/tache.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="M56.813 18.438c-.47-.005-.938.014-1.407.03-.625.023-1.252.066-1.875.126-7.468.72-14.682 4.148-22.31 11.125-9.985 9.128-12.863 17.66-11.407 27.718 1.455 10.056 8.353 22.236 21.125 34.906 2.895 2.872 6.126 5.737 9.593 8.625 1.27 1.055 2.565 2.13 3.907 3.186a200.62 200.62 0 0 0 3.438 2.656c.232.175.454.358.688.532C74.71 119.38 95.558 131.28 120.25 142.22c159.723 161.31 288.815 297.553 374.594 352.124-51.11-85.624-187.432-214.62-350-375.531-10.23-23.802-21.115-43.71-32.094-59.282 35.46-10.19 82.517-2.294 125.75 40.94 40.243 40.242 52.642 90.776 41.375 128.343 4.89 4.914 9.883 9.913 14.688 14.75 19.07-46.1 4.573-108.895-42.844-156.313-35.694-35.693-75.48-50.324-111.032-50.22-1.147.005-2.3.03-3.438.064-21.844.65-41.957 6.898-58.344 17.187a102.302 102.302 0 0 0-8.312 5.814c1.33 3.094 2.758 5.884 4.406 8.218 1.92 2.72 4.004 4.936 6.906 6.688 2.202-1.717 4.498-3.375 6.938-4.906a88.727 88.727 0 0 1 3.25-1.97c8.196 10.088 15.465 24.624 25.47 47.25-23.907-10.568-38.822-18.04-49.033-27 .024-.03.04-.063.064-.093-.433-.33-.867-.655-1.28-1-.013-.008-.022-.02-.033-.03-11.215-10.375-16.532-22.934-22.31-44.5 5.988 1.605 11.256 3.19 16 4.844a137.13 137.13 0 0 1 26.81-15.875c-9.5-7.738-18.552-11.93-26.686-12.97-1.443-.185-2.87-.3-4.282-.313zM493.28 64.374c-77.985 0-125.587 28.886-146.124 69.406-20.536 40.52-13.994 90.39 9.688 131.407 11.385 19.72 17.807 40.687 19.187 61.22a4329.64 4329.64 0 0 1 18.47 19.187c2.31-29.955-5.072-61.35-21.47-89.75-21.13-36.602-26.155-80.112-9.186-113.594 16.97-33.481 55.94-59.188 129.437-59.188V64.376zM37.907 114.938c-2.894 23.925 6.18 50.21 29.532 73.562l13.218-13.188c-15.97-15.97-23.188-31.833-24.437-46.593-6.646-4.51-12.754-9.102-18.314-13.782zM124.062 277c-24.466-.028-45.04 4.92-61.343 13.656-24.842 13.31-39.363 35.865-40.75 60.47-2.78 49.207 44.38 102.65 140.405 118.28 101.63 16.544 170.303-9.184 205.406-54.062 1.01-1.29 1.988-2.59 2.94-3.906-4.552-4.232-9.148-8.52-13.783-12.875-1.233 1.79-2.52 3.55-3.875 5.28-29.97 38.315-90.355 62.97-187.687 47.126-90.394-14.715-126.796-62.527-124.75-98.783 1.023-18.127 10.982-34.37 30.938-45.062 19.955-10.692 50.267-15.364 90.5-7.47 34.077 6.69 62.938 3.47 85.437-6.936-4.72-4.65-9.49-9.33-14.28-14.064-17.545 6.452-39.89 8.088-67.564 2.656-14.895-2.923-28.778-4.297-41.594-4.312z" fill="#fff" fill-opacity="1"></path></g></svg>
--- a/assets/scenes/9fmf9lcb3L9XO3bJ-thumb.png
+++ b/assets/scenes/9fmf9lcb3L9XO3bJ-thumb.png
--- a/assets/scenes/YSpVuLeMCX9tAmgn-thumb.webp
+++ b/assets/scenes/YSpVuLeMCX9tAmgn-thumb.webp
--- a/assets/ui/ajout-competence.svg
+++ b/assets/ui/ajout-competence.svg
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 256px; width: 256px;"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="add-skill.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs12" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2138"
-     inkscape:window-height="1465"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="1.0150849"
-     inkscape:cx="466.02267"
-     inkscape:cy="44.586362"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg8" />
-  <path
-     d="M0 0h512v512H0z"
-     fill="url(#pattern)"
-     fill-opacity="0.5"
-     id="path2" />
-  <g
-     class=""
-     transform="translate(-81.40366,-2.6174234)"
-     id="g6">
-    <path
-       d="m 119.1,25 v 0.1 c -25,3.2 -47.1,32 -47.1,68.8 0,20.4 7.1,38.4 17.5,50.9 L 99.7,157 84,159.9 c -13.7,2.6 -23.8,9.9 -32.2,21.5 -8.5,11.5 -14.9,27.5 -19.4,45.8 -8.2,33.6 -9.9,74.7 -10.1,110.5 h 44 l 11.9,158.4 h 96.3 L 185,337.7 h 41.9 c 0,-36.2 -0.3,-77.8 -7.8,-111.7 -4,-18.5 -10.2,-34.4 -18.7,-45.9 -8.6,-11.4 -19.2,-18.7 -34.5,-21 l -16,-2.5 L 160,144 c 10,-12.5 16.7,-30.2 16.7,-50.1 0,-39.2 -24.8,-68.8 -52.4,-68.8 -2.9,0 -4.7,-0.1 -5.2,-0.1 z M 311,55 v 48 H 208 v 18 h 103 v 158 h -55 v 18 h 55 V 407 H 208 v 18 h 103 v 32 h 80.8 c -0.5,-2.9 -0.8,-5.9 -0.8,-9 0,-3.1 0.3,-6.1 0.8,-9 H 329 V 297 h 62.8 c -0.5,-2.9 -0.8,-5.9 -0.8,-9 0,-3.1 0.3,-6.1 0.8,-9 H 329 V 73 h 62.8 c -0.5,-2.92 -0.8,-5.93 -0.8,-9 0,-3.07 0.3,-6.08 0.8,-9 z m 129,202 c -17.2,0 -31,13.8 -31,31 0,17.2 13.8,31 31,31 17.2,0 31,-13.8 31,-31 0,-17.2 -13.8,-31 -31,-31 z m 0,160 c -17.2,0 -31,13.8 -31,31 0,17.2 13.8,31 31,31 17.2,0 31,-13.8 31,-31 0,-17.2 -13.8,-31 -31,-31 z"
-       fill="#000000"
-       fill-opacity="0.8"
-       transform="matrix(0.6,0,0,0.6,102.4,102.4)"
-       id="path4"
-       sodipodi:nodetypes="ccsccccccccccccccccssccccccccccccccccsccccsccccsccssssssssss" />
-  </g>
-  <g
-     class=""
-     transform="translate(124.63542,-119.78046)"
-     id="g6-1">
-    <path
-       d="m 158.81777,136.77499 c -9.48,32.22 -28.656,28.8 -47.61,26.04 21.39,6.12 29.61,22.38 25.998,47.64 7.596,-27.6 25.572,-31.56 47.652,-26.04 -22.56,-7.26 -34.14,-21.24 -26.04,-47.64 z m -41.76,76.08 c 5.496,10.02 4.578,18.06 -3.366,24 7.476,-4.14 14.91,-8.58 23.946,3.36 -7.542,-9.72 -4.92,-17.4 3.366,-24 -8.352,5.82 -16.482,6.96 -23.946,-3.36 z m 82.32,0.18 c 6.84,16.08 -0.3,24.78 -13.02,30.54 13.62,-5.1 24.48,-2.7 30.54,13.02 -7.62,-19.08 2.88,-24.72 13.02,-30.54 -12.6,5.1 -22.68,0.54 -30.54,-13.02 z m -52.776,31.2 c 9.396,34.68 0.516,58.86 -28.392,71.1 26.076,-7.08 52.428,-15.12 71.208,28.44 -15.84,-35.58 -2.04,-57.24 28.38,-71.28 -30,11.52 -55.86,9 -71.196,-28.26 z"
-       fill="#000000"
-       fill-opacity="0.8"
-       id="path4-2"
-       sodipodi:nodetypes="cccccccccccccccccccc"
-       style="stroke-width:0.6" />
-  </g>
-</svg>
--- a/assets/ui/broken.svg
+++ b/assets/ui/broken.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="10" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-3" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(248, 231, 28, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="40" result="blur"></feGaussianBlur><feOffset dx="0" dy="0" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-6" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter><filter id="shadow-7" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(72, 186, 255, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite><feGaussianBlur in="composite" stdDeviation="8" result="blur"></feGaussianBlur><feOffset dx="5" dy="15" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(0,0)" style=""><path d="M496.223 16.818l-48.475 44.205 48.475 4.575v-48.78zm-41.55 1.22l-68.91 11.28-7.04 65.547 75.95-76.828zM352.26 77.907l-87.887 50.3 15.447 41.026 82.662-16.87-10.222-74.456zm64.34 25.022l-32.967 67.443 24.842 70.684 54.314-134.19-46.19-3.937zm-271.362 72.808c-10.02.155-20.714 3.165-30.79 9.057 4.143 8.863 3.382 18.708-2.776 24.873-6.158 6.165-15.993 6.927-24.846 2.78-12.923 22.167-11.88 47.34 2.485 61.73l29.84-29.87c58.655 42.87 109.37 92.94 150.57 151.24l-36.19 36.23 6.61-6.604c14.283 14.298 39.192 15.42 61.23 2.732-4.88-9.197-4.366-19.74 2.107-26.22 6.47-6.478 17-6.993 26.185-2.112 12.66-22.062 11.54-47-2.732-61.3l-28.248 28.28c-57.035-42.41-107.91-92.665-151.426-150.386l35.455-35.492-6.61 6.603c-7.834-7.843-18.863-11.726-30.862-11.542zm108.45 4.512c-17.61 17.41-39.674 39.21-62.22 61.375 8.873 10.318 18.02 20.337 27.407 30.094l59.063-59.126-24.25-32.344zm78.28 32.688L297 219.968l-65 65.063c11.33 11.185 22.99 21.98 35 32.376 22.02-23.134 43.764-46.41 64.97-69.406v-35.063zM173.47 313.25c-31.146 40.858-67.877 74.323-108.905 101.875 4.13 13.708 16.394 26.374 30.624 30.563 29.466-41.26 61.113-79.902 100.97-109.97-7.368-7.662-14.914-15.154-22.688-22.468zM44.5 410.28l-20.844 20.845c7.133 24.65 27.843 44.912 53.72 53.438l19.28-19.313c-26.948-4.28-48.314-26.91-51.875-52.938l-.28-2.03z" fill="#9e0417" fill-opacity="1" transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)" filter="url(#shadow-1)"></path></g></svg>
--- a/assets/ui/compendium_banner.webp
+++ b/assets/ui/compendium_banner.webp
--- a/assets/ui/d100.svg
+++ b/assets/ui/d100.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><defs><filter id="shadow-1" height="300%" width="300%" x="-100%" y="-100%"><feFlood flood-color="rgba(201, 201, 201, 1)" result="flood"></feFlood><feComposite in="flood" in2="SourceGraphic" operator="atop" result="composite"></feComposite>0<feOffset dx="230" dy="300" result="offset"></feOffset><feComposite in="SourceGraphic" in2="offset" operator="over"></feComposite></filter></defs><g class="" transform="translate(-100,0)" style=""><path d="m375.483 251.243-109.98 51.138.213 183.381L477.01 266.346l-86.993-21.81zm-12.736 108.626-5.947 14.699-48.604-8.955 5.007-12.832a141.306 141.306 0 0 0 13.51-11.358 167.184 167.184 0 0 0 16.566-17.517 170.478 170.478 0 0 0 12.606-17.958 115.607 115.607 0 0 0 9.514-17.97l14.068 2.51q-9.37 22.334-30.361 44.43-13.296 13.64-20.645 18.636zM121.603 244.334l-84.71 21.763L246.474 486V302.38l-109.946-51.137zm19.147 50.852a28.72 28.72 0 0 1 24.273 6.802 53.052 53.052 0 0 1 11.226 14.188l-13.081 2.676a28.542 28.542 0 0 0-5.388-7.374q-5.185-4.876-11.262-3.853l-.487.095a6.458 6.458 0 0 0-5.162 4.448c-.856 2.378-.238 5.554 1.796 9.371q4.08 7.6 10.81 9.027a23.785 23.785 0 0 0 8.563-.203l1.867-.344 5.791 10.822q-6.398 1.427-8.23 3.282-3.21 3.14.429 9.93a17.042 17.042 0 0 0 6.089 6.696 10.406 10.406 0 0 0 7.385 1.534l.416-.083q4.757-.964 5.079-4.757c.261-2.57-.655-5.744-2.748-9.514l12.38-2.545a49.247 49.247 0 0 1 4.103 11.226 19.956 19.956 0 0 1-.642 9.383 11.702 11.702 0 0 1-3.96 5.411 19.575 19.575 0 0 1-8.027 3.235l-1.19.214a27.971 27.971 0 0 1-17.494-2.7 32.193 32.193 0 0 1-14.128-14.092q-3.627-6.79-2.604-12.19a8.396 8.396 0 0 1 2.521-4.947h-.071q-1.844.31-7.04-2.497a32.11 32.11 0 0 1-12.916-13.593q-5.245-9.764-3.282-18.398 1.962-8.634 13.676-11zM27.19 248.865l108.78-116.309a7.135 7.135 0 0 1 1.427 0h.154q3.14.345 2.842 3.71a19.36 19.36 0 0 1-3.294 8.1 39.376 39.376 0 0 1-9.728 10.405q-3.912 2.938-15.044 9.514-12.796 7.505-19.55 14.77a92.535 92.535 0 0 0-11.513 14.486l32.907 3.758 8.182-12.963-20.967-2.378a36.415 36.415 0 0 1 4.757-3.83q2.379-1.605 8.444-5.125l6.422-3.747a92.975 92.975 0 0 0 12.903-8.776 61.472 61.472 0 0 0 12.51-14.414q6.84-10.846 6.494-17.957c-.19-3.949-2.105-6.434-5.684-7.505l79.798-85.161-102.097 179.576-5.708 10.06zm367.238-71.974q-3.817-5.458-3.758-8.515c0-2.033 1.19-3.199 3.568-3.448h.57a11.892 11.892 0 0 1 6.91 2.247 29.85 29.85 0 0 1 7.837 8.051q3.687 5.28 3.71 8.397c0 2.093-1.188 3.258-3.496 3.567h-.594a11.75 11.75 0 0 1-6.957-2.378 29.79 29.79 0 0 1-7.79-7.885zm-109.41-141.52 83.948 89.634h-1.189c-.38 0-.975 0-1.463.107q-7.825.892-8.324 6.862-.5 5.97 5.03 13.747a53.778 53.778 0 0 0 6.375 7.374 37.901 37.901 0 0 0 10.144 6.897q-2.117 2.89-.702 7.98a37.283 37.283 0 0 0 5.613 11.096 55.122 55.122 0 0 0 15.223 14.806q8.098 5.268 16.066 4.935.81 0 1.618-.13 8.776-.988 9.228-7.873a16.114 16.114 0 0 0-.463-4.853l58.689 62.686-91.572-22.941-6.1-10.703zm98.22 104.927 2.45 2.617c.451.57.903 1.189 1.355 1.784 1.808 2.592 2.723 4.757 2.723 6.529 0 1.771-1.034 2.782-3.127 3.02h-.512a10.346 10.346 0 0 1-6.077-1.95 22.596 22.596 0 0 1-6.184-6.137c-1.974-2.83-2.937-5.102-2.878-6.814.06-1.713 1.118-2.7 3.187-2.937h.524a10.263 10.263 0 0 1 6.005 1.879 19.147 19.147 0 0 1 2.533 2.01zM255.987 26 137.456 231.026l118.532 55.05 118.604-55.05zm-1.19 208.463q-17.529 0-24.58-12.273-7.053-12.273-7.053-34.988 0-22.714 7.052-35.047 7.052-12.332 24.582-12.344 17.53 0 24.582 12.332 7.052 12.333 7.052 35.047 0 22.715-7.052 34.988-7.053 12.273-24.582 12.285zm10.538-71.807q2.497 7.968 2.497 24.546 0 15.817-2.497 24.201-2.498 8.384-10.537 8.325-8.04 0-10.632-8.325-2.593-8.324-2.593-24.2 0-16.579 2.593-24.547t10.632-7.968q8.015-.012 10.513 7.956z" fill="#fff" fill-opacity="1" filter="url(#shadow-1)" transform="translate(128, 128) scale(0.5, 0.5) rotate(-30, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_cards.svg
+++ b/assets/ui/icon_sidebar_cards.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M119.436 36c-16.126 0-29.2 17.237-29.2 38.5v363c0 21.263 13.074 38.5 29.2 38.5h275.298c16.126 0 29.198-17.237 29.198-38.5v-363c0-21.263-13.072-38.5-29.198-38.5zm26.369 10.951 11.002 32.856 34.648.312-27.848 20.617 10.41 33.05-28.212-20.114-28.215 20.113L128 100.736 100.152 80.12l34.649-.312zM363.979 161.84c7.127 9.459 12.739 20.689 16.832 32.04 3.8 10.544 6.197 21.211 6.668 31.02-.163 19.015-3.915 23.274-14.557 36.934l-6.703-11.48c-10.85-13.106-30.779-48.4-47.383-43.672-6.521 6.11-8.996 13.37-10.313 20.802 2.898 8.8 4.477 18.43 4.477 28.516 0 15.293-3.615 29.54-9.996 41.416 22.643 4.537 57.927 19.332 57.973 39.223-.27 3.783-1.835 7.68-4.362 10.42-10.743 12.528-36.958 4.125-45.2 10.072.796 6.947 4.112 14.118 4.355 20.174.136 4.36-1.768 10.58-6.508 13.996-5.67 4.087-12.968 4.551-18.52 3.045C279.94 392.226 272 379.649 256 377c-13.544 3.491-22.412 13.87-34.742 17.346-5.552 1.506-12.85 1.042-18.52-3.045-4.74-3.417-6.644-9.636-6.508-13.996-.058-7.142 4.107-13.794 4.356-20.174-15.741-7.788-33.816 1.97-45.201-10.072-2.527-2.74-4.093-6.637-4.362-10.42 6.146-27.341 35.374-34.684 57.973-39.223C202.615 285.54 199 271.293 199 256c0-11.489 2.047-22.385 5.764-32.135-2.357-7.923-3.441-15.988-9.438-22.441-8.758-.925-14.079 6.897-17.842 12.63-11.683 19.5-18.718 30.606-32.88 46.192-16.604-23.4-19.314-49.29-13.157-70.988 6.065-20.331 19.17-38.798 37.926-47.924 21.216-9.766 39.872-10.03 58.885.203 5.163-13.053 10.4-25.65 18.035-36.209 9.625-13.31 23.8-25.631 43.707-25.295 38.8.656 73.993 51.156 73.979 81.807zm-72.22-63.893c-35.759 2.409-44.771 44.746-55.189 71.29l-9.447-7.087c-18.428-12.31-31.076-13.732-49.875-4.63-12.924 6.288-23.701 20.62-28.553 36.882-3.38 11.329-3.765 23.225-.949 33.645 9.45-13.549 15.806-30.08 28.317-39.178 7.486-7.975 26.27-8.498 35.45 3.897 4.838 7.02 7.437 14.54 9.5 22.234h72.165c.592-1.944 1.067-3.762 2.017-6.033 2.956-7.064 7.765-16.266 18.395-19.504 18.09-3.862 32.494 7.106 43.498 18.514 4.517 4.717 8.492 9.696 12.098 14.517-.69-6.798-2.477-14.651-5.31-22.508-13.127-36.707-37.889-51.031-70.386-32.011 2.556-16.423 16.87-35.72 46.25-26.962-9.094-17.135-30.355-42.471-47.98-43.066zM220.644 233c-2.31 6.965-3.643 14.753-3.643 23 0 15.85 4.892 30.032 12.26 39.855C236.628 305.68 245.988 311 256 311s19.372-5.32 26.74-15.145C290.108 286.032 295 271.85 295 256c0-8.247-1.334-16.035-3.643-23zM232 280h48s-8 14-24 14-24-14-24-14zm-11.14 33.566c-13.86 3.34-50.369 8.9-51.842 21.42 9.621 1.947 20.446.838 28.998 2.235 5.993 1.018 12.82 3.323 17.285 9.517 3.375 4.683 3.577 10.103 3.037 14.21-.543 5.89-3.317 10.557-3.975 16.32 15.955-2.59 28.264-17.532 41.637-18.268 16-.702 29.313 17.402 41.637 18.268-.893-5.59-3.262-11.158-3.975-16.32-.54-4.107-.338-9.527 3.037-14.21 4.465-6.194 11.292-8.5 17.285-9.517 9.742-2.229 19.975.396 28.998-2.235-5.77-13.125-39.813-19.454-51.841-21.42C281.665 323.01 269.45 329 256 329c-13.452 0-25.665-5.991-35.14-15.434zm117.122 64.649 28.213 20.113 28.215-20.113L384 411.264l27.848 20.617-34.649.312-11.004 32.856-11.002-32.856-34.648-.312 27.848-20.617z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_chat.svg
+++ b/assets/ui/icon_sidebar_chat.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,-28)" style=""><path d="M211.313 21.094c-51.776 0-98.754 12.252-133.5 32.718C43.066 74.28 19.874 103.78 19.874 137.69c0 33.54 22.692 62.81 56.813 83.25L48.156 327.094l96.97-79.844c20.65 4.58 42.924 7.063 66.186 7.063 51.776 0 98.786-12.252 133.532-32.72 34.746-20.466 57.937-49.997 57.937-83.905s-23.19-63.41-57.936-83.875c-34.746-20.467-81.756-32.72-133.53-32.72zm0 18.687c48.8 0 92.866 11.77 124.03 30.126 31.165 18.357 48.75 42.447 48.75 67.78 0 25.338-17.585 49.457-48.75 67.814-31.164 18.357-75.23 30.125-124.03 30.125S118.445 223.857 87.28 205.5c-31.163-18.357-48.718-42.476-48.718-67.813 0-25.336 17.555-49.424 48.72-67.78C118.445 51.55 162.51 39.78 211.31 39.78zM96.53 89.938v18.688h93.126V89.937H96.53zm111.814 0v18.688h28.094V89.937h-28.094zm46.78 0v18.688h71.97V89.937h-71.97zM96.532 129.844v18.72h29.657v-18.72H96.53zm48.345 0v18.72h65.938v-18.72h-65.938zm84.656 0v18.72h38.095v-18.72H229.53zm56.782 0v18.72h40.782v-18.72h-40.78zM96.532 166.78v18.69h70.874v-18.69H96.53zm89.562 0v18.69h57.03v-18.69h-57.03zm75.72 0-.002 18.69h65.282v-18.69h-65.28zm92.342 90.25c-74.88 0-135.594 41.762-135.594 93.283 0 51.52 60.716 93.28 135.594 93.28 18.23 0 35.623-2.48 51.5-6.968l68.53 51.156-24.873-71.03c24.947-16.918 40.437-40.432 40.437-66.438 0-51.518-60.714-93.28-135.594-93.28zm-70.344 42.345h32.907v18.688H283.81v-18.688zm51.594 0h90.344v18.688h-90.344v-18.688zm-78.97 41.75h78.314v18.688h-78.313v-18.688zm97.002 0h20.968v18.688h-20.97l.002-18.688zm39.656 0h51v18.688h-51v-18.688zm-109.28 39h79.06v18.688h-79.062v-18.688zm97.748 0h44.188v18.688h-44.188v-18.688z" fill="#fff" fill-opacity="1" transform="translate(76.8, 76.8) scale(0.7, 0.7) rotate(0, 256, 256) skewX(0) skewY(0)"></path></g></svg>
--- a/assets/ui/icon_sidebar_macros.svg
+++ b/assets/ui/icon_sidebar_macros.svg
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 640 640"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="icon_sidebar_macros.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2666"
-     inkscape:window-height="1514"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="1.6241359"
-     inkscape:cx="170.14667"
-     inkscape:cy="292.89075"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4"
-     units="in" />
-  <path
-     d="m 378.25,116.16 c -13.6,-3.92 -27.76,4 -31.68,17.6 l -102.4,358.4 c -3.92,13.6 4,27.76 17.6,31.68 13.6,3.92 27.76,-4 31.68,-17.6 l 102.4,-358.4 c 3.92,-13.6 -4,-27.76 -17.6,-31.68 z m 51.68,108.88 c -10,10 -10,26.24 0,36.24 l 58.72,58.72 -58.72,58.72 c -10,10 -10,26.24 0,36.24 10,10 26.24,10 36.24,0 l 76.8,-76.8 c 10,-10 10,-26.24 0,-36.24 l -76.8,-76.8 c -10,-10 -26.24,-10 -36.24,0 z m -219.76,0 c -10,-10 -26.24,-10 -36.24,0 l -76.8,76.8 c -10,10 -10,26.24 0,36.24 l 76.8,76.8 c 10,10 26.24,10 36.24,0 10,-10 10,-26.24 0,-36.24 L 151.45,320 210.09,261.28 c 10,-10 10,-26.24 0,-36.24 z"
-     id="path2"
-     style="fill:#ffffff;stroke-width:0.8" />
-</svg>
--- a/assets/ui/icone_parchement_vierge.webp
+++ b/assets/ui/icone_parchement_vierge.webp
--- a/assets/ui/scriptarium.svg
+++ b/assets/ui/scriptarium.svg
--- a/assets/ui/tmr-v1.webp
+++ b/assets/ui/tmr-v1.webp
--- a/assets/ui/tmr-v2.webp
+++ b/assets/ui/tmr-v2.webp
--- a/assets/ui/tmr-v3-couleur.webp
+++ b/assets/ui/tmr-v3-couleur.webp
--- a/changelog.md
+++ b/changelog.md
--- a/css/foundryvtt-reve-de-dragon.css
+++ b/css/foundryvtt-reve-de-dragon.css
--- a/dev-notes.md
+++ b/dev-notes.md
@@ -0,0 +1,61 @@
+# Actor notes
+
+> The Actor#getData default implementation gives you the following for use in sheet rendering:
+
+```
+  actor -> the Actor instance
+  data -> a cloned copy of Actor#data
+  items -> a cloned copy of Actor#data#items
+  effects -> a cloned copy of Actor#data#effects
+```
+
+> if all you need is a safe copy of `Actor#data`, you'll be much better off by simply defining your own function and avoiding all the wasted work that the parent class does which will slow down your sheet
+```js
+getData(options) {
+  return {
+    data: foundry.utils.deepClone(this.object.data)
+  }
+}
+```
+
+who knows, maybe you don't even need to copy your actor data, skip the copy and it's even faster:
+```js
+getData(options) {
+  return {
+    data: this.object.data
+  }
+}
+```
+
+
+Atropos19/02/2021
+There are two recommended ways to create owned items in 0.8.0:
+```js
+await Item.create(itemData, {parent: actor});
+await actor.createEmbeddedDocuments("Item", itemDataArray);
+```
+
+
+You can update an embedded item in one of two ways:
+```js
+//Method 1:
+
+const item = actor.items.get(itemId);
+item.update(data);
+
+//Method 2:
+actor.updateEmbeddedDocuments("Item", [{_id: itemId, ...}]);
+```
+
+
+I noticed adding an ActiveEffect to an actor in code using
+
+```js
+this.createEmbeddedDocuments('ActiveEffect', [effet], options);
+this.applyActiveEffects();
+```
+
+Atropos — Aujourd’hui à 14:42
+Two notes on this:
+1. You don't actually need to call this.applyActiveEffects() because this will happen automatically whenever an effect is created/updated/deleted
+2. If you want to suppress the automatic display of the sheet for the newly created document, you can pass options.renderSheet = false as part of your options object
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,37 +0,0 @@
-const gulp = require('gulp');
-const less = require('gulp-less');
-
-function onError(err) {
-  util.log(util.colors.red.bold('[ERROR LESS]:'),util.colors.bgRed(err.message));
-  this.emit('end');
-};
-
-/* ----------------------------------------- */
-/*  Compile LESS
-/* ----------------------------------------- */
-function compileLESS() {
-  return gulp.src("less/foundryvtt-reve-de-dragon.less")
-      .pipe(less()).on('error',console.log.bind(console))
-      .pipe(gulp.dest("./css"))
-}
-const css = gulp.series(compileLESS);
-
-/* ----------------------------------------- */
-/*  Watch Updates
-/* ----------------------------------------- */
-const SIMPLE_LESS = ["less/*.less", "less/item/*.less"];
-
-function watchUpdates() {
-  gulp.watch(SIMPLE_LESS, css);
-}
-
-/* ----------------------------------------- */
-/*  Export Tasks
-/* ----------------------------------------- */
-
-exports.default = gulp.series(
-    gulp.parallel(css),
-    watchUpdates
-);
-exports.css = css;
-exports.watchUpdates = watchUpdates;
--- a/icons/compcreature-mandibules.webp
+++ b/icons/compcreature-mandibules.webp
--- a/icons/compcreature-morsure.webp
+++ b/icons/compcreature-morsure.webp
--- a/icons/empoignade.webp
+++ b/icons/empoignade.webp
--- a/icons/humanoides/humain.webp
+++ b/icons/humanoides/humain.webp
--- a/icons/tmr/attache.svg
+++ b/icons/tmr/attache.svg
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg52"
-   sodipodi:docname="attache.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata56">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1769"
-     inkscape:window-height="1333"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg52" />
-  <defs
-     id="defs46">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-3"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood35" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur39" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g50"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1">
-    <path
-       d="m 90.53,23 c -18.345,0 -36.688,7.002 -50.686,21 -27.996,27.996 -27.994,73.38 0,101.375 21.776,21.776 54.08,26.603 80.53,14.5 l 53.69,53.688 c -21.425,19.696 -44,38.257 -67.44,55.937 l 30.126,30.125 c 18.734,-22.545 37.953,-44.474 57.844,-65.53 L 364.188,403.688 C 312.343,444.132 243.322,457.526 171.375,446.25 L 173,424.906 72.47,404.47 l 95.405,88.405 1.97,-26 c 86.593,36.97 177.603,34.61 241.343,-11.75 l 63.062,21.313 -21.47,-63.594 c 44.61,-63.62 46.408,-153.412 9.908,-238.875 l 26.03,-1.97 -88.406,-95.375 20.438,100.53 21.344,-1.624 c 11.278,71.983 -2.168,141.017 -42.656,192.876 L 229.656,198.656 c 21.075,-20.34 42.93,-39.665 65.78,-57.72 l -30.123,-30.124 c -17.015,24.154 -35.673,46.66 -55.688,67.813 l -53.97,-53.97 C 167.834,98.183 163.032,65.814 141.22,44 127.22,30.002 108.877,23 90.53,23 Z m 0,27.03 c 11.434,0.002 22.872,4.34 31.595,13.064 17.447,17.447 17.446,45.742 0,63.187 -17.446,17.447 -45.71,17.447 -63.156,0 -17.447,-17.444 -17.448,-45.74 0,-63.186 C 67.69,54.37 79.097,50.03 90.53,50.03 Z"
-       fill="#8eff09"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
--- a/icons/tmr/conquete.svg
+++ b/icons/tmr/conquete.svg
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg41"
-   sodipodi:docname="conquete.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2077"
-     inkscape:window-height="1321"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="1573"
-     inkscape:window-y="459"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 27.084,18.248 c -44.987,128.23 116.066,259.672 287.412,362.826 -4.645,13.767 -5.585,27.628 -3.394,40.635 4.44,26.355 20.974,48.997 42.86,62.425 21.884,13.428 49.776,17.57 75.645,5.765 25.87,-11.804 48.69,-38.923 62.737,-84.654 l -17.865,-5.488 c -13,42.318 -32.806,64.094 -52.63,73.14 -19.825,9.047 -40.69,5.998 -58.116,-4.693 -17.425,-10.69 -30.75,-29.095 -34.205,-49.6 -3.455,-20.507 2.232,-43.318 24.677,-65.218 20.743,-20.24 32.068,-41.615 30.434,-61.24 l -18.622,1.552 c 0.74,8.89 -4.35,22.76 -16.684,37.486 C 222.057,230.8 73.838,128.622 27.084,18.248 Z m 458.05,0 C 451.34,98.03 364.527,173.53 270.93,247.166 c 19.492,15.878 39.56,31.622 59.195,45.012 110.756,-84.836 187.878,-180.243 155.01,-273.93 z M 127.58,292.146 c -1.634,19.626 9.69,41 30.434,61.24 22.445,21.9 28.132,44.712 24.677,65.218 -3.455,20.506 -16.78,38.91 -34.206,49.6 -17.425,10.692 -38.29,13.74 -58.115,4.694 -19.825,-9.046 -39.632,-30.822 -52.63,-73.14 l -17.865,5.488 c 14.046,45.73 36.867,72.85 62.736,84.654 25.87,11.805 53.763,7.663 75.648,-5.765 21.885,-13.428 38.42,-36.07 42.86,-62.426 2.19,-13.005 1.25,-26.863 -3.393,-40.628 13.986,-8.42 27.905,-17.022 41.648,-25.803 l -56.967,-39.387 c -6.55,5.103 -13.063,10.2 -19.52,15.293 C 150.55,316.46 145.46,302.59 146.2,293.7 l -18.622,-1.554 z m 18.1,73.614 c -26.1,8.6 -62.087,36.255 -77.104,60.324 4.948,8.63 10.393,15.223 16.05,20.14 25.846,-8.953 59.85,-37.406 74.733,-60.257 -3.007,-6.6 -7.454,-13.386 -13.68,-20.207 z m 220.863,0 c -6.225,6.822 -10.67,13.61 -13.68,20.21 14.886,22.85 48.89,51.3 74.736,60.255 5.656,-4.918 11.1,-11.51 16.05,-20.14 -15.018,-24.07 -51.004,-51.724 -77.105,-60.325 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/debordement.svg
+++ b/icons/tmr/debordement.svg
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 256px; width: 256px;"
-   version="1.1"
-   id="svg52"
-   sodipodi:docname="debordement.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata56">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2673"
-     inkscape:window-height="1516"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg52" />
-  <defs
-     id="defs46">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(255, 255, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="10"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="10"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-3"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood35" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur39" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g50"
-     style="stroke:#5959b2;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="m 400.9,104.8 c -12,30 -41,47.9 -99.7,43.9 -13.7,-1.8 -27.6,-4.1 -41.6,-6.7 C 140.5,104.8 23.36,104.8 23.36,179.2 56.84,142 141.1,148.4 248.4,175.2 c 116.8,29.2 241.8,41.2 241.8,-51.8 -18.4,19.3 -53.4,28.6 -96.6,30.4 10,-10.4 12.5,-26.7 7.3,-49 z M 147,187.5 c -70.75,-0.3 -123.64,16.1 -123.64,66.1 33.48,-37.2 117.74,-34.8 225.04,-8 116.8,29.2 241.8,45.2 241.8,-47.8 -35.4,37.2 -130.2,39.6 -230.6,8 -37.7,-11.9 -78,-18.2 -112.6,-18.3 z m -23.9,69.6 C 64.66,256.9 23.36,272.7 23.36,328 56.84,290.8 145.7,283.7 248.4,309.4 c 121,30.2 241.8,37.2 241.8,-37.2 -35.4,37.2 -132.1,22.6 -230.6,4 -48.4,-7.5 -96.5,-19.1 -136.5,-19.1 z m 0,74.3 c -58.44,-0.1 -99.74,15.8 -99.74,71 19.03,-21.1 55.52,-30.3 102.54,-30.8 -10.4,10.4 -12.9,26.9 -7.7,49.4 13.9,-34.8 52,-51.8 130.3,-37.2 122.6,22.8 241.7,37.2 241.7,-37.2 -35.4,37.2 -132.1,18.6 -230.6,0 -48.4,-7.6 -96.5,-15.1 -136.5,-15.2 z"
-       fill="#48baff"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#5959b2;stroke-width:7.77777778;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
--- a/icons/tmr/demi-reve.svg
+++ b/icons/tmr/demi-reve.svg
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg30"
-   sodipodi:docname="demi-reve.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata34">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2513"
-     inkscape:window-height="1633"
-     id="namedview32"
-     showgrid="false"
-     inkscape:zoom="2.2094112"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg30"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs24">
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     transform="translate(-2.1627108,-0.3)"
-     id="g28"
-     style="stroke:#000080;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 342.5,17.9 c -3.1,11.63 -2.2,21.56 -23.8,25.11 20.3,-2.7 22.3,9.58 24.8,21.49 -2.8,1.94 -5.5,4.11 -8.1,6.49 -21.9,20.84 -33,41.11 -49,61.61 -6.3,1.2 5.3,-53.52 31.1,-79.87 C 225.1,40.92 207.6,268.4 236.4,275 184.7,293.4 163.8,176.7 177,117.7 c -37.1,3.9 -62,39.8 -67.9,60 2.8,27.1 6.1,55.1 38.7,80.9 -32.1,3.6 -42,-27.8 -55.31,-54 -78.59,104.9 105.91,106.8 136.01,94.5 -93,70.5 -149.62,52.3 -196.77,39 -40.48,85.1 61.46,56 107.57,35.7 -18.4,30.7 -72.25,37.6 -88.92,41 61.62,51.3 174.42,-67 200.02,-106.5 2.5,65.7 -74.3,134.4 -122.8,171.7 43.6,2.2 83.2,-17.9 102.4,-55.5 0,10.1 -4.1,22.6 -9.6,35.8 15,-2.1 39.6,-6.2 48.8,-24.2 25,-54.1 37.8,-93.1 15.3,-138.2 29.9,33.5 63.6,65.3 58.4,114.5 26.9,-15.6 48.8,-33.6 24.7,-60.1 14.1,1.4 23.6,7.7 32.8,13.7 13.9,-2.8 34.4,-19.9 33.7,-33 -31.6,-29.8 -83.4,-43.7 -133.8,-55.9 72.1,-19.8 136.9,-10.1 175.6,5.6 5,-11.7 9.4,-29.6 5.9,-41.9 -16.4,-9.7 -62.7,-7.8 -83.3,-5.6 17.7,-15.7 56.8,-21.1 81.3,-21.2 -2,-67.7 -162.6,27.8 -182.2,42.8 32.7,-59.1 123.2,-112.7 178.7,-121.1 -13.2,-31.1 -37.2,-34 -64.3,-22.4 2.4,-9.5 6.7,-17.49 23.4,-15.29 -21.6,-3.51 -20.7,-13.44 -23.8,-25.07 -2.4,13.55 -4.1,17.11 -19.4,26.67 14.3,-2.17 16.4,6.69 17.4,14.69 -53.5,24.4 -117.8,102.8 -135.1,132.5 -22.1,-24 51,-121.5 107.7,-187.46 -3.1,-9.48 -21.8,-6.31 -38.2,4.81 1.1,-8.63 0.7,-22.16 17.9,-19.54 -15.3,-9.6 -17,-13.16 -19.4,-26.71 z m -166.3,0.3 c 5.4,10.73 12.7,17.53 -1,34.56 13.8,-16.07 23.7,-7.13 33.9,0.22 -4.6,-7.19 -16.3,-17.67 -0.7,-27.86 -17.8,3.09 -21.4,1.57 -32.2,-6.92 z M 47.71,26.61 C 44.63,38.24 45.58,48.17 23.95,51.66 44.97,48.92 46.34,62.21 49.01,74.47 50.44,66.04 48.73,50.5 67.15,53.31 51.88,43.72 50.17,40.16 47.71,26.61 Z m 419.39,5.5 c 1.6,10.83 1.3,13.93 -7.8,25.07 13.1,-6.8 15.9,5.39 19.1,11.38 C 477.2,58.59 475,48.2 491.5,44.92 474.3,47.79 472.4,40.07 467.1,32.11 Z M 125.3,84.28 c -0.6,18.02 -12,17.32 -22.7,17.92 7,2.4 20.3,3 15.3,18.2 10.2,-11.6 13.3,-12.5 25.2,-12.6 -9.4,-4.3 -17.8,-4.9 -17.8,-23.52 z M 71.21,153.9 c -8.61,8.5 -12.85,17.5 -33.24,9.6 19.47,8.3 13.98,20.4 10.08,32.4 5.46,-6.6 11.9,-20.9 26.35,-9.1 -8.38,-16 -8.02,-19.9 -3.19,-32.9 z M 453.9,282.7 c -2.4,8.9 -1.7,16.5 -18.2,19.2 16,-2.1 17.1,8.1 19.2,17.5 1.1,-6.5 -0.2,-18.4 13.8,-16.3 -11.7,-7.3 -13,-10 -14.8,-20.4 z M 69.25,293.8 c -12.82,12.7 -16.72,13.5 -30.41,12.7 10.55,5.7 20.39,7.1 18.72,29 2.3,-21.1 15.46,-19.4 28.05,-19.1 -7.83,-3.3 -23.4,-5.3 -16.36,-22.6 z m 394.55,50.7 c 3.1,11.6 8.9,19.7 -8,33.6 16.8,-12.9 24.6,-2.2 33.2,7.1 -3.1,-8 -12.4,-20.6 4.9,-27.4 -18,-0.5 -21.3,-2.8 -30.1,-13.3 z m -139.2,72.1 c -2.7,12.3 -4.1,25.5 -25.1,22.8 21.6,3.5 20.7,13.4 23.8,25 2.4,-13.5 4.1,-17.1 19.4,-26.6 C 324.3,440.6 326,425 324.6,416.6 Z M 83.9,438.2 c -2.83,16 -4.84,20.2 -22.86,31.5 21.68,-3.3 19.67,15.1 21.33,25 3.19,-14.5 4.84,-30.1 29.63,-26.9 -25.5,-4.2 -24.43,-15.9 -28.1,-29.6 z m 366.2,11.4 c -7.3,9.6 -10.2,19.1 -31.5,14.2 20.4,5.4 16.8,18.1 14.6,30.6 4.5,-7.3 8.8,-22.4 24.8,-12.8 -10.6,-14.6 -10.8,-18.6 -7.9,-32 z"
-       fill="#ffffff"
-       fill-opacity="1"
-       id="path26"
-       style="stroke:#000080;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/desorientation.svg
+++ b/icons/tmr/desorientation.svg
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="desorientation.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1599"
-     inkscape:window-height="932"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="1.3119567"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg6" />
-  <path
-     d="m 203.97,23 -18.032,4.844 11.656,43.468 c -25.837,8.076 -50.32,21.653 -71.594,40.75 l -31.47,-31.468 -13.218,13.22 31.376,31.374 c -19.467,21.125 -33.414,45.53 -41.813,71.343 l -42.313,-11.343 -4.843,18.063 42.25,11.313 c -6.057,27.3 -6.157,55.656 -0.345,83 l -41.904,11.216 4.843,18.064 41.812,-11.22 c 6.693,21.225 17.114,41.525 31.25,59.876 l -29.97,52.688 -16.81,29.593 29.56,-16.842 52.657,-29.97 c 18.41,14.216 38.784,24.69 60.094,31.407 l -11.22,41.844 18.033,4.81 11.218,-41.905 c 27.345,5.808 55.698,5.686 83,-0.375 l 11.312,42.28 18.063,-4.81 -11.344,-42.376 c 25.812,-8.4 50.217,-22.315 71.342,-41.78 l 31.375,31.373 13.22,-13.218 -31.47,-31.47 c 19.09,-21.266 32.643,-45.738 40.72,-71.563 l 43.53,11.657 4.813,-18.063 -43.625,-11.686 c 5.68,-27.044 5.576,-55.06 -0.344,-82.063 l 43.97,-11.78 -4.813,-18.063 L 440.908,197 c -6.73,-20.866 -17.08,-40.79 -31.032,-58.844 l 29.97,-52.656 16.842,-29.563 -29.593,16.844 -52.656,29.97 C 356.441,88.876 336.565,78.553 315.782,71.845 l 11.783,-44 L 309.5,23 297.72,66.97 c -27,-5.925 -55.02,-6.05 -82.064,-0.376 z m 201.56,85 -108.28,190.313 -0.75,0.437 -40.844,-40.875 -148.72,148.72 -2.186,1.25 109.125,-191.75 41.78,41.78 L 405.532,108 Z m -149.686,10.594 c 21.858,0 43.717,5.166 63.594,15.47 l -116.625,66.342 -2.22,1.28 -1.28,2.22 -66.25,116.406 c -26.942,-52.04 -18.616,-117.603 25.03,-161.25 26.99,-26.988 62.38,-40.468 97.75,-40.468 z m 122.72,74.594 c 26.994,52.054 18.67,117.672 -25.002,161.343 -43.66,43.662 -109.263,52.005 -161.312,25.033 l 116.438,-66.282 2.25,-1.25 1.25,-2.25 66.375,-116.592 z"
-     fill="#d0021b"
-     fill-opacity="1"
-     id="path2"
-     style="fill:#401060;fill-opacity:1" />
-</svg>
--- a/icons/tmr/fermeture.svg
+++ b/icons/tmr/fermeture.svg
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg52"
-   sodipodi:docname="fermeture.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata56">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2665"
-     inkscape:window-height="1441"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.5990661"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg52"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs46">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-3"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood35" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur39" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g50"
-     transform="matrix(1.1287777,0,0,1.1287777,-32.967091,-40.026839)"
-     style="stroke:#000000;stroke-width:4.42957014;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="M 72.877,31.904 C 71.887,31.89 70.919,31.91 69.889,32.002 43.67,35.408 22.545,61.005 18,93.775 v 26.15 c 2.296,16.266 8.804,30.665 17.848,41.565 -6.58,1.237 -12.504,3.53 -17.848,6.717 v 23.813 c 22.983,0.386 43.265,14.03 57.31,34.318 C 89.56,246.92 98,274.598 98,305 98,335.402 89.56,363.08 75.31,383.662 61.266,403.95 40.984,417.592 18,417.98 v 8.577 L 23.03,494 H 30.7 L 138.904,332.176 140,304 c 0.732,-41.132 16.536,-59.598 32,-48 4.26,3.195 8.3,6.024 12.135,8.533 l 23.574,-35.258 c -21.607,-17.4 -59.103,-43.23 -90.68,-68.658 10.89,-13.647 17.894,-32.612 17.894,-53.627 C 134.924,65.494 108.478,32 76,32 74.88,31.964 73.867,31.918 72.877,31.904 Z m 366.246,0 c -0.99,0.014 -2.002,0.06 -3.123,0.096 -32.478,0 -58.924,33.494 -58.924,74.99 0,21.015 7.005,39.98 17.895,53.627 -31.577,25.43 -69.073,51.26 -90.68,68.658 l 23.577,35.258 A 232.03,232.03 0 0 0 340,256 c 15.464,-11.598 31.268,6.868 32,48 l 1.096,28.174 L 481.3,494 h 7.67 L 494,426.557 v -8.578 C 471.017,417.591 450.735,403.949 436.69,383.661 422.44,363.08 414,335.402 414,305 c 0,-30.402 8.44,-58.08 22.69,-78.662 14.045,-20.288 34.327,-33.932 57.31,-34.318 v -23.813 c -5.344,-3.187 -11.27,-5.48 -17.848,-6.717 9.044,-10.9 15.552,-25.3 17.848,-41.566 V 93.774 C 489.454,61.004 468.33,35.408 442.11,32.002 a 28.52,28.52 0 0 0 -2.987,-0.098 z m -290.365,14.854 40.068,110.215 47.34,-31.653 z m 214.484,0 -87.408,78.562 47.34,31.653 z M 230.25,150.93 213.625,162.047 435.588,494 h 24.057 z m 51.5,0 -14.922,22.316 12.03,17.99 19.517,-29.19 z M 18,210.018 v 189.964 c 15.993,-0.38 30.943,-9.855 42.512,-26.566 C 72.322,356.356 80,332.036 80,305 80,277.965 72.322,253.643 60.512,236.584 48.942,219.874 33.992,210.398 18,210.018 Z m 476,0 c -15.993,0.38 -30.943,9.855 -42.512,26.566 C 439.678,253.644 432,277.964 432,305 c 0,27.035 7.678,51.357 19.488,68.416 11.57,16.71 26.52,26.186 42.512,26.566 z M 233.145,223.62 52.355,494 H 76.412 L 245.174,241.61 Z M 134.748,439.14 98.066,494 h 34.55 z m 242.504,0 2.13,54.86 h 34.552 z"
-       fill="#003fb2"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#000000;stroke-width:4.92174461;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/gift.webp
+++ b/icons/tmr/gift.webp
--- a/icons/tmr/maitrisee.svg
+++ b/icons/tmr/maitrisee.svg
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg56"
-   sodipodi:docname="maitrisee.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata60">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2352"
-     inkscape:window-height="1016"
-     id="namedview58"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg56" />
-  <defs
-     id="defs46">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-3"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood35" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur39" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <path
-     d="m 16,256 v 240 h 48 c 64,-160 320,-160 384,0 h 48 V 256 h -48 v 64 h -60 v -64 h -48 v 64 h -60 v -64 h -48 v 64 h -60 v -64 h -48 v 64 H 64 v -64 z"
-     class="selected"
-     fill="#087505"
-     fill-opacity="1"
-     filter="url(#shadow-3)"
-     id="path50"
-     style="fill:#7db27d;fill-opacity:1;stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none"
-     transform="matrix(0.9,0,0,0.9,25.6,25.6)" />
-</svg>
--- a/icons/tmr/pelerin.webp
+++ b/icons/tmr/pelerin.webp
--- a/icons/tmr/pelerinage.svg
+++ b/icons/tmr/pelerinage.svg
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg41"
-   sodipodi:docname="pelerinage.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2530"
-     inkscape:window-height="1154"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 259.844,73.406 1.625,214.47 -18.69,0.155 -1.655,-214.342 C 206.358,75.24 172.012,82.588 141,95.78 c 36.116,61.6 59.493,126.474 75.813,196.5 l -18.22,4.25 C 182.46,227.29 159.504,163.924 124,103.78 86.984,122.97 56.014,151.27 36.844,188.75 94.728,213.41 141.97,256.61 177.781,307.438 l -15.28,10.75 C 128.217,269.528 83.409,228.86 29.221,205.844 c -8.57,22.082 -13.345,46.943 -13.345,74.594 95.028,17.855 145.516,75.937 151.406,92 3.752,10.228 -27.905,21.074 -27.905,38.156 0,12.34 25.52,20.537 59.668,24.67 -3.846,-4.94 -7.694,-10.374 -11.59,-16.31 l 15.625,-10.255 c 9.802,14.937 18.996,25.865 27.354,32.73 8.358,6.864 15.493,9.632 22.423,9.68 13.862,0.094 31.592,-12.316 53.723,-42.776 l 15.12,10.984 c -4.31,5.93 -8.553,11.385 -12.76,16.35 36.362,-4.006 64.125,-12.375 64.125,-25.074 0,-17.92 -35.487,-28.412 -33.72,-39.97 2.31,-15.09 55.528,-74.91 156.626,-90.187 0,-28.807 -5.284,-54.622 -14.72,-77.437 -57.322,22.41 -104.478,64.46 -140.22,115.188 l -15.28,-10.75 c 37.145,-52.72 86.607,-97.216 147.47,-121.344 -20.457,-37.87 -53.207,-66.233 -92.064,-85.03 -36.426,60.947 -59.84,125.186 -76.22,195.467 l -18.186,-4.25 C 303.274,221.387 327.029,155.78 363.907,93.5 331.487,80.665 295.741,73.95 259.845,73.406 Z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/periple.svg
+++ b/icons/tmr/periple.svg
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg52"
-   sodipodi:docname="periple.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata56">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2760"
-     inkscape:window-height="1358"
-     id="namedview54"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg52" />
-  <defs
-     id="defs46">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-3"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood35" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite37" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur39" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset41" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite43" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g50"
-     style="stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="M 149.9,27.2 34.25,56.74 V 133.5 L 157.8,93.85 204.5,49.18 Z m 132.8,57 c -7.4,0.18 -10.1,1.88 0.9,7.13 C 346.9,121.6 441.7,206.8 391.3,216.9 232.2,249 130.4,292.3 48.51,390.8 25.42,418.6 18,494.8 18,494.8 h 432.6 c 0,0 -139,-21.1 -147.8,-75.7 C 287.9,326.9 497.3,316.4 499.3,219.2 500.2,176 411,94.21 314.9,86.68 309.3,86.24 292.2,83.97 282.7,84.2 Z m -163.5,40.9 -32.69,10.5 v 122.2 l 35.99,-10 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path48"
-       style="stroke:#000000;stroke-width:8.88888889;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/present.svg
+++ b/icons/tmr/present.svg
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg32"
-   sodipodi:docname="present.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2323"
-     inkscape:window-height="1657"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="2.0301699"
-     inkscape:cx="290.19906"
-     inkscape:cy="295.26229"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg32" />
-  <defs
-     id="defs24">
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-  </defs>
-  <path
-     d="M0 0h512v512H0z"
-     fill="#4a4a4a"
-     fill-opacity="0.5"
-     id="path26"
-     style="fill:none" />
-  <g
-     class=""
-     transform="translate(1,-1)"
-     id="g30"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1">
-    <path
-       d="M149.518 78.38c-6.55.117-12.45 1.736-17.35 4.91-7.465 4.84-11.765 12.904-13.063 21.34-2.595 16.874 4.747 36.355 19.862 52.31C154.08 172.893 177.643 185 208 185h2.438l-9.118-18.234c-22.194-1.554-38.46-10.777-49.287-22.205-11.885-12.545-16.543-28.064-15.138-37.19.702-4.564 2.402-7.25 5.062-8.974 2.66-1.724 7.113-2.875 14.756-1.326 13.078 2.65 34.233 13.948 62.205 39.284L220.27 135h23.408c-35.31-34.8-62.215-51.278-83.39-55.57-2.715-.55-5.363-.887-7.925-1.006-.96-.045-1.91-.06-2.845-.043zm212.964 0c-.935-.016-1.885 0-2.845.044-2.562.12-5.21.455-7.924 1.006-21.176 4.292-48.082 20.77-83.39 55.57h23.406l1.352 1.354c27.972-25.336 49.127-36.633 62.205-39.284 7.643-1.55 12.096-.398 14.756 1.326 2.66 1.725 4.36 4.41 5.062 8.973 1.405 9.126-3.253 24.645-15.138 37.19-10.827 11.43-27.093 20.652-49.287 22.206L301.562 185H304c30.357 0 53.92-12.106 69.033-28.06 15.115-15.955 22.457-35.436 19.862-52.31-1.298-8.436-5.598-16.5-13.063-21.34-4.9-3.174-10.8-4.793-17.35-4.91zM227.73 153l-8.78 8.777L229.564 183h52.875l10.61-21.223-8.777-8.777h-56.54zM73 201v46h142v-46H73zm160 0v270h46V201h-46zm64 0v46h142v-46H297zm-192 64v206h110V265H105zm192 0v206h110V265H297z"
-       fill="#ffffff"
-       fill-opacity="1"
-       id="path28"
-       style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
--- a/icons/tmr/rencontre.svg
+++ b/icons/tmr/rencontre.svg
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg41"
-   sodipodi:docname="rencontre.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1683"
-     inkscape:window-height="1292"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 324.97,17.54 c 0.03,0.034 0.057,0.07 0.087,0.106 l -34.924,32.428 36.904,-3.752 -15.396,30.12 38.048,-16.075 c 26.147,69.965 0.623,154.277 -52.555,166.262 -6.554,-25.37 -34.13,-37.945 -36.055,-57.382 0.303,0.093 0.604,0.187 0.912,0.27 4.833,1.295 9.736,1.183 14.274,-0.07 l 25.138,22.89 20.653,-16.377 c -7.363,2.836 -28.588,-1.402 -33.25,-13.923 3.154,-3.24 5.55,-7.284 6.793,-11.922 0.485,-1.813 0.757,-3.635 0.86,-5.445 l 11.524,22.777 5.22,-16.94 c 7.625,5.575 12.474,13.605 11.49,21.136 l 16.673,-29.4 -72.14,-29.56 -58.057,-48.03 17.1,31.25 -48.206,-19.753 35.14,31.237 c -40.602,28.158 -22.085,85.04 -1.796,119.29 -57.5,-9.685 -103.128,-77.435 -95.763,-145.03 l 49.21,-21.366 -31.08,-5.14 29.207,-33.417 -32.015,11.54 c 0.037,-0.067 0.07,-0.135 0.107,-0.202 -168.36,66.33 -116.413,367 -63.728,417.99 -0.19,-1.317 -0.364,-2.58 -0.54,-3.855 C 53.883,390.953 48.43,321.573 51.305,256.667 54.325,188.43 66.139,125.507 88.099,87.145 l 16.22,9.283 c -18.894,33.008 -31.4,94.563 -34.345,161.064 -1.942,43.86 0.106,90.022 6.275,132.082 6.124,1.892 15.046,9.615 27.295,23.24 -4.818,-13.35 -6.78,-26.5 -6.482,-38.28 20.286,41.665 67.34,69.234 104.633,62.308 22.444,-4.17 41.803,-12.73 57.81,-24.475 l 7.31,15.418 c -20.068,5.036 -22.807,32.635 -14.737,55.112 1.748,-19.882 11.36,-29.794 21.73,-32.303 -6.598,15.867 -4.698,30.623 -3.117,44.158 10.15,-12.147 21.47,-23.793 23.628,-39.354 8.738,7.332 12.317,21.49 1.194,39.057 26.32,-15.473 31.565,-41.994 7.978,-57.685 l -32.07,-34.297 c 5.918,-5.55 11.24,-11.6 15.947,-18.066 l 39.28,15.776 c -3.942,13.69 5.833,31.512 19.77,43.31 -8.055,-17.288 -4.826,-30.08 2.562,-37.103 1.63,17.39 10.64,29.193 18.733,40.064 2.73,-15.665 6.79,-31.493 -0.213,-45.987 11.016,1.56 21.2,11.568 20.338,31.877 14.362,-25.313 6.11,-49.702 -20.742,-51.52 l -71.135,-9.892 c 12.757,-22.982 18.676,-49.823 17.015,-77.475 14.188,-34.708 50.058,-11.816 54.523,49.16 27.425,-80.347 67.081,-38.617 58.825,24.513 11.808,-23.38 21.835,-35.013 29.862,-36.247 -10.772,-91.925 -40.458,-191.57 -77.637,-250.748 l 15.823,-9.942 c 50.328,80.106 85.112,220.65 84.88,331.547 C 521.655,285.828 476.905,45.13 324.97,17.54 Z m -29.458,476.913 -0.026,0.016 -0.015,0.05 c 0.015,-0.02 0.027,-0.044 0.042,-0.067 z m 26.543,-318.492 h 0.01 v -0.007 l -0.01,0.008 z m -53.348,-41.716 c 0.866,-0.027 1.757,0.073 2.652,0.313 4.774,1.28 7.467,5.945 6.187,10.72 -1.28,4.776 -5.943,7.47 -10.72,6.19 -4.775,-1.28 -7.468,-5.943 -6.188,-10.72 0.96,-3.584 3.823,-5.993 7.21,-6.435 0.282,-0.036 0.568,-0.06 0.857,-0.068 z M 204.904,297.13 c 11.878,-0.2 22.637,6.756 26.172,22.487 -0.008,35.88 -9.557,68.823 -42.137,77.412 -27.624,7.283 -69.725,-11.398 -84.12,-53.663 12.28,-21.078 37.362,-21.986 62.838,22.592 -12.583,-41.596 14.386,-68.444 37.246,-68.83 z"
-       fill="#003fb2"
-       fill-opacity="1"
-       filter="url(#shadow-1)"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       id="path37"
-       style="stroke:#000000;stroke-width:5.55555556;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/reserve.svg
+++ b/icons/tmr/reserve.svg
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg41"
-   sodipodi:docname="reserve.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1963"
-     inkscape:window-height="1393"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="257.8922"
-     inkscape:cy="255.21477"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#7db27d;fill-opacity:1"
-     transform="translate(0,0)">
-    <path
-       d="M149.688 85.625c-1.234.005-2.465.033-3.72.063-33.913.806-75.48 10.704-127.25 33.718V362.78c60.77-28.82 106.718-37.067 144.22-33.092 33.502 3.55 59.685 16.66 83.562 31.187v-242.97c-23.217-17.744-50.195-30.04-85.97-32-3.52-.192-7.142-.296-10.843-.28zm211.968 0c-3.7-.016-7.322.088-10.844.28-35.773 1.96-62.75 14.256-85.968 32v242.97c23.876-14.527 50.06-27.637 83.562-31.188 37.502-3.974 83.45 4.272 144.22 33.094V119.407c-51.77-23.014-93.337-32.912-127.25-33.72-1.255-.028-2.486-.056-3.72-.06zm5.72 261.78c-1.038-.002-2.074.017-3.095.033-4.808.075-9.43.37-13.905.843-33.932 3.597-59.603 17.976-85.53 34.44v.28c-6.554-1.99-13.02-2.37-19.408-.97-25.566-16.177-51.003-30.202-84.468-33.75-5.595-.592-11.44-.883-17.564-.842-32.04.213-71.833 9.778-124.687 35.937v42.53c60.77-28.823 106.714-37.067 144.218-33.092 18.545 1.965 34.837 6.845 49.75 13.28-4.682 6.064-9.308 13.268-13.875 21.688h117.156c-5.93-8.22-11.798-15.414-17.626-21.56 14.996-6.503 31.39-11.43 50.062-13.408 37.503-3.974 83.448 4.27 144.22 33.094v-42.53c-53.16-26.31-93.115-35.863-125.25-35.97z"
-       fill="#087505"
-       fill-opacity="1"
-       transform="translate(25.6, 25.6) scale(0.9, 0.9) rotate(0, 256, 256) skewX(0) skewY(0)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#7db27d;fill-opacity:1" />
-  </g>
-</svg>
--- a/icons/tmr/scroll.webp
+++ b/icons/tmr/scroll.webp
--- a/icons/tmr/sort-reserve-humide.svg
+++ b/icons/tmr/sort-reserve-humide.svg
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 256px; width: 256px;"
-   version="1.1"
-   id="svg24"
-   sodipodi:docname="sort-reserve-humide.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs28" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2660"
-     inkscape:window-height="1472"
-     id="namedview26"
-     showgrid="false"
-     inkscape:zoom="1.4393497"
-     inkscape:cx="557.39157"
-     inkscape:cy="411.60399"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg24"
-     inkscape:document-rotation="0" />
-  <g
-     id="g881"
-     transform="translate(2.1482304,2.80716)"
-     style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal">
-    <path
-       d="m 243.94189,104.37921 -82.23331,178.13543 82.23331,27.44784 z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path2"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="m 263.7837,104.37921 v 205.58327 l 82.23331,-27.44784 z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path4"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="M 168.21228,221.005 18.274279,239.7445 141.75653,278.32581 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path6"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="M 339.51331,221.005 365.96906,278.32581 489.5395,239.7445 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path8"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="M -0.24475089,254.73609 114.97007,398.80973 230.27308,326.7178 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path10"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="M 507.94829,254.73609 277.45251,326.7178 392.75552,398.80973 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path12"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-    <path
-       d="M 253.8628,335.42615 147.37837,402.00647 H 360.34722 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path14"
-       style="fill:#ffffff;stroke:#7d7db2;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-  </g>
-</svg>
--- a/icons/tmr/sort-reserve.svg
+++ b/icons/tmr/sort-reserve.svg
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg32"
-   sodipodi:docname="sort-reserve.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2318"
-     inkscape:window-height="1268"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="0.7031648"
-     inkscape:cx="1044.9871"
-     inkscape:cy="610.71305"
-     inkscape:window-x="518"
-     inkscape:window-y="680"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg32"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs24">
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-  </defs>
-  <path
-     d="M 0,0 H 512 V 512 H 0 Z"
-     fill="#4a4a4a"
-     fill-opacity="0.5"
-     id="path26"
-     style="stroke-width:1;fill:#4a4a4a;fill-opacity:0.01" />
-  <g
-     class=""
-     transform="translate(1,-1)"
-     id="g30"
-     style="fill:#ffffff;fill-opacity:1;stroke:#7d7db2;stroke-width:13;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-    <path
-       d="m 373.563,18.406 c -15.616,-0.167 -27.91,4.622 -32.563,14.75 -22.778,49.605 -48.743,87.14 -79.094,117.28 3.047,1.015 6.046,2.29 8.938,3.783 12.987,6.708 25.268,17.78 35.312,30.843 10.044,13.062 17.85,28.114 20.78,43.5 0.746,3.908 1.16,7.885 1.158,11.843 38.97,-24.36 85.058,-41.223 140.875,-51.312 14.91,-2.697 23.652,-28.632 21.405,-58.656 l -35.156,-1 30.56,-24.813 C 481.63,90.117 474.765,75.87 464.623,63.904 449.095,45.59 428.193,32.528 407.903,25.218 l -25.963,15.594 2.812,-21.5 c -3.875,-0.55 -7.61,-0.87 -11.188,-0.907 z M 246.938,166.562 c -1.063,0.052 -2.06,0.226 -3,0.47 -11.976,10.254 -24.61,19.597 -37.938,28.28 0.842,0.33 1.67,0.667 2.5,1.032 14.123,6.192 27.438,17.145 38.47,30.625 13.356,16.322 23.62,36.94 25.624,57.75 10.334,-10.367 21.24,-19.943 32.844,-28.72 4.096,-6.555 4.93,-14.468 3.125,-23.938 -2.184,-11.46 -8.642,-24.43 -17.25,-35.625 -8.61,-11.194 -19.38,-20.622 -29.063,-25.625 -6.052,-3.126 -11.154,-4.45 -15.313,-4.25 z m -61.907,43.282 c -1.385,0.053 -2.69,0.27 -3.968,0.562 -37,20.762 -79.088,37.985 -127.312,56 0.574,0.042 1.14,0.093 1.72,0.156 10.627,1.156 21.076,5.008 31.155,10.875 L 124.313,261 108.5,293.72 c 5.995,5.432 11.803,11.477 17.344,18 20.76,24.434 37.964,55.865 47.094,88.092 0.002,0.01 -0.003,0.022 0,0.032 2.98,10.508 5.11,20.916 6.312,31 20.99,-48.438 44.38,-89.26 72.344,-123 7.3,-21.48 -2.186,-48.408 -19.063,-69.03 -9.44,-11.538 -20.976,-20.718 -31.53,-25.345 -5.936,-2.604 -11.27,-3.808 -15.97,-3.626 z m 141.626,54.844 c -7.31,5.05 -14.462,10.51 -21.437,16.312 39.16,9.26 60.953,35.722 80.655,62.156 10.464,14.04 20.598,28.11 33.125,40.688 24.19,9.147 43.17,6.38 63.906,-14.938 -92.165,-27.78 -96.11,-92.61 -156.25,-104.22 z M 48.594,284.906 c -10.873,0.225 -18.26,5.755 -23.344,16.594 -5.81,12.387 -7.114,32.47 0.438,57.063 5.75,18.73 16.52,37.718 28.75,51.625 12.23,13.906 25.9,22.076 35.374,22.406 h 0.032 c 3.717,0.13 6.553,-0.682 8.812,-2.75 l -0.187,-0.188 2.093,-2.094 c 0.793,-1.168 1.52,-2.548 2.187,-4.187 2.81,-6.9 3.28,-18.552 -1.844,-33 -6.885,-19.417 -19.12,-31.932 -33.375,-34.78 l -22.968,-4.564 19.813,-12.5 38.47,-24.186 c -16.65,-16.822 -34.55,-27.607 -49.376,-29.22 -1.7,-0.184 -3.323,-0.25 -4.876,-0.218 z m 236.25,5.406 -24.53,25.375 c 100.442,17.878 55.45,141.005 159.31,176.188 l -24.78,-57.28 c 32.766,16.15 67.39,22.623 97.72,12.03 -135.77,-41.948 -96.32,-126.983 -207.72,-156.313 z m -169.47,38.22 -25.968,16.343 c 13.18,8.5 23.21,22.565 29.125,39.25 2.57,7.244 4.133,14.205 4.75,20.78 l 23.44,-23.374 c -8.08,-19.19 -19.035,-37.566 -31.345,-53 z m 38.376,72.374 -42.063,42 -0.156,-0.156 c -4.255,3.942 -9.456,6.765 -15.186,7.938 23.268,14.873 44.644,19.346 56.812,9.562 4.26,-3.426 7.043,-8.36 8.47,-14.406 -0.41,-12.684 -2.602,-26.615 -6.657,-40.906 -0.382,-1.346 -0.806,-2.686 -1.22,-4.032 z"
-       fill="#ffffff"
-       fill-opacity="1"
-       id="path28"
-       style="fill:#ffffff;fill-opacity:1;stroke:#7d7db2;stroke-width:13;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
--- a/icons/tmr/treasure-chest.webp
+++ b/icons/tmr/treasure-chest.webp
--- a/icons/tmr/trounoir.svg
+++ b/icons/tmr/trounoir.svg
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg32"
-   sodipodi:docname="trounoir.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1879"
-     inkscape:window-height="1569"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="1.4374483"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="460"
-     inkscape:window-y="170"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg32"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs24">
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-  </defs>
-  <path
-     d="M0 0h512v512H0z"
-     fill="#4a4a4a"
-     fill-opacity="0.5"
-     id="path26"
-     style="fill:#3a174d;fill-opacity:0.69999999" />
-  <path
-     d="m 329.547,18.115 c -30.61,99.22 -47.583,151.205 -86.88,156.778 -18.626,2.642 -42.988,-19.225 -70.16,-50.29 15.47,30.702 21.275,55.265 10.845,61.348 -15.787,9.21 -51.095,-6.94 -106.815,-30.837 31.653,20.827 83.667,50.18 77.358,58.63 -8.074,10.81 -77.23,-4.706 -130.866,-13.163 89.224,25.398 137.61,55.572 137.61,82.387 0,18.423 -48.845,62.18 -71.888,83.928 19.558,-11.397 64.736,-24.44 76.777,-2.99 13.335,23.758 -6.577,61.6 -28.5,128.027 31.39,-46.19 73.363,-108.122 90.734,-106.49 12.248,1.15 -4.805,60.692 -10.47,98.71 21.547,-80.082 46.534,-132.5 90.153,-131.015 29.665,1.01 58.022,30.762 88.99,52.047 -16.188,-19.81 -45.975,-47.99 -39.55,-53.243 8.9,-7.276 56.48,12.547 94.224,25.726 -24.982,-17.962 -68.644,-43.88 -61.653,-50.852 10.417,-10.387 72.436,1.332 117.49,7.178 C 419.2,303.266 370.1,289.807 359.616,255.461 c -5.283,-17.31 10.853,-40.3 40.89,-68.038 -31.377,17.197 -54.588,28.694 -63.737,12.392 -11.576,-20.622 11.374,-65.883 35.238,-126.06 -21.135,32.47 -48.532,83.487 -55.254,77.174 -8.972,-8.425 5.598,-77.597 12.795,-132.813 h -0.003 z M 21.45,18.27 V 41.63 C 69.97,69.067 116.703,104.02 162.783,144.416 129.015,102.731 95.443,60.626 68.758,18.27 Z m 175.79,0 c 18.465,37.356 34.503,76.96 48.475,117.97 -5.007,-39.79 -9.898,-79.367 -12.264,-117.97 h -36.21 z m 160.022,0 c -7.18,26.672 -15.416,53.437 -25.116,80.593 15.405,-27.34 30.698,-54.514 46.723,-80.593 H 357.26 Z m 105.123,0 c -27.895,50.718 -63.73,99.873 -105.707,147.755 46.514,-37.68 92.9,-75.343 140.164,-103.37 V 18.27 Z m 34.455,160.02 c -36.077,17.98 -74.843,34.036 -115.635,47.89 38.908,-6.17 77.882,-12.105 115.635,-15.77 z m -206.266,42.868 c 9.35,0 16.93,7.58 16.93,16.932 0,9.35 -7.58,16.93 -16.93,16.93 -9.35,0 -16.93,-7.58 -16.93,-16.93 0,-9.35 7.58,-16.932 16.93,-16.932 z m -52.06,1.598 c 15.508,0 28.082,12.57 28.082,28.08 0,9.718 -4.938,18.28 -12.44,23.322 3.614,3.843 5.842,9.002 5.842,14.694 0,11.86 -9.613,21.474 -21.473,21.474 -11.86,0 -21.474,-9.615 -21.474,-21.474 0,-5.687 2.228,-10.842 5.837,-14.684 -7.51,-5.04 -12.453,-13.608 -12.453,-23.332 0,-15.51 12.57,-28.08 28.08,-28.08 z M 21.45,234.078 v 38.547 c 31.87,-4.584 64.46,-5.693 97.532,-4.09 -33.727,-10.19 -67.407,-20.35 -97.53,-34.457 z m 265.82,28.377 c 9.35,0 16.93,7.58 16.93,16.932 0,9.35 -7.58,16.93 -16.93,16.93 -9.35,0 -16.932,-7.58 -16.932,-16.93 0,-9.35 7.58,-16.932 16.932,-16.932 z M 129.494,294.05 c -36.153,11.99 -72.24,20.293 -108.043,24.313 v 51.393 c 30.994,-28.64 69.426,-52.264 108.044,-75.703 v -0.002 z m 5.84,88.645 c -37.923,30.72 -75.607,61.482 -113.885,87.02 v 23.943 h 29.784 c 24.02,-37.76 52.365,-74.765 84.1,-110.963 z m 202.07,11.096 c 26.807,33.093 53.226,66.414 76.508,99.87 h 59.568 c -46.586,-27.078 -91.877,-61.12 -136.074,-99.87 z m -52.562,9.93 c -3.175,30.26 -6.39,60.5 -10.512,89.94 h 20.44 c -4.51,-29.083 -7.904,-59.17 -9.926,-89.94 z m 26.865,13.432 c 11.346,25.473 22.374,51.18 32.705,76.508 h 23.36 c -19.395,-23.9 -38.105,-49.64 -56.065,-76.508 z"
-     fill="#602000"
-     fill-opacity="1"
-     id="path28"
-     style="fill:#380f4d;fill-opacity:1" />
-</svg>
--- a/icons/tmr/urgence.svg
+++ b/icons/tmr/urgence.svg
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 512px; width: 512px;"
-   version="1.1"
-   id="svg41"
-   sodipodi:docname="urgence.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata45">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2038"
-     inkscape:window-height="1243"
-     id="namedview43"
-     showgrid="false"
-     inkscape:zoom="1.4355469"
-     inkscape:cx="256"
-     inkscape:cy="256"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg41" />
-  <defs
-     id="defs35">
-    <filter
-       id="shadow-1"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(248, 231, 28, 1)"
-         result="flood"
-         id="feFlood2" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite4" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="40"
-         result="blur"
-         id="feGaussianBlur6" />
-      <feOffset
-         dx="0"
-         dy="0"
-         result="offset"
-         id="feOffset8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite10" />
-    </filter>
-    <filter
-       id="shadow-6"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood13" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite15" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur17" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset19" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite21" />
-    </filter>
-    <filter
-       id="shadow-7"
-       height="300%"
-       width="300%"
-       x="-100%"
-       y="-100%">
-      <feFlood
-         flood-color="rgba(72, 186, 255, 1)"
-         result="flood"
-         id="feFlood24" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="atop"
-         result="composite"
-         id="feComposite26" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur28" />
-      <feOffset
-         dx="5"
-         dy="15"
-         result="offset"
-         id="feOffset30" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         id="feComposite32" />
-    </filter>
-  </defs>
-  <g
-     class=""
-     id="g39"
-     style="stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none">
-    <path
-       d="m 103.432,17.844 c -1.118,0.005 -2.234,0.032 -3.348,0.08 -2.547,0.11 -5.083,0.334 -7.604,0.678 -20.167,2.747 -39.158,13.667 -52.324,33.67 -24.613,37.4 2.194,98.025 56.625,98.025 0.536,0 1.058,-0.012 1.583,-0.022 v 0.704 h 60.565 c -10.758,31.994 -30.298,66.596 -52.448,101.43 -2.162,3.4 -4.254,6.878 -6.29,10.406 l 34.878,35.733 -56.263,9.423 c -32.728,85.966 -27.42,182.074 48.277,182.074 v -0.002 l 9.31,0.066 c 23.83,-0.57 46.732,-4.298 61.325,-12.887 4.174,-2.458 7.63,-5.237 10.467,-8.42 h -32.446 c -20.33,5.95 -40.8,-6.94 -47.396,-25.922 -8.956,-25.77 7.52,-52.36 31.867,-60.452 5.803,-1.93 11.723,-2.834 17.565,-2.834 v -0.406 h 178.33 c -0.57,-44.403 16.35,-90.125 49.184,-126 23.955,-26.176 42.03,-60.624 51.3,-94.846 l -41.225,-24.932 38.272,-6.906 -43.37,-25.807 h -0.005 l 0.002,-0.002 0.002,0.002 52.127,-8.85 C 457.16,52.713 433.552,23.734 385.022,23.734 341.14,32.26 222.11,35.29 149.34,28.496 134.452,21.733 118.793,17.773 103.432,17.844 Z m 0.464,18.703 c 13.137,0.043 27.407,3.804 41.247,10.63 l 0.033,-0.07 c 4.667,4.735 8.542,9.737 11.68,14.985 H 82.92 l 10.574,14.78 c 10.608,14.83 19.803,31.99 21.09,42.024 0.643,5.017 -0.11,7.167 -1.814,8.836 -1.705,1.67 -6.228,3.875 -15.99,3.875 -40.587,0 -56.878,-44.952 -41.012,-69.06 C 66.238,46.64 79.582,39.22 95.002,37.12 c 2.89,-0.395 5.863,-0.583 8.894,-0.573 z M 118.5,80.78 h 46.28 c 4.275,15.734 3.656,33.07 -0.544,51.51 H 131.52 c 1.9,-5.027 2.268,-10.574 1.6,-15.77 -1.527,-11.913 -7.405,-24.065 -14.62,-35.74 z m 101.553,317.095 c 6.44,6.84 11.192,15.31 13.37,24.914 3.797,16.736 3.092,31.208 -1.767,43.204 -4.526,11.175 -12.576,19.79 -22.29,26 h 237.19 c 14.448,0 24.887,-5.678 32.2,-14.318 7.312,-8.64 11.2,-20.514 10.705,-32.352 -0.186,-4.473 -0.978,-8.913 -2.407,-13.18 l -69.91,-8.205 42.017,-20.528 c -8.32,-3.442 -18.64,-5.537 -31.375,-5.537 H 220.053 Z m -42.668,0.506 c -1.152,-0.003 -2.306,0.048 -3.457,0.153 -2.633,0.242 -5.256,0.775 -7.824,1.63 -15.11,5.02 -25.338,21.54 -20.11,36.583 3.673,10.57 15.347,17.71 25.654,13.938 l 1.555,-0.57 h 43.354 c 0.946,-6.36 0.754,-13.882 -1.358,-23.192 -3.71,-16.358 -20.543,-28.483 -37.815,-28.54 z"
-       fill="#b41e00"
-       fill-opacity="1"
-       transform="matrix(0.9,0,0,0.9,25.6,25.6)"
-       filter="url(#shadow-1)"
-       id="path37"
-       style="stroke:#000000;stroke-width:11.11111111;stroke-miterlimit:4;stroke-dasharray:none" />
-  </g>
-</svg>
--- a/icons/tmr/wave.webp
+++ b/icons/tmr/wave.webp
--- a/icons/voyageurs/personnage.webp
+++ b/icons/voyageurs/personnage.webp
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,58 +1,54 @@
 {
-  "TYPES": {
-    "Actor": { 
-      "personnage": "Personnage",
-      "creature": "Créature",
-      "entite": "Entité de cauchemar",
-      "commerce": "Commerce",
-      "vehicule": "Véhicule"
-    },
-    "Item": {
-      "arme": "Arme",
-      "armure": "Armure",
-      "blessure": "Blessure",
-      "casetmr": "Case TMR spéciale",
-      "chant": "Chant",
-      "competence": "Compétence",
-      "competencecreature": "Compétence de créature",
-      "conteneur": "Conteneur",
-      "danse": "Danse",
-      "empoignade": "Empoignade",
-      "extraitpoetique": "Extrait poetique",
-      "faune": "Faune",
-      "gemme": "Gemme",
-      "herbe": "Herbe",
-      "ingredient": "Ingrédient",
-      "jeu": "Jeu",
-      "livre": "Livre",
-      "maladie": "Maladie",
-      "meditation": "Méditation",
-      "monnaie": "Monnaie",
-      "munition": "Munition",
-      "musique": "Musique",
-      "nombreastral": "Nombre astral",
-      "nourritureboisson": "Nourriture & boisson",
-      "objet": "Objet",
-      "oeuvre": "Oeuvre",
-      "ombre": "Ombre de Thanatos",
-      "plante": "Plante",
-      "poison": "Poison",
-      "possession": "Possession",
-      "potion": "Potion",
-      "queue": "Queue de Dragon",
-      "race": "Race",
-      "recettealchimique": "Recette alchimique",
-      "recettecuisine": "Recette de cuisine",
-      "rencontre": "Rencontre TMR",
-      "service": "Service",
-      "signedraconique": "Signe draconique",
-      "sort": "Sort",
-      "sortreserve": "Sort en réserve",
-      "souffle": "Souffle de Dragon",
-      "tache": "Tâche",
-      "tarot": "Carte de tarot",
-      "tete": "Tête de Dragon"
-    }
+  "ACTOR": {
+    "TypePersonnage": "Personnage",
+    "TypeCreature": "Créature",
+    "TypeEntite": "Entité de cauchemar",
+    "TypeCommerce": "Commerce",
+    "TypeVehicule": "Véhicule"
+  },
+  "ITEM": {
+    "TypeArme": "Arme",
+    "TypeArmure": "Armure",
+    "TypeBlessure": "Blessure",
+    "TypeCasetmr": "TMR spéciale",
+    "TypeChant": "Chant",
+    "TypeCompetence": "Compétence",
+    "TypeCompetencecreature": "Compétence de créature",
+    "TypeConteneur": "Conteneur",
+    "TypeDanse": "Danse",
+    "TypeExtraitpoetique": "Extrait poetique",
+    "TypeFaune": "Faune",
+    "TypeGemme": "Gemme",
+    "TypeHerbe": "Herbe",
+    "TypeIngredient": "Ingrédient",
+    "TypeJeu": "Jeu",
+    "TypeLivre": "Livre",
+    "TypeMaladie": "Maladie",
+    "TypeMeditation": "Méditation",
+    "TypeMonnaie": "Monnaie",
+    "TypeMunition": "Munition",
+    "TypeMusique": "Musique",
+    "TypeNombreastral": "Nombre astral",
+    "TypeNourritureboisson": "Nourriture & boisson",
+    "TypeObjet": "Objet",
+    "TypeOeuvre": "Oeuvre",
+    "TypeOmbre": "Ombre de Thanatos",
+    "TypePlante": "Plante",
+    "TypePoison": "Poison",
+    "TypePossession": "Possession",
+    "TypePotion": "Potion",
+    "TypeQueue": "Queue de Dragon",
+    "TypeRecettealchimique": "Recette alchimique",
+    "TypeRecettecuisine": "Recette de cuisine",
+    "TypeRencontre": "Rencontre TMR",
+    "TypeService": "Service",
+    "TypeSignedraconique": "Signe draconique",
+    "TypeSort": "Sort",
+    "TypeSortreserve": "Sort en réserve",
+    "TypeSouffle": "Souffle de Dragon",
+    "TypeTache": "Tâche",
+    "TypeTarot": "Carte de tarot",
+    "TypeTete": "Tête de Dragon"
  },
  "EFFECT": {
    "StatusStunned": "Sonné",
--- a/less/colors.less
+++ b/less/colors.less
@@ -1,58 +0,0 @@
-:root {
-
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
-    // --debug-background-color-red: #ff000054;
-    // --debug-background-color-blue: #1d00ff54;
-    // --debug-background-color-green: #54ff0054;
-
-    // --debug-box-shadow-red: inset 0 0 2px red;
-    // --debug-box-shadow-blue: inset 0 0 2px blue;
-    // --debug-box-shadow-green: inset 0 0 2px green;
-
-
-  /* =================== 3. some constants ============ */
-    --fieldset-background: url(/ui/parchment.jpg);
-    --rdd-color-text-primary: hsla(0, 0%, 4%, 0.9);
-    --rdd-input-background:hsla(0, 0%, 0%, 0.1);
-    --rdd-color-border-input: hsla(0, 0%, 0%, 0.2);
-    --rdd-bg-input: hsla(0, 0%, 100%, 0.1);
-    --color-controls:hsla(0, 0%, 0%, 0.9);
-    --color-controls-light:hsla(0, 0%, 20%, 0.8);
-    --color-controls-hover:hsla(60, 100%, 75%, 0.7);
-    --color-control-border-hover:hsla(30, 100%, 50%, 0.8);
-    --color-gold: rgba(191, 149, 63, 0.8);
-    --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3));
-    --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3));
-    --gradient-green: linear-gradient(30deg, rgba(7, 76, 0, 0.3), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.1), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.3));
-    --gradient-red: linear-gradient(150deg, rgba(255, 0, 0, 0.3), rgba(255, 200, 128, 0.05),rgba(255, 200, 128, 0.1), rgba(255,10,0,0.3));
-    --gradient-violet: linear-gradient(150deg, rgba(100, 45, 124, 0.6), rgba(216, 157, 192, 0.3), rgba(177, 157, 216, 0.5), rgba(107, 62, 121, 0.3), rgba(100, 45, 124, 0.6));
-    --gradient-purple-black: linear-gradient(150deg,  rgba(0, 0, 0, 0.7), rgba(100, 45, 124, 0.4), rgba(82, 17, 131, 0.3),rgba(100, 45, 124, 0.4), rgba(0, 0, 0, 0.7));
-    --gradient-silver-light: linear-gradient(30deg, rgba(61, 55, 93, 0.2), rgba(178, 179, 196, 0.1), rgba(59, 62, 63, 0.2), rgba(206, 204, 199, 0.1), rgba(61, 46, 49, 0.2));
-    --gradient-daylight: conic-gradient(
-      from 0deg,
-      hsla(50, 100%, 80%, 0.7),
-      hsla(30, 30%, 40%, 0.1) 25%,
-      hsla(250, 50%, 40%, 0.1) 25%,
-      hsla(250, 30%, 30%, 0.7) 50%,
-      hsla(250, 50%, 40%, 0.1) 75%,
-      hsla(30, 30%, 40%, 0.1) 75%,
-      hsla(50, 100%, 80%, 0.7)
-    );
-
-    --background-custom-button: linear-gradient(to bottom, hsla(208, 38%, 21%, 0.988) 5%, hsla(202, 42%, 14%, 0.671) 100%);
-    --background-custom-button-hover: linear-gradient(to bottom, hsla(0, 100%, 25%, 1) 5%, hsla(0, 97%, 12%, 1) 100%);
-    --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
-    --background-tooltip: hsla(60, 12%, 85%, 0.95);
-    --background-tooltip-alt: hsla(60, 12%, 74%, 0.95);
-    --color-tooltip:hsla(282, 47%, 33%, 0.9);
-    --color-tooltip-faint:hsla(282, 47%, 66%, 0.5);
-    --background-error:hsla(16, 100%, 50%, 0.8);
-    --color-profile-border: hsla(0, 0%, 80%, 0.05);
-
-    --color-background-chat-message: hsla(60, 12%, 85%, 0.9);
-    --color-background-chat-whisper: repeating-linear-gradient(120deg,
-      hsla(60, 12%, 85%, 0.75),
-      hsla(60, 12%, 85%, 0.75) 1rem, 
-      hsla(60, 12%, 85%, 0.8) 1rem, 
-      hsla(60, 12%, 85%, 0.75) 1.5rem);
-  }
--- a/less/fonts.less
+++ b/less/fonts.less
@@ -1,85 +0,0 @@
-/* ==================== (A) Fonts ==================== */
-@font-face {
-  font-family: "GoudyAcc";
-  src: url('../fonts/goudyacc.ttf') format("truetype");
-}
-@font-face {
-  font-family: "MedievalSharp";
-  src: url('../fonts/MedievalSharp.ttf') format("truetype");
-}
-@font-face {
-  font-family: "GrenzeGotisch";
-  src: url('../fonts/GrenzeGotisch-Regular.ttf') format("truetype");
-}
-@font-face {
-  font-family: "Fondamento";
-  src: url('../fonts/Fondamento.ttf') format("truetype");
-}
-@font-face {
-  font-family: "CaslonAntique";
-  src: url('../fonts/CaslonAntique.ttf') format("truetype");
-}
-@font-face {
-  font-family: 'HeuresDraconiques';
-  src:
-      url('../fonts/heuresdraconiques2.woff') format('woff'),
-      url('../fonts/heuresdraconiques2.woff2') format('woff2'),
-      url('../fonts/heuresdraconiques2.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-:root {
-  /* =================== 1. ACTOR SHEET FONT STYLES =========== */
-    --window-header-title-font-family: CaslonAntique;
-    --window-header-title-font-size: 1.6rem;
-    --window-header-title-font-weight: normal;
-    --window-header-title-color: #f5f5f5;
-
-    --major-button-font-family: CaslonAntique;
-    --major-button-font-size: 1.4rem;
-    --major-button-font-weight: normal;
-    --major-button-color: #dadada;
-
-    --tab-header-font-family: CaslonAntique;
-    --tab-header-font-size: 1.2rem;
-    --tab-header-font-weight: 700;
-    --tab-header-color: #403f3e;
-    --tab-header-color-active: #4a0404;
-
-    --actor-input-font-family: CaslonAntique;
-    --actor-input-font-size: 1.2rem;
-    --actor-input-font-weight: 500;
-    --actor-input-color: black;
-
-    --actor-label-font-family: CaslonAntique;
-    --actor-label-font-size: 1.2rem;
-    --actor-label-font-weight: 700;
-    --actor-label-color: #464331c4;
-}
-
-/* Global styles & Font */
-.application,
-.window-app {
-  font-family: CaslonAntique;
-  text-align: justify;
-  font-size: 1rem;
-  letter-spacing: 1px;
-}
-
-/* Fonts */
-.sheet header.sheet-header h1 input,
-.window-app .window-header,
-#actors .directory-list,
-#navigation #scene-list .scene.nav-item {
-  font-family: "GoudyAcc"
-}
-
-/* For title, sidebar character and scene */
-.sheet nav.sheet-tabs,
-.window-app input,
-.sheet header.sheet-header .header-compteurs,
-.sheet header.sheet-header .flex-group-center.flex-fatigue,
-select,  .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-  font-family: "CaslonAntique"; /* For sheet parts; For nav and title */
-}
--- a/less/foundryvtt-reve-de-dragon.less
+++ b/less/foundryvtt-reve-de-dragon.less
--- a/less/item/monnaie.less
+++ b/less/item/monnaie.less
@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.monnaie-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}
--- a/less/item/munition.less
+++ b/less/item/munition.less
@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.munition-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}
--- a/less/item/tarot.less
+++ b/less/item/tarot.less
@@ -1,7 +0,0 @@
-// Styles pour la feuille d'objet Monnaie
-.tarot-content {
-
-  .item-sheet-common();
-  .item-sheet-header();
-
-}
--- a/less/roll-dialog.less
+++ b/less/roll-dialog.less
@@ -1,220 +0,0 @@
-.roll-dialog {
-  font-family: CaslonAntique;
-  display: grid;
-  grid-template-areas:
-    "header header     header     header     header     header     header"
-    "action action     action     action     action     action     action"
-    "mode   separation separation separation separation separation separation"
-    "mode   carac      carac      carac      comp       comp       resume"
-    "mode   choix      choix      choix      choix      choix      modifiers"
-    "mode   resolution resolution resolution resolution resolution modifiers"
-    "mode   chances    chances    chances    chances    chances    buttons"
-    "footer footer     footer     footer     footer     footer     footer";
-  grid-template-columns: 2rem 1rem 1fr 1fr 2fr 2fr 3fr;
-  gap: 0.2rem;
-
-  roll-header { grid-area: header; }
-  roll-line  { grid-area: separation; }
-  roll-action { grid-area: action; }
-  roll-carac { grid-area: carac; }
-  roll-comp { grid-area: comp; }
-  
-  roll-choix { grid-area: choix; }
-  
-  roll-table { grid-area: resolution; }
-  roll-conditions { grid-area: modifiers; }
-  roll-chances { grid-area: chances; }
-  roll-resume { grid-area: resume; }
-  roll-buttons  { grid-area: buttons; }
-  
-  roll-mode {
-    grid-area: mode;
-    display: flex;
-    flex-direction: column;
-  }
-  roll-conditions roll-section[name="rollmode"],
-  roll-mode {
-    button[data-checked="true"] {
-      background-color: var(--color-text-selection-bg);
-      color: var(--color-controls);
-      i { filter: invert(0.8); }
-      img { filter: invert(0.2); }
-    }
-    button {
-      height: 1.8rem;
-      width: 1.8rem;
-      gap: 0.5rem;
-      padding: 0.2rem;
-      background-color: var(--button-background-color);
-      color: var(--color-controls);
-      i { filter: invert(0.2); }
-      img { filter: invert(0.8); }
-    }
-  }
-  
-  :is(roll-carac, roll-comp) {
-    display: flex;
-    flex-direction: row;
-    align-items: baseline;
-  }
-  
-  roll-section,
-  roll-section div {
-    display: flex;
-    flex-direction: row;
-    align-items: anchor-center;
-    margin: 0 0.2rem;
-  }
-  
-  roll-resume {
-    display: flex;
-    flex-direction: row;
-    img.button-effect-img {
-      filter: invert(0.8);
-    }
-  }
-
-  roll-choix roll-section {
-    display: grid;
-    grid-template-areas:
-      "selection selection"
-      "img roll-part";
-    grid-template-columns: 3.2rem 1fr;
-    gap: 0.2rem;
-    align-items: start;
-
-    subline {
-      grid-area: selection;
-      display: flex;
-      flex-direction: row;
-    }
-    roll-part-img {
-      display: flex;
-      flex-direction: column;
-      grid-area: img;
-      img{
-        border: 0;
-        padding: 1px;
-        max-height: 3rem;
-        max-width: 3rem;
-        object-fit: contain;
-        height: 100%;
-      }
-    }
-    roll-part-detail {
-      grid-area: roll-part;
-      display: flex;
-      flex-direction: column;
-      align-items: normal;
-      
-      subline {
-        display: flex;
-        flex-direction: row;
-        div.poesie-extrait{
-          display: flex;
-          flex-direction: column;
-        }
-      }
-    }
-  }
-
-  roll-section selected-numeric-value {
-    display: flow;
-    width: 2.5rem;
-    text-align: right;
-    margin: 0 0.2rem 0 0.5rem;
-    padding: 0 0.2rem;
-  }
-
-  roll-action {
-    flex-basis: content;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    border-bottom: 0.2rem solid;
-    font-size: 1.2rem;
-    font-weight: bold;
-    
-    roll-section {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-
-      img.action-img {
-        float: left;
-      }
-      img {
-        max-width: 3rem;
-        max-height: 3rem;
-        margin: 0 1rem;
-        padding: 0;
-      }
-    }
-  }
-
-  roll-conditions {
-    display: flex;
-    flex-direction: column;
-  }
-  :is(roll-action, roll-carac, roll-comp) roll-section {
-    flex-basis: content;
-  }  
-
-  :is(roll-choix, roll-conditions, roll-carac, roll-comp) {
-    select {
-      max-height: 1.6rem;
-      margin: 0 0.2rem;
-      padding: 0 0.2rem;
-    }
-    input[type="number"] {
-      max-height: 1.6rem;
-      max-width: 2.5rem;
-      margin: 0 0.2rem;
-      padding: 0 0.2rem;
-    }
-    img {
-          max-width: 1.8rem;
-          max-height: 1.8rem;
-          margin: 0 0.2rem;
-          padding: 0;
-    }
-  }
-
-  roll-carac select[name="select-carac"] {
-    max-width: 6rem;
-
-  }    
-  roll-comp select[name="select-comp"] {
-    min-width: 8rem;
-    max-width: 11rem;
-    margin-left: 1rem;
-  }     
-
-  roll-conditions roll-section[name="coeur"] select[name="coeur"]  {
-    max-width: 4rem;
-  }
-
-  roll-conditions roll-section[name="tricher"] img {
-    /* image de d100 */
-    max-width: 2.5rem;
-    max-height: 2.5rem;
-    gap: 0;
-    margin: 0;
-    padding: 0;
-    filter: invert(0.8);
-  }
-
-  roll-buttons { 
-    display: flex;
-    flex-direction: row-reverse;
-  }
-
-  roll-table {
-    table tr :is(th, td) {
-        padding: 0.1rem;
-        width: 1.5rem;
-        text-align: center;
-    }
-  }
-
-}
--- a/less/sheets.less
+++ b/less/sheets.less
@@ -1,108 +0,0 @@
-.item-sheet-common() {
-  padding: 0px;
-
-  // Styles pour la section de description, si le partiel utilise une structure standard
-  .editor,
-  .editor-content {
-    height: auto; // Ajuster selon le besoin
-    min-height: 100px; // Hauteur minimale pour la description
-    background: var(--rdd-bg-input-alt); // Une couleur de fond alternative
-    padding: 5px;
-    border-radius: 3px;
-    color: var(--rdd-color-text-primary);
-  }
-
-  .window-content {
-    font-family: CaslonAntique;
-    text-align: justify;
-    font-size: 1rem;
-    letter-spacing: 1px;
-    padding: 0% 0 0 0;
-
-    font-size: calc(var(--font-size-standard) * 1);
-    color: var(--color-dark-1);
-    background-size: 100% 100%;
-  }
-
-  fieldset {
-    background: var(--fieldset-background);
-    color: var(--rdd-color-text-primary);
-    margin-bottom: 4px;
-    border-radius: 6px;
-    border-color: var(--rdd-color-text-primary);
-    border-width: 2px;
-  }
-
-  .form-group {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    align-items: center;
-    padding: 2px 0;
-    border-bottom: 1px solid var(--rdd-color-shadow-primary);
-    font-size: 0.9rem;
-
-    label {
-      font-weight: normal;
-      flex: 2;
-      padding-left: 5px;
-      margin: 0;
-      color: var(
-        --rdd-color-text-primary
-      ); // Assurez-vous que cette variable existe dans colors.less
-    }
-
-    .attribute-value,
-    input[type="text"],
-    input[type="number"],
-    select {
-      flex: 3;
-      background: var(--rdd-input-background);
-      border: 1px solid var(--rdd-color-border-input); // Assurez-vous que cette variable existe
-      color: var(
-        --rdd-color-text-input
-      ); // Assurez-vous que cette variable existe
-      padding: 2px 2px; // Augmentation du padding vertical
-      border-radius: 3px;
-    }
-
-    input[type="checkbox"] {
-      flex: 0 0 20px; // Taille fixe pour les cases à cocher
-      margin-left: 5px;
-    }
-  }
-}
-
-.item-sheet-header() {
-  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
-  color: rgba(255, 255, 255, 1);
-  .sheet-header-row {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    h1,
-    input {
-      font-family: CaslonAntique;
-      font-size: 2.5rem;
-      font-weight: normal;
-      color: var(--window-header-title-color);
-      margin: 4px;
-      height: 3rem;
-    }
-  }
-
-  :is(
-    input[type="text"],
-    input[type="number"],
-    input[type="password"],
-    input[type="datetime-local"],
-    input[type="date"],
-    input[type="time"]
-  ) {
-    color: rgba(255, 255, 255, 0.75);
-    background: rgba(255, 255, 255, 0.1);
-    border: 0 none;
-    margin-bottom: 0.2rem;
-  }
-}
--- a/module/achat-vente/chat-vente.js
+++ b/module/achat-vente/chat-vente.js
@@ -1,65 +0,0 @@
-import { SYSTEM_RDD } from "../constants.js";
-import { RdDUtility } from "../rdd-utility.js";
-
-const DETAIL_VENTE = 'detailVente';
-const NB_LOTS = 'nbLotss';
-
-export class ChatVente {
-
-  static getDetailVente(chatMessageId) {
-    const chatMessage = game.messages.get(chatMessageId)
-    if (!chatMessage) {
-      return undefined;
-    }
-    const nbLots = chatMessage.getFlag(SYSTEM_RDD, NB_LOTS)
-    const detail = foundry.utils.duplicate(chatMessage.getFlag(SYSTEM_RDD, DETAIL_VENTE))
-    if (!detail.item) {
-      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
-      return undefined;
-    }
-
-    const vendeur = detail.vendeurId ? game.actors.get(detail.vendeurId) : undefined;
-    return foundry.utils.mergeObject(detail,
-      {
-        alias: vendeur?.name ?? game.user.name,
-        vendeur,
-        nbLots: nbLots,
-        chatMessageIdVente: chatMessageId
-      })
-  }
-
-  static getDetailAchatVente(chatMessageId) {
-    const acheteur = RdDUtility.getSelectedActor()
-    const detail = ChatVente.getDetailVente(chatMessageId)
-    if (!acheteur && !detail.vendeur) {
-      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
-      return undefined;
-    }
-    return foundry.utils.mergeObject(detail, { acheteur })
-  }
-
-  static async diminuerQuantiteAchatVente(chatMessageId, quantite) {
-    const chatMessage = game.messages.get(chatMessageId)
-    const vente = ChatVente.getDetailVente(chatMessageId)
-    vente.nbLots = Math.max(0, vente.nbLots - quantite)
-    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
-
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.hbs', vente);
-    chatMessage.update({ content: html });
-    chatMessage.render(true);
-  }
-
-  static async displayAchatVente(vente) {
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.hbs', vente);
-    const chatMessage = await ChatMessage.create(RdDUtility.chatDataSetup(html))
-    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
-    await chatMessage.setFlag(SYSTEM_RDD, DETAIL_VENTE, {
-      item: vente.item,
-      properties: vente.item.getProprietes(),
-      vendeurId: vente.vendeurId,
-      tailleLot: vente.tailleLot,
-      quantiteIllimite: vente.quantiteIllimite,
-      prixLot: vente.prixLot
-    })
-  }
-}
--- a/module/actor-creature-sheet.js
+++ b/module/actor-creature-sheet.js
@@ -1,18 +1,21 @@
-import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
-import { RdDBaseActorSangSheet } from "./base-actor-sang-sheet.js";
+import { RdDActorSheet } from "./actor-sheet.js";

 /**
 * Extend the basic ActorSheet with some very simple modifications
 * @extends {ActorSheet}
 */
-export class RdDCreatureSheet extends RdDBaseActorSangSheet {
+export class RdDActorCreatureSheet extends RdDActorSheet {

  /** @override */
  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.hbs",
-      width: 640, height: 720
-    }, { inplace: false })
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
+    });
  }

  /* -------------------------------------------- */
@@ -26,15 +29,15 @@ export class RdDCreatureSheet extends RdDBaseActorSangSheet {
    // On competence change
    this.html.find('.creature-carac').change(async event => {
      let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
+      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
    });
    this.html.find('.creature-niveau').change(async event => {
      let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
+      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
    });
    this.html.find('.creature-dommages').change(async event => {
      let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
    });
  }
 }
--- a/module/actor-entite-sheet.js
+++ b/module/actor-entite-sheet.js
@@ -0,0 +1,40 @@
+import { RdDActorSheet } from "./actor-sheet.js";
+
+export class RdDActorEntiteSheet extends RdDActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
+    });
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // On competence change
+    this.html.find('.creature-carac').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
+    });
+    this.html.find('.creature-niveau').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
+    });
+    this.html.find('.creature-dommages').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
+    });
+  }
+
+}
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -1,59 +1,61 @@
 import { RdDUtility } from "./rdd-utility.js";
 import { HtmlUtility } from "./html-utility.js";
+import { RdDItemArme } from "./item-arme.js";
+import { RdDItemCompetence } from "./item-competence.js";
 import { RdDBonus } from "./rdd-bonus.js";
 import { Misc } from "./misc.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 import { RdDCarac } from "./rdd-carac.js";
 import { DialogSplitItem } from "./dialog-split-item.js";
-import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
+import { ReglesOptionelles } from "./settings/regles-optionelles.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+import { STATUSES } from "./settings/status-effects.js";
 import { MAINS_DIRECTRICES } from "./actor.js";
-import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
-import { ITEM_TYPES } from "./constants.js";
+import { RdDBaseActorSheet } from "./actor/base-actor-sheet.js";
 import { RdDItem } from "./item.js";
-import { RdDItemArme } from "./item/arme.js";
-import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemBlessure } from "./item/blessure.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
-import { RdDBaseActorSangSheet } from "./actor/base-actor-sang-sheet.js";
-import { RdDCoeur } from "./coeur/rdd-coeur.js";
-import { AppPersonnageAleatoire } from "./actor/random/app-personnage-aleatoire.js";
-import { RdDTextEditor } from "./apps/rdd-text-roll-editor.js";

 /* -------------------------------------------- */
 /**
 * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
 */
-export class RdDActorSheet extends RdDBaseActorSangSheet {
+export class RdDActorSheet extends RdDBaseActorSheet {

  /** @override */
  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.hbs",
+    RdDUtility.initAfficheContenu();
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
      width: 550,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
      showCompNiveauBase: false,
-      vueArchetype: false,
-    }, { inplace: false })
+      vueDetaillee: false
+    });
  }

  /* -------------------------------------------- */
  async getData() {
    let formData = await super.getData();
-    foundry.utils.mergeObject(formData, {
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      limited: this.actor.limited,
-      owner: this.actor.isOwner,
-      biographie: await RdDTextEditor.enrichHTML(this.actor.system.biographie, this.actor),
-      notes: await RdDTextEditor.enrichHTML(this.actor.system.notes, this.actor),
-    });
-    foundry.utils.mergeObject(formData.calc, {
+    mergeObject(formData,
+      {
+        editable: this.isEditable,
+        cssClass: this.isEditable ? "editable" : "locked",
+        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+        limited: this.actor.limited,
+        owner: this.actor.isOwner,
+        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
+        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
+      });
+    mergeObject(formData.calc, {
      surenc: this.actor.computeMalusSurEncombrement(),
      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
      resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
      caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
-      surEncombrementMessage: this.actor.isSurenc() ? "Sur-Encombrement!" : "",
-      malusArmure: this.actor.getMalusArmure()
+      surEncombrementMessage: this.actor.getMessageSurEncombrement(),
    })

    this.timerRecherche = undefined;
@@ -77,10 +79,11 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      });

      // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
-      const actor = this.actor
-
-      formData.esquives = this.actor.getCompetencesEsquive()
-      formData.combat = actor.listActionsAttaque()
+      formData.combat = duplicate(formData.armes ?? []);
+      RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
+      RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac);
+      formData.esquives = this.actor.getCompetences("Esquive");
+      formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
      formData.empoignades = this.actor.getEmpoignades();

      this.armesList = formData.combat;
@@ -90,11 +93,10 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
      formData.difficultesLibres = CONFIG.RDD.difficultesLibres;

      formData.hautreve = {
-        isDemiReve: this.actor.isDemiReve(),
+        isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
        cacheTMR: this.actor.isTMRCache()
      }

-      formData.race = actor.itemTypes[ITEM_TYPES.race].find(it => true)
      formData.subacteurs = {
        vehicules: this.actor.listeVehicules(),
        montures: this.actor.listeMontures(),
@@ -108,189 +110,326 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    return formData;
  }

-  /* -------------------------------------------- */
-  /** @override */
+  /* -------------------------------------------- */  /** @override */
  activateListeners(html) {
    super.activateListeners(html);

-    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
-
-    this.html.find('.subacteur-open').click(async event => {
-      const subActorId = RdDSheetUtility.getEventItemData(event, 'subactor-id');
-      this.openSubActeur(subActorId);
-    })
-
-    this.html.find('.show-hide-competences').click(async event => {
-      this.options.showCompNiveauBase = !this.options.showCompNiveauBase
-      this.render(true)
-    });
-
-    this.html.find('.button-tmr-visu').click(async event => await this.actor.displayTMR("visu"))
+    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionelles.isUsing("appliquer-fatigue"));

    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;

-    this.html.find('.sheet-possession-attack').click(async event => {
-      const poss = RdDSheetUtility.getItem(event, this.actor)
-      await this.actor.conjurerPossession(poss)
-    })
+    this.html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.actionPrincipale(this.actor, async () => this.render())
+    });

-    this.html.find('.subacteur-coeur-toggle a').click(async event => {
-      const subActorIdactorId = RdDSheetUtility.getEventItemData(event, 'subactor-id')
-      const coeurNombre = $(event.currentTarget).data('numero-coeur')
-      await RdDCoeur.toggleSubActeurCoeur(this.actor.id, subActorIdactorId, coeurNombre)
-    })
-    this.html.find('.subacteur-tendre-moment').click(async event => {
-      const subActorId = RdDSheetUtility.getEventItemData(event, 'subactor-id')
-      await RdDCoeur.startSubActeurTendreMoment(this.actor.id, subActorId)
-    })
    this.html.find('.subacteur-delete').click(async event => {
      const li = RdDSheetUtility.getEventElement(event);
-      const subActorId = li.data("subactor-id");
-      this.deleteSubActeur(subActorId, li);
+      const actorId = li.data("actor-id");
+      if (actorId) {
+        const subActor = game.actors.get(actorId);
+        RdDUtility.confirmerSuppressionSubacteur(this, subActor, li);
+      }
+    });
+    this.html.find('.experiencelog-delete').click(async event => {
+      const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
+      const key = Number(li.data("key") ?? -1);
+      await this.actor.deleteExperienceLog(key, 1);
+    });
+    this.html.find('.experiencelog-delete-previous').click(async event => {
+      const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
+      const key = Number(li.data("key") ?? -1);
+      await this.actor.deleteExperienceLog(0, key + 1);
+    });
+    this.html.find('.encaisser-direct').click(async event => {
+      this.actor.encaisser();
    })
-    this.html.find("input.derivee-value[name='system.compteurs.stress.value']").change(async event =>
-      await this.actor.updateCompteurValue("stress", parseInt(event.target.value))
-    );
-    this.html.find("input.derivee-value[name='system.compteurs.experience.value']").change(async event =>
-      await this.actor.updateCompteurValue("experience", parseInt(event.target.value))
-    );
-
-    this.html.find('.creer-tache').click(async event => await this.createEmptyTache());
-    this.html.find('.creer-une-oeuvre').click(async event => await this.selectTypeOeuvreToCreate());
-    this.html.find('.creer-tache-blessure-legere').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 2));
-    this.html.find('.creer-tache-blessure-grave').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 4));
-    this.html.find('.creer-tache-blessure-critique').click(async event => await RdDItemBlessure.createTacheSoinBlessure(this.actor, 6));
+    this.html.find('.sheet-possession-attack').click(async event => {
+      const poss = RdDSheetUtility.getItem(event, this.actor)
+      this.actor.conjurerPossession(poss)
+    })
+    this.html.find('.remise-a-neuf').click(async event => {
+      if (game.user.isGM) {
+        this.actor.remiseANeuf();
+      }
+    });
+    this.html.find('.creer-tache').click(async event => {
+      this.createEmptyTache();
+    });
+    this.html.find('.creer-tache-blessure-legere').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 2));
+    this.html.find('.creer-tache-blessure-grave').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 4));
+    this.html.find('.creer-tache-blessure-critique').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 6));
+    this.html.find('.creer-blessure-legere').click(async event => RdDItemBlessure.createBlessure(this.actor, 2));
+    this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
+    this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));
+    this.html.find('.creer-une-oeuvre').click(async event => {
+      this.selectTypeOeuvreToCreate();
+    });

    this.html.find('.blessure-premierssoins-done').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
    });
    this.html.find('.blessure-soinscomplets-done').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
    });
    this.html.find('.blessure-premierssoins-bonus').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
    });
    this.html.find('.blessure-soinscomplets-bonus').change(async event => {
-      await this.getBlessure(event)?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
+      const blessure = this.getBlessure(event);
+      await blessure?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
    });

-    this.html.find('.roll-chance-actuelle').click(async event => await this.actor.rollCarac('chance-actuelle'))
-    this.html.find('.button-appel-chance').click(async event => await this.actor.rollAppelChance())
+    // Equip Inventory Item
+    this.html.find('.item-equip').click(async event => {
+      this.actor.equiperObjet(RdDSheetUtility.getItemId(event));
+    });

-    this.html.find('[name="jet-astrologie"]').click(async event => await this.actor.astrologieNombresAstraux())
-    this.html.find('.action-tache').click(async event => await this.actor.rollTache(RdDSheetUtility.getItemId(event)))
-    this.html.find('.meditation-label a').click(async event => await this.actor.rollMeditation(RdDSheetUtility.getItemId(event)))
+    // Roll Carac
+    this.html.find('.carac-label a').click(async event => {
+      let caracName = event.currentTarget.attributes.name.value;
+      this.actor.rollCarac(caracName.toLowerCase());
+    });

-    this.html.find('.action-chant').click(async event => await this.actor.rollChant(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-danse').click(async event => await this.actor.rollDanse(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-musique').click(async event => await this.actor.rollMusique(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-oeuvre').click(async event => await this.actor.rollOeuvre(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-jeu').click(async event => await this.actor.rollJeu(RdDSheetUtility.getItemId(event)))
-    this.html.find('.action-recettecuisine').click(async event => await this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event)))
+    this.html.find('.chance-actuelle').click(async event => {
+      this.actor.rollCarac('chance-actuelle');
+    });

-    this.html.find('.description-aleatoire').click(async event => new AppPersonnageAleatoire(this.actor).render(true))
-    if (game.user.isGM) {
-      // experience log
-      this.html.find('.experiencelog-delete').click(async event => {
-        const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-        const key = Number(li.data("key") ?? -1);
-        await this.actor.deleteExperienceLog(key, 1);
-      });
-      this.html.find('.experiencelog-delete-previous').click(async event => {
-        const li = this.html.find(event.currentTarget)?.parents(".experiencelog");
-        const key = Number(li.data("key") ?? -1);
-        await this.actor.deleteExperienceLog(0, key + 1);
-      });
-      // Boutons spéciaux MJs
-      this.html.find('.forcer-tmr-aleatoire').click(async event => await this.actor.reinsertionAleatoire("Action MJ"))
-      this.html.find('.don-de-haut-reve').click(async event => await this.actor.addDonDeHautReve())
-      this.html.find('.afficher-tmr').click(async event => await this.actor.changeTMRVisible())
-    }
+    this.html.find('.chance-appel').click(async event => {
+      this.actor.rollAppelChance();
+    });
+
+    this.html.find('[name="jet-astrologie"]').click(async event => {
+      this.actor.astrologieNombresAstraux();
+    });
+
+    // Roll Skill
+    this.html.find('a.competence-label').click(async event => {
+      this.actor.rollCompetence(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.tache-label a').click(async event => {
+      this.actor.rollTache(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.meditation-label a').click(async event => {
+      this.actor.rollMeditation(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.chant-label a').click(async event => {
+      this.actor.rollChant(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.danse-label a').click(async event => {
+      this.actor.rollDanse(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.musique-label a').click(async event => {
+      this.actor.rollMusique(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.oeuvre-label a').click(async event => {
+      this.actor.rollOeuvre(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.jeu-label a').click(async event => {
+      this.actor.rollJeu(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.recettecuisine-label a').click(async event => {
+      this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event));
+    });
+    this.html.find('.subacteur-label a').click(async event => {
+      let actorId = RdDSheetUtility.getEventItemData(event, 'actor-id');
+      let actor = game.actors.get(actorId);
+      if (actor) {
+        actor.sheet.render(true);
+      }
+    });
+
+    // Boutons spéciaux MJs
+    this.html.find('.forcer-tmr-aleatoire').click(async event => {
+      this.actor.reinsertionAleatoire("Action MJ");
+    });
+    this.html.find('.afficher-tmr').click(async event => {
+      this.actor.changeTMRVisible();
+    });

    // Points de reve actuel
-    this.html.find('.roll-reve-actuel').click(async event => await this.actor.rollCarac('reve-actuel', { resistance: true }))
-    this.html.find('.action-empoignade').click(async event => await RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))
-
-    this.html.find('.roll-arme').click(async event => {
-      const action = this._getActionCombat(event);
-      await this.actor.rollArme(action.arme, action.main)
-
-    })
+    this.html.find('.ptreve-actuel a').click(async event => {
+      this.actor.rollCarac('reve-actuel', true);
+    });

+    // Suite empoignade
+    this.html.find('.empoignade-label a').click(async event => {
+      let emp = RdDSheetUtility.getItem(event, this.actor)
+      RdDEmpoignade.onAttaqueEmpoignadeFromItem(emp)
+    });
+    // Roll Weapon1
+    this.html.find('.arme-label a').click(async event => {
+      let arme = this._getEventArmeCombat(event);
+      this.actor.rollArme(duplicate(arme));
+    });
    // Initiative pour l'arme
-    this.html.find('.roll-init-arme').click(async event => {
-      let combatant = game.combat.combatants.find(c => c.actor.id == this.actor.id)
+    this.html.find('.arme-initiative a').click(async event => {
+      let combatant = game.combat.combatants.find(c => c.actor.id == this.actor.id);
      if (combatant) {
-        RdDCombatManager.rollInitiativeAction(combatant._id, this._getActionCombat(event));
+        let action = this._getEventArmeCombat(event);
+        RdDCombatManager.rollInitiativeAction(combatant._id, action);
      } else {
        ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
      }
-    })
-    // Display TMR
+    });
+    // Display TMR, visualisation
+    this.html.find('.visu-tmr').click(async event => {
+      this.actor.displayTMR("visu");
+    });

-    this.html.find('.button-tmr').click(async event => await this.actor.displayTMR("normal"))
-    this.html.find('.button-tmr-rapide').click(async event => await this.actor.displayTMR("rapide"))
+    // Display TMR, normal
+    this.html.find('.monte-tmr').click(async event => {
+      this.actor.displayTMR("normal");
+    });

-    this.html.find('.button-repos').click(async event => await this.actor.repos())
+    // Display TMR, fast 
+    this.html.find('.monte-tmr-rapide').click(async event => {
+      this.actor.displayTMR("rapide");
+    });

-    this.html.find('.carac-xp-augmenter').click(async event => await this.actor.updateCaracXPAuto(event.currentTarget.name.replace("augmenter.", "")))
-    this.html.find('.competence-xp-augmenter').click(async event => await this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event)))
+    this.html.find('.repos').click(async event => {
+      await this.actor.repos();
+    });
+    this.html.find('.delete-active-effect').click(async event => {
+      if (game.user.isGM) {
+        let effect = this.html.find(event.currentTarget).parents(".active-effect").data('effect');
+        this.actor.removeEffect(effect);
+      }
+    });
+    this.html.find('.enlever-tous-effets').click(async event => {
+      if (game.user.isGM) {
+        await this.actor.removeEffects();
+      }
+    });
+    this.html.find('.carac-xp-augmenter').click(async event => {
+      let caracName = event.currentTarget.name.replace("augmenter.", "");
+      this.actor.updateCaracXPAuto(caracName);
+    });
+    this.html.find('.competence-xp-augmenter').click(async event => {
+      this.actor.updateCompetenceXPAuto(RdDSheetUtility.getItemId(event));
+    });
    this.html.find('.competence-stress-augmenter').click(async event => {
-      await this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event))
-      this.render(true)
-    }
-    )
+      this.actor.updateCompetenceStress(RdDSheetUtility.getItemId(event));
+    });

    if (this.options.vueDetaillee) {
      // On carac change
+      this.html.find('.carac-value').change(async event => {
+        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "");
+        this.actor.updateCarac(caracName, parseInt(event.target.value));
+      });
      this.html.find('input.carac-xp').change(async event => {
-        let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "")
-        await this.actor.updateCaracXP(caracName, parseInt(event.target.value))
-      })
+        let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "");
+        this.actor.updateCaracXP(caracName, parseInt(event.target.value));
+      });
+      // On competence change
+      this.html.find('.competence-value').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        //console.log("Competence changed :", compName);
+        this.actor.updateCompetence(compName, parseInt(event.target.value));
+      });
      // On competence xp change
      this.html.find('input.competence-xp').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value
-        await this.actor.updateCompetenceXP(compName, parseInt(event.target.value))
-      })
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
+      });
+      // On competence xp change
      this.html.find('input.competence-xp-sort').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value
-        await this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value))
-      })
-
-      this.html.find('.toggle-archetype').click(async event => {
-        this.options.vueArchetype = !this.options.vueArchetype;
-        this.render(true);
+        let compName = event.currentTarget.attributes.compname.value;
+        this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
      });
      // On competence archetype change
      this.html.find('.competence-archetype').change(async event => {
        let compName = event.currentTarget.attributes.compname.value;
-        await this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
+        this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
      });
-      this.html.find('.nouvelle-incarnation').click(async event => await this.actor.nouvelleIncarnation())
    }

+    this.html.find('.show-hide-competences').click(async event => {
+      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
+      this.render(true);
+    });
+
+    this.html.find('.vue-detaillee').click(async event => {
+      this.options.vueDetaillee = !this.options.vueDetaillee;
+      this.render(true);
+    });
+
    // On pts de reve change
-    this.html.find('.pointsreve-value').change(async event => await this.actor.update({ "system.reve.reve.value": event.currentTarget.value }))
-    this.html.find('.seuil-reve-value').change(async event => await this.actor.setPointsDeSeuil(event.currentTarget.value))
+    this.html.find('.pointsreve-value').change(async event => {
+      let reveValue = event.currentTarget.value;
+      this.actor.update({ "system.reve.reve.value": reveValue });
+    });

-    this.html.find('.stress-test').click(async event => await this.actor.transformerStress())
-    this.html.find('.moral-malheureux').click(async event => await this.actor.jetDeMoral('malheureuse'))
-    this.html.find('.moral-neutre').click(async event => await this.actor.jetDeMoral('neutre'))
-    this.html.find('.moral-heureux').click(async event => await this.actor.jetDeMoral('heureuse'))
-    this.html.find('.button-ethylisme').click(async event => await this.actor.jetEthylisme())
+    // On seuil de reve change
+    this.html.find('.seuil-reve-value').change(async event => {
+      console.log("seuil-reve-value", event.currentTarget)
+      this.actor.setPointsDeSeuil(event.currentTarget.value);
+    });

-    this.html.find('.ptreve-actuel-plus').click(async event => await this.actor.reveActuelIncDec(1))
-    this.html.find('.ptreve-actuel-moins').click(async event => await this.actor.reveActuelIncDec(-1))
-    this.html.find('.chance-actuelle-plus').click(async event => await this.actor.chanceActuelleIncDec(1))
-    this.html.find('.chance-actuelle-moins').click(async event => await this.actor.chanceActuelleIncDec(-1))
-    this.html.find('.fatigue-plus').click(async event => await this.actor.santeIncDec("fatigue", 1))
-    this.html.find('.fatigue-moins').click(async event => await this.actor.santeIncDec("fatigue", -1))
+    // On stress change
+    this.html.find('.compteur-edit').change(async event => {
+      let fieldName = event.currentTarget.attributes.name.value;
+      this.actor.updateCompteurValue(fieldName, parseInt(event.target.value));
+    });
+
+    this.html.find('.stress-test').click(async event => {
+      this.actor.transformerStress();
+    });
+    this.html.find('.moral-malheureux').click(async event => {
+      this.actor.jetDeMoral('malheureuse');
+    });
+    this.html.find('.moral-neutre').click(async event => {
+      this.actor.jetDeMoral('neutre');
+    });
+    this.html.find('.moral-heureux').click(async event => {
+      this.actor.jetDeMoral('heureuse');
+    });
+    this.html.find('.ethylisme-test').click(async event => {
+      this.actor.jetEthylisme();
+    });
+
+    this.html.find('.jet-vie').click(async event => {
+      this.actor.jetVie();
+    });
+    this.html.find('.jet-endurance').click(async event => {
+      this.actor.jetEndurance();
+    });
+
+    this.html.find('.vie-plus').click(async event => {
+      this.actor.santeIncDec("vie", 1);
+    });
+    this.html.find('.vie-moins').click(async event => {
+      this.actor.santeIncDec("vie", -1);
+    });
+    this.html.find('.endurance-plus').click(async event => {
+      this.actor.santeIncDec("endurance", 1);
+    });
+    this.html.find('.endurance-moins').click(async event => {
+      this.actor.santeIncDec("endurance", -1);
+    });
+    this.html.find('.ptreve-actuel-plus').click(async event => {
+      this.actor.reveActuelIncDec(1);
+    });
+    this.html.find('.ptreve-actuel-moins').click(async event => {
+      this.actor.reveActuelIncDec(-1);
+    });
+    this.html.find('.fatigue-plus').click(async event => {
+      this.actor.santeIncDec("fatigue", 1);
+    });
+    this.html.find('.fatigue-moins').click(async event => {
+      this.actor.santeIncDec("fatigue", -1);
+    });
  }

  getBlessure(event) {
-    const blessureId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
-    return this.actor.getItem(blessureId, 'blessure');
+    const itemId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
+    const blessure = this.actor.getItem(itemId, 'blessure');
+    return blessure;
  }

  isCompetenceAffichable(competence) {
@@ -304,26 +443,11 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    super._onDropActor(event, dragData);
  }

-  openSubActeur(actorId) {
-    game.actors.get(actorId)?.sheet.render(true)
-  }
-
-  deleteSubActeur(actorId, li) {
-    if (actorId) {
-      const subActor = game.actors.get(actorId);
-      RdDUtility.confirmSubActeurDelete(this, subActor, li, () => {
-        console.log('Delete : ', subActor.id);
-        this.actor.deleteSubActeur(subActor.id);
-        RdDUtility.slideOnDelete(this, li);
-      });
-    }
-  }
-
  /* -------------------------------------------- */
  async selectTypeOeuvreToCreate() {
-    let types = RdDItem.getTypesOeuvres();
-    let content = `<span class="generic-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
-    for (let typeName of types) {
+    let typeObjets = RdDItem.getTypesOeuvres();
+    let content = `<span class="competence-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
+    for (let typeName of typeObjets) {
      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
    }
    content += '</select>';
@@ -346,17 +470,13 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
    await this.actor.createItem('tache', 'Nouvelle tache');
  }

-  _getActionCombat(event) {
+  _getEventArmeCombat(event) {
    const li = this.html.find(event.currentTarget)?.parents(".item");
    let armeName = li.data("arme-name");
    let compName = li.data('competence-name');
-    const arme = this.armesList.find(a => a.arme.name == armeName && a.comp.name == compName);
+    const arme = this.armesList.find(a => a.name == armeName && a.system.competence == compName);
    if (!arme) {
-      return {
-        name: armeName,
-        arme: { name: armeName },
-        comp: { name: compName }
-      }
+      return { name: armeName, system: { competence: compName } };
    }
    return arme;
  }
@@ -392,7 +512,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
  async _onSplitItem(item, split) {
    if (split >= 1 && split < item.system.quantite) {
      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
      splitItem.system.quantite = split;
      await this.actor.createEmbeddedDocuments('Item', [splitItem])
    }
--- a/module/actor-token.mjs
+++ b/module/actor-token.mjs
@@ -1,40 +0,0 @@
-/**
- * class providing the actor and token, and choosing the name and image from the token if available.
- */
-export class ActorToken {
-
-  static fromActorId(actorId, onError = () => undefined) {
-    actorId = actorId ?? (canvas.tokens.controlled.length > 0
-      ? canvas.tokens.controlled[0].actor.id
-      : undefined)
-    const actor = actorId ? game.actors.get(actorId) : undefined
-    if (actor) {
-      return this.fromActor(actor)
-    }
-    return onError()
-  }
-
-  static fromActor(actor) {
-    const token = actor.isToken ? actor.token : actor.prototypeToken
-    return ActorToken.fromToken(token)
-  }
-
-  static fromTokenId(tokenId, sceneId = undefined) {
-    const tokensList = sceneId ? game.scenes.get(sceneId).tokens : canvas.tokens.placeables
-    const token = tokensList.get(tokenId)
-    return ActorToken.fromToken(token)
-  }
-
-  static fromToken(token) {
-    return new ActorToken(token)
-  }
-
-  constructor(token) {
-    this.name = token.name ?? token.actor.name
-    this.img = token.texture.src ?? token.actor.img
-    this.actor = token.actor
-    this.id = token.actor?.id
-    this.token = token
-    this.tokenId = token?.id
-  }
-}
--- a/module/actor-vehicule-sheet.js
+++ b/module/actor-vehicule-sheet.js
@@ -0,0 +1,39 @@
+import { RdDUtility } from "./rdd-utility.js";
+import { RdDActorSheet } from "./actor-sheet.js";
+
+/* -------------------------------------------- */
+export class RdDActorVehiculeSheet extends RdDActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    RdDUtility.initAfficheContenu();
+
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
+      width: 640,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
+    });
+  }
+
+  activateListeners(html) {
+    super.activateListeners(html);
+    if (!this.options.editable) return;
+
+    this.html.find('.resistance-moins').click(async event => {
+      this.actor.vehicleIncDec("resistance", -1);
+    });
+    this.html.find('.resistance-plus').click(async event => {
+      this.actor.vehicleIncDec("resistance", 1);
+    });
+    this.html.find('.structure-moins').click(async event => {
+      this.actor.vehicleIncDec("structure", -1);
+    });
+    this.html.find('.structure-plus').click(async event => {
+      this.actor.vehicleIncDec("structure", 1);
+    });
+  }
+
+}
--- a/module/actor.js
+++ b/module/actor.js
--- a/module/actor/base-actor-reve-sheet.js
+++ b/module/actor/base-actor-reve-sheet.js
@@ -1,70 +0,0 @@
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
-import { Grammar } from "../grammar.js";
-import { ITEM_TYPES } from "../constants.js";
-import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { RdDBaseActorSheet } from "./base-actor-sheet.js";
-
-/* -------------------------------------------- */
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
-      width: 550
-    });
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    this.html.find('.button-encaissement').click(async event => await this.actor.encaisser())
-    this.html.find('.roll-carac').click(async event => {
-      await this.actor.rollCarac(Grammar.toLowerCaseNoAccent(event.currentTarget.attributes['data-carac-name'].value))
-    })
-    this.html.find('.roll-competence').click(async event => await this.actor.rollCompetence(RdDSheetUtility.getItemId(event)));
-    this.html.find('.endurance-plus').click(async event => await this.actor.santeIncDec("endurance", 1));
-    this.html.find('.endurance-moins').click(async event => await this.actor.santeIncDec("endurance", -1));
-
-    if (game.user.isGM) {
-      this.html.find('.button-remise-a-neuf').click(async event => await this.actor.remiseANeuf())
-      this.html.find('.delete-active-effect').click(async event => await this.actor.removeEffect(this.html.find(event.currentTarget).parents(".active-effect").data('effect')));
-      this.html.find('.enlever-tous-effets').click(async event => await this.actor.removeEffects());
-    }
-    this.html.find('.competence-add').click(async event =>
-      await this.actor.createEmbeddedDocuments("Item", [{
-        type: ITEM_TYPES.competencecreature,
-        name: 'Nouvelle competence',
-        img: 'systems/foundryvtt-reve-de-dragon/icons/compcreature-serres.webp',
-        system: {
-          carac_value: this.actor.getForce(),
-        }
-      }], { renderSheet: true })
-    )
-    this.html.find('.roll-text').click(async event => await RdDTextEditor.rollText(event, this.actor))
-    this.html.find('.chat-roll-text').click(async event => await RdDTextEditor.chatRollText(event))
-
-
-    if (this.options.vueDetaillee) {
-      // On carac change
-      this.html.find('.carac-value').change(async event => {
-        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "")
-        await this.actor.updateCarac(caracName, parseInt(event.target.value))
-      });
-      // On competence change
-      this.html.find('.competence-value').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value
-        await this.actor.updateCompetence(compName, parseInt(event.target.value))
-      });
-    }
-  }
-
-}
--- a/module/actor/base-actor-reve.js
+++ b/module/actor/base-actor-reve.js
@@ -1,583 +0,0 @@
-import { ENTITE_INCARNE, SHOW_DICE, SYSTEM_RDD } from "../constants.js";
-import { Grammar } from "../grammar.js";
-import { Misc } from "../misc.js";
-import { RdDResolutionTable } from "../rdd-resolution-table.js";
-import { RdDEncaisser } from "../rdd-roll-encaisser.js";
-import { RdDRoll } from "../rdd-roll.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
-import { RdDBaseActor } from "./base-actor.js";
-import { ITEM_TYPES } from "../constants.js";
-import { StatusEffects, STATUSES } from "../settings/status-effects.js";
-import { Targets } from "../targets.js";
-import { RdDConfirm } from "../rdd-confirm.js";
-import { RdDCarac } from "../rdd-carac.js";
-import { RdDRollResult } from "../rdd-roll-result.js";
-
-import { RdDItemCompetence } from "../item-competence.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-import { RdDItemArme } from "../item/arme.js";
-
-import { ChatUtility } from "../chat-utility.js";
-import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
-import { RdDCombat } from "../rdd-combat.js";
-import { RdDEmpoignade } from "../rdd-empoignade.js";
-import { RdDPossession } from "../rdd-possession.js";
-import { BASE_CORPS_A_CORPS, BASE_ESQUIVE, POSSESSION_SANS_DRACONIC } from "../item/base-items.js";
-import { RollDataAjustements } from "../rolldata-ajustements.js";
-
-/**
- * Classe de base pour les acteurs disposant de rêve (donc, pas des objets)
- * - Entités de rêve
- * - Créatures de "sang": créatures et humanoides
- */
-export class RdDBaseActorReve extends RdDBaseActor {
-
-  prepareActorData() {
-    super.prepareActorData()
-    this.system.attributs.plusdom.value = this.getBonusDegat()
-    this.system.sante.endurance.max = this.getEnduranceMax()
-    this.system.sante.endurance.value = Math.min(this.system.sante.endurance.value, this.system.sante.endurance.max)
-  }
-
-  getCarac() {
-    return foundry.utils.mergeObject(this.system.carac,
-      {
-        'reve-actuel': this.getCaracReveActuel(),
-        'chance-actuelle': this.getCaracChanceActuelle()
-      },
-      { inplace: false })
-  }
-
-  getCaracChanceActuelle() {
-    return {
-      label: 'Chance actuelle',
-      value: this.getChanceActuel(),
-      type: "number"
-    };
-  }
-
-  getCaracReveActuel() {
-    return {
-      label: 'Rêve actuel',
-      value: this.getReveActuel(),
-      type: "number"
-    };
-  }
-
-  getTaille() { return Misc.toInt(this.system.carac.taille?.value) }
-  getConstitution() { return this.getReve() }
-  getForce() { return this.getReve() }
-  getAgilite() { return this.getForce() }
-  getReve() { return Misc.toInt(this.system.carac.reve?.value) }
-  getChance() { return this.getReve() }
-
-  getReveActuel() { return this.getReve() }
-  getChanceActuel() { return this.getChance() }
-
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getConstitution()) }
-  getEncombrementMax() { return (this.getForce() + this.getTaille()) / 2 }
-  getBonusDegat() { return RdDCarac.getCaracDerivee(this.getEncombrementMax()).plusdom }
-
-  getMoralTotal() { return 0 }
-  listeAmoureux() {return []}
-  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
-  getSConst() { return 0 }
-
-  /* -------------------------------------------- */
-  isSurenc() { return false }
-  computeMalusSurEncombrement() { return 0 }
-
-  ajustementAstrologique() { return 0 }
-  getMalusArmure() { return 0 }
-
-  getEnduranceActuelle() {
-    return Number(this.system.sante?.endurance?.value ?? 0);
-  }
-  async jetEndurance(resteEndurance = undefined) { return { jetEndurance: 0, sonne: false } }
-  isDead() { return false }
-  isSonne() { return false }
-  blessuresASoigner() { return [] }
-  getEtatGeneral(options = { ethylisme: false }) { return 0 }
-  isActorCombat() { return true }
-
-  getCaracInit(competence) {
-    if (!competence) {
-      return 0
-    }
-    if (competence.type == ITEM_TYPES.competencecreature) {
-      return competence.system.carac_value
-    }
-    return this.system.carac[competence.system.defaut_carac].value;
-  }
-
-  listActions({ isAttaque = false, isEquipe = false }) {
-    return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => RdDItemCompetenceCreature.isAttaque(it))
-      .map(it => RdDItemCompetenceCreature.attaqueCreature(it))
-      .filter(it => it != undefined);
-  }
-
-
-  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
-  async remiseANeuf() { }
-  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
-
-  async santeIncDec(name, inc, isCritique = false) { }
-
-  async finDeRound(options = { terminer: false }) {
-    await this.$finDeRoundSuppressionEffetsTermines(options);
-    await this.finDeRoundBlessures();
-    await this.$finDeRoundSupprimerObsoletes();
-    await this.$finDeRoundEmpoignade();
-  }
-
-  async $finDeRoundSuppressionEffetsTermines(options) {
-    for (let effect of this.getEffects()) {
-      if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
-        await effect.delete();
-        ChatMessage.create({ content: `${this.getAlias()} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
-      }
-    }
-  }
-
-  async finDeRoundBlessures() {
-  }
-
-  async $finDeRoundSupprimerObsoletes() {
-    const obsoletes = []
-      .concat(this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
-      .concat(this.itemTypes[ITEM_TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2))
-      .map(it => it.id);
-    await this.deleteEmbeddedDocuments('Item', obsoletes);
-  }
-
-  async $finDeRoundEmpoignade() {
-    const immobilisations = this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id);
-    immobilisations.forEach(emp => RdDEmpoignade.onImmobilisation(this,
-      game.actors.get(emp.system.empoigneid),
-      emp
-    ))
-  }
-
-  async setSonne(sonne = true) { }
-
-  /* -------------------------------------------- */
-  getCompetence(idOrName, options = {}) {
-    if (idOrName instanceof Item) {
-      return idOrName.isCompetence() ? idOrName : undefined
-    }
-    return RdDItemCompetence.findCompetence(
-      this.items.filter(it => [ITEM_TYPES.competence, ITEM_TYPES.competencecreature].includes(it.type)),
-      idOrName, options)
-  }
-
-  getCompetences(name = undefined, options = { onMessage: message => { } }) {
-    if (name == undefined) {
-      return this.itemTypes[ITEM_TYPES.competence]
-    }
-    return RdDItemCompetence.findCompetences(this.itemTypes[ITEM_TYPES.competence], name, options)
-  }
-
-  getCompetenceCorpsACorps(options = { onMessage: message => { } }) {
-    return this.getCompetence(BASE_CORPS_A_CORPS.name, options) ?? BASE_CORPS_A_CORPS
-  }
-
-  getCompetencesEsquive(options = { onMessage: message => { } }) {
-    return this.getCompetences(BASE_ESQUIVE.name, options) ?? [BASE_ESQUIVE]
-  }
-
-  getArmeParade(armeParadeId) {
-    return RdDItemArme.getArme(armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined)
-  }
-
-  getDraconicOuPossession() { return POSSESSION_SANS_DRACONIC }
-
-  getPossession(possessionId) {
-    return this.itemTypes[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId);
-  }
-  getEmpoignades() {
-    return this.itemTypes[ITEM_TYPES.empoignade];
-  }
-
-  /* -------------------------------------------- */
-  async updateCreatureCompetence(idOrName, fieldName, value) {
-    let competence = this.getCompetence(idOrName);
-    if (competence) {
-      function getFieldPath(fieldName) {
-        switch (fieldName) {
-          case "niveau": return 'system.niveau';
-          case "dommages": return 'system.dommages';
-          case "carac_value": return 'system.carac_value';
-        }
-        return undefined
-      }
-      const path = getFieldPath(fieldName);
-      if (path) {
-        await competence.update({ [path]: value });
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return false }
-
-  getEffects(filter = e => true) {
-    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
-  }
-
-  getEffectByStatus(statusId) {
-    return this.getEffects().find(it => it.statuses.has(statusId));
-  }
-
-  async setEffect(statusId, status) {
-    if (this.isEffectAllowed(statusId)) {
-      const effect = this.getEffectByStatus(statusId);
-      if (!status && effect) {
-        await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
-      }
-      if (status && !effect) {
-        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(statusId)]);
-      }
-    }
-  }
-
-  async removeEffect(id) {
-    this.removeEffects(it => it.id == id)
-  }
-
-  async removeEffects(filter = e => true) {
-    if (game.user.isGM) {
-      const ids = this.getEffects(filter).map(it => it.id);
-      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
-    }
-  }
-
-  /* -------------------------------------------- */
-  isDemiReve() {
-    return this.getEffectByStatus(STATUSES.StatusDemiReve) != undefined
-  }
-
-  getSurprise(isCombat = undefined) {
-    return StatusEffects.typeSurprise(
-      this.getEffects()
-        .map(it => StatusEffects.niveauSurprise(it, isCombat))
-        .reduce(Misc.sum(), 0)
-    )
-  }
-
-  /* -------------------------------------------- */
-  async computeEtatGeneral() {
-    // Par défaut, on ne calcule pas d'état général, seuls les personnages/créatures sont affectés
-    this.system.compteurs.etat.value = 0;
-  }
-
-  /* -------------------------------------------- */
-  async openRollDialog({ name, label, template, rollData, callbacks }) {
-    const dialog = await RdDRoll.create(this, rollData,
-      { html: template, close: async html => await this._onCloseRollDialog(html) },
-      { name: name, label: label, callbacks: [this.createCallbackExperience(), this.createCallbackAppelAuMoral()].concat(callbacks) })
-    dialog.render(true)
-    return dialog
-  }
-
-
-  /* -------------------------------------------- */
-  createCallbackExperience() {
-    return { action: r => this.appliquerAjoutExperience(r) }
-  }
-
-  /* -------------------------------------------- */
-  createCallbackAppelAuMoral() {
-    /* Si l'appel au moral est utilisé, on l'affiche dans le chat et on diminue éventuellement le moral */
-    return { action: r => this.appliquerAppelMoral(r) }
-  }
-
-  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
-  async appliquerAppelMoral(rollData) { }
-
-  async _onCloseRollDialog(html) { }
-
-  async rollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    const competence = this.getCompetence(compName);
-    await this.openRollDialog({
-      name: 'jet-competence',
-      label: competence ? 'Jet ' + Grammar.apostrophe('de', competence.name) : `Jet sans compétence (${compName})`,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.hbs',
-      rollData: {
-        alias: this.getAlias(),
-        carac: this.system.carac,
-        selectedCarac: this.getCaracByName(caracName),
-        selectedCaracName: caracName,
-        diffLibre: diff,
-        competence: competence,
-        show: { title: options?.title ?? '' }
-      },
-      callbacks: [async r => this.$onRollCompetence(r, options)]
-    });
-  }
-  /**
-   * Méthode pour faire un jet prédéterminer sans ouvrir la fenêtre de dialogue
-   * @param {*} caracName code ou label de la caractéristique. On peut utiliser 'intel' pour Intellect.
-   * @param {*} compName nom de compétence ou nom abrégé.
-   * @param {*} diff difficulté (0 si undefined)
-   * @param {*} options
-   * @returns le jet effectué
-   */
-  async doRollCaracCompetence(caracName, compName, diff, options = { title: "" }) {
-    const carac = this.getCaracByName(caracName);
-    if (!carac) {
-      ui.notifications.warn(`${this.name} n'a pas de caractéristique correspondant à ${caracName}`)
-      return
-    }
-    const competence = this.getCompetence(compName);
-    let rollData = {
-      alias: this.getAlias(),
-      caracValue: Number(carac.value),
-      selectedCarac: carac,
-      competence: competence,
-      diffLibre: diff ?? 0,
-      show: { title: options?.title ?? '' }
-    }
-    RollDataAjustements.calcul(rollData, this);
-    await RdDResolutionTable.rollData(rollData);
-    this.gererExperience(rollData);
-    await RdDResolutionTable.displayRollData(rollData, this)
-    return rollData.rolled;
-  }
-
-  gererExperience(rollData) { }
-
-  /* -------------------------------------------- */
-  async roll() {
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-
-    const carac = this.getCarac()
-    const selectedCaracName = ['apparence', 'perception', 'force', 'reve'].find(it => carac[it] != undefined)
-
-    await this.openRollDialog({
-      name: 'jet-quelconque',
-      label: 'Jet',
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll.hbs',
-      rollData: {
-        alias: this.getAlias(),
-        carac: carac,
-        selectedCarac: carac[selectedCaracName],
-        selectedCaracName: selectedCaracName,
-        competences: this.itemTypes['competence']
-      },
-      callbacks: [{ action: r => this.$onRollCaracResult(r) }]
-    })
-  }
-  /* -------------------------------------------- */
-  async rollCarac(caracName, options = {}) {
-    if (Grammar.equalsInsensitive(caracName, 'taille')) {
-      return
-    }
-    foundry.utils.mergeObject(options, { resistance: false, diff: 0 }, { overwrite: false })
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    let selectedCarac = this.getCaracByName(caracName)
-    const title = 'Jet ' + Grammar.apostrophe('de', selectedCarac.label);
-    const jetResistance = options.resistance ? caracName : undefined;
-    await this.openRollDialog({
-      name: 'jet-' + caracName,
-      label: title,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.hbs',
-      rollData: {
-        alias: this.getAlias(),
-        selectedCarac: selectedCarac,
-        competences: this.itemTypes['competence'],
-        diffLibre: options.diff ?? 0,
-        jetResistance: jetResistance
-      },
-      callbacks: [{ action: r => this.$onRollCaracResult(r) }]
-    });
-  }
-
-  /* -------------------------------------------- */
-  async $onRollCaracResult(rollData) {
-    // Final chat message
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-general.hbs');
-  }
-
-  /* -------------------------------------------- */
-  async rollCompetence(idOrName, options = { tryTarget: true, arme: undefined }) {
-    RdDEmpoignade.checkEmpoignadeEnCours(this)
-    const competence = this.getCompetence(idOrName);
-    let rollData = {
-      carac: this.system.carac,
-      competence: competence,
-      arme: options.arme
-    }
-    if (competence.type == ITEM_TYPES.competencecreature) {
-      const token = RdDUtility.getSelectedToken(this)
-      const arme = RdDItemCompetenceCreature.armeCreature(competence)
-      if (arme && options.tryTarget && Targets.hasTargets()) {
-        Targets.selectOneTargetToken(target => {
-          if (arme.action == "possession") {
-            RdDPossession.onAttaquePossession(target, this, competence)
-          }
-          else {
-            RdDCombat.rddCombatTarget(target, this, token).attaque(competence, arme)
-          }
-        });
-        return;
-      }
-      // Transformer la competence de créature
-      RdDItemCompetenceCreature.setRollDataCreature(rollData)
-    }
-    const dialogLabel = 'Jet ' + Grammar.apostrophe('de', competence.name);
-    await this.openRollDialog({
-      name: 'jet-competence',
-      label: dialogLabel,
-      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.hbs',
-      rollData: rollData,
-      callbacks: [{ action: r => this.$onRollCompetence(r, options) }]
-    });
-  }
-
-  async $onRollCompetence(rollData, options) {
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-competence.hbs')
-    if (options?.onRollAutomate) {
-      options.onRollAutomate(rollData);
-    }
-  }
-
-  /** --------------------------------------------
-   * @param {*} arme item d'arme/compétence de créature
-   * @param {*} categorieArme catégorie d'attaque à utiliser: competence (== melee), lancer, tir; naturelle, possession
-   * @returns 
-   */
-  rollArme(arme, categorieArme = 'competence', token = undefined) {
-    token = token ?? RdDUtility.getSelectedToken(this)
-    const compToUse = RdDItemArme.getCompetenceArme(arme, categorieArme)
-    if (!RdDItemArme.isUtilisable(arme)) {
-      ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
-      return
-    }
-    if (!Targets.hasTargets()) {
-      RdDConfirm.confirmer({
-        settingConfirmer: "confirmer-combat-sans-cible",
-        content: `<p>Voulez vous faire un jet de ${compToUse} sans choisir de cible valide?
-                  <br>Tous les jets de combats devront être gérés à la main
-                  </p>`,
-        title: 'Ne pas utiliser les automatisation de combat',
-        buttonLabel: "Pas d'automatisation",
-        onAction: async () => {
-          this.rollCompetence(compToUse, { tryTarget: false, arme: arme })
-        }
-      });
-      return
-    }
-
-    Targets.selectOneTargetToken(target => {
-      if (Targets.isTargetEntite(target)) {
-        ui.notifications.warn(`Vous ne pouvez pas attaquer une entité non incarnée avec votre ${arme.name}!!!!`);
-        return
-      }
-
-      const competence = this.getCompetence(compToUse)
-      if (competence.isCompetencePossession()) {
-        return RdDPossession.onAttaquePossession(target, this, competence);
-      }
-      RdDCombat.rddCombatTarget(target, this, token).attaque(competence, arme);
-    })
-  }
-
-  verifierForceMin(item) { }
-
-  /* -------------------------------------------- */
-  async encaisser() { await RdDEncaisser.encaisser(this) }
-
-  async encaisserDommages(rollData, attacker = undefined, show = undefined, attackerToken = undefined, defenderToken = undefined) {
-    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
-      return;
-    }
-    const armure = await this.computeArmure(rollData);
-    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')) {
-      await this.encaisserDommagesValidationGR(rollData, armure, show, attackerToken, defenderToken);
-    }
-    else {
-      const jet = await RdDUtility.jetEncaissement(this, rollData, armure, { showDice: SHOW_DICE });
-      await this.$onEncaissement(jet, show, attackerToken, defenderToken)
-    }
-  }
-
-  async encaisserDommagesValidationGR(rollData, armure, show, attackerToken, defenderToken) {
-    if (!game.user.isGM) {
-      RdDBaseActor.remoteActorCall({
-        tokenId: this.token?.id,
-        actorId: this.id,
-        method: 'encaisserDommagesValidationGR', args: [rollData, armure, show, attackerToken, defenderToken]
-      })
-    } else {
-      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
-        jet => this.$onEncaissement(jet, show, attackerToken, defenderToken));
-    }
-  }
-
-  async $onEncaissement(jet, show, attackerToken, defenderToken) {
-    await this.onAppliquerJetEncaissement(jet, attackerToken);
-    await this.$afficherEncaissement(jet, show, defenderToken);
-  }
-
-  async onAppliquerJetEncaissement(encaissement, attackerToken) { }
-
-  async $afficherEncaissement(encaissement, show, defenderToken) {
-    foundry.utils.mergeObject(encaissement, {
-      alias: defenderToken?.name ?? this.getAlias(),
-      hasPlayerOwner: this.hasPlayerOwner,
-      show: show ?? {}
-    }, { overwrite: false });
-
-    await ChatUtility.createChatWithRollMode(
-      {
-        roll: encaissement.roll,
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.hbs', encaissement)
-      },
-      this
-    )
-
-    if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
-      encaissement = foundry.utils.duplicate(encaissement)
-      encaissement.isGM = true
-      ChatMessage.create({
-        whisper: ChatUtility.getGMs(),
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.hbs', encaissement)
-      });
-    }
-  }
-
-  /* -------------------------------------------- */
-  async accorder(entite, when = 'avant-encaissement') {
-    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
-      || entite == undefined
-      || !entite.isEntite([ENTITE_INCARNE])
-      || entite.isEntiteAccordee(this)) {
-      return true;
-    }
-    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.getNiveau()));
-    const rollData = {
-      alias: this.getAlias(),
-      rolled: rolled,
-      entite: entite.name,
-      selectedCarac: this.system.carac.reve
-    };
-
-    if (rolled.isSuccess) {
-      await entite.setEntiteReveAccordee(this);
-    }
-
-    await RdDRollResult.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.hbs');
-    await this.appliquerAjoutExperience(rollData, true);
-    return rolled.isSuccess;
-  }
-
-  isEntiteAccordee(attacker) { return true }
-
-  async setEntiteReveAccordee(actor) {
-    ui.notifications.error("Impossible de s'accorder à " + this.getAlias() + ": ce n'est pas une entité incarnée");
-  }
-
-}
--- a/module/actor/base-actor-sang-sheet.js
+++ b/module/actor/base-actor-sang-sheet.js
@@ -1,46 +0,0 @@
-import { ChatUtility } from "../chat-utility.js";
-import { RdDItemBlessure } from "../item/blessure.js";
-import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
-
-/* -------------------------------------------- */
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-export class RdDBaseActorSangSheet extends RdDBaseActorReveSheet {
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    this.html.find('.creer-blessure-legere').click(async event => await RdDItemBlessure.createBlessure(this.actor, 2));
-    this.html.find('.creer-blessure-grave').click(async event => await RdDItemBlessure.createBlessure(this.actor, 4));
-    this.html.find('.creer-blessure-critique').click(async event => await RdDItemBlessure.createBlessure(this.actor, 6));
-
-    this.html.find('.subir-blessure-contusion').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 0));
-    this.html.find('.subir-blessure-legere').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 2));
-    this.html.find('.subir-blessure-grave').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 4));
-    this.html.find('.subir-blessure-critique').click(async event => await RdDItemBlessure.applyFullBlessure(this.actor, 6));
-
-    this.html.find('.jet-vie').click(async event => await this.actor.jetDeVie())
-    this.html.find('.jet-endurance').click(async event => await this.jetEndurance())
-
-    this.html.find('.vie-plus').click(async event => await this.actor.santeIncDec("vie", 1))
-    this.html.find('.vie-moins').click(async event => await this.actor.santeIncDec("vie", -1))
-  }
-
-  async jetEndurance() {
-    const endurance = this.actor.getEnduranceActuelle()
-    const result = await this.actor.jetEndurance(endurance);
-    ChatMessage.create({
-      content: `Jet d'Endurance : ${result.jetEndurance} / ${endurance}
-        <br>${this.actor.name} a ${result.sonne ? 'échoué' : 'réussi'} son Jet d'Endurance ${result.sonne ? 'et devient Sonné' : ''}`,
-      whisper: ChatUtility.getOwners(this.actor)
-    })
-  }
-
-}
--- a/module/actor/base-actor-sang.js
+++ b/module/actor/base-actor-sang.js
@@ -1,308 +0,0 @@
-import { RdDUtility } from "../rdd-utility.js";
-import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
-import { STATUSES } from "../settings/status-effects.js";
-import { ITEM_TYPES } from "../constants.js";
-import { RdDBaseActorReve } from "./base-actor-reve.js";
-import { RdDDice } from "../rdd-dice.js";
-import { RdDItemBlessure } from "../item/blessure.js";
-import { ChatUtility } from "../chat-utility.js";
-import { Misc } from "../misc.js";
-
-/**
- * Classe de base pour les acteurs qui peuvent subir des blessures
- * - créatures
- * - humanoides
- */
-export class RdDBaseActorSang extends RdDBaseActorReve {
-
-  prepareActorData() {
-    this.system.sante.vie.max = Math.ceil((this.getTaille() + this.getConstitution()) / 2)
-    this.system.sante.vie.value = Math.min(this.system.sante.vie.value, this.system.sante.vie.max)
-    super.prepareActorData()
-    this.system.attributs.encombrement.value = this.getEncombrementMax()
-  }
-
-  getForce() { return Misc.toInt(this.system.carac.force?.value) }
-  getConstitution() { return Misc.toInt(this.system.carac.constitution?.value) }
-  getVolonte() { return Misc.toInt(this.system.carac.volonte?.value) }
-
-  getVieMax() { return Misc.toInt(this.system.sante.vie?.max) }
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getConstitution()) }
-  getFatigueMax() { return this.getEnduranceMax() * 2 }
-
-  getProtectionNaturelle() { return Misc.toInt(this.system.attributs?.protection?.value) }
-
-  getFatigueActuelle() {
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      return Math.max(0, Math.min(this.getFatigueMax(),  Misc.toInt(this.system.sante.fatigue?.value)))
-    }
-    return 0;
-  }
-
-  isCumulFatigueCauseSommeil(cumulFatigue){
-    return ReglesOptionnelles.isUsing("appliquer-fatigue")
-    ? (this.getFatigueRestante() <= cumulFatigue)
-    : (this.getEnduranceActuelle() <= cumulFatigue)
-  }
-  getFatigueRestante() {return this.getFatigueMax() - this.getFatigueActuelle() }
-  getFatigueMin() { return this.system.sante.endurance.max - this.system.sante.endurance.value }
-
-  malusFatigue() {
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      return RdDUtility.calculMalusFatigue(this.getFatigueActuelle(), this.getEnduranceMax())
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  isSurenc() { return this.computeMalusSurEncombrement() < 0 }
-
-  computeMalusSurEncombrement() {
-    return Math.min(0, Math.floor(this.getEncombrementMax() - this.encTotal));
-  }
-
-  isDead() { return this.system.sante.vie.value < -this.getSConst() }
-
-  nbBlessuresLegeres() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isLegere()).length }
-  nbBlessuresGraves() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isGrave()).length }
-  nbBlessuresCritiques() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isCritique()).length }
-
-  /* -------------------------------------------- */
-  computeResumeBlessure() {
-    const nbLegeres = this.nbBlessuresLegeres()
-    const nbGraves = this.nbBlessuresGraves()
-    const nbCritiques = this.nbBlessuresCritiques()
-
-    if (nbLegeres + nbGraves + nbCritiques == 0) {
-      return "Aucune blessure";
-    }
-    let resume = "Blessures:";
-    if (nbLegeres > 0) {
-      resume += " " + nbLegeres + " légère" + (nbLegeres > 1 ? "s" : "");
-    }
-    if (nbGraves > 0) {
-      if (nbLegeres > 0)
-        resume += ",";
-      resume += " " + nbGraves + " grave" + (nbGraves > 1 ? "s" : "");
-    }
-    if (nbCritiques > 0) {
-      if (nbGraves > 0 || nbLegeres > 0)
-        resume += ",";
-      resume += " une CRITIQUE !";
-    }
-    return resume;
-  }
-
-  blessuresASoigner() { return [] }
-
-  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
-  async remiseANeuf() { }
-  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
-
-  /* -------------------------------------------- */
-
-  async onAppliquerJetEncaissement(encaissement, attackerToken) {
-    const santeOrig = foundry.utils.duplicate(this.system.sante);
-    const blessure = await this.ajouterBlessure(encaissement, attackerToken); // Will update the result table
-    const perteVie = await this.santeIncDec("vie", -encaissement.vie);
-    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique());
-
-    foundry.utils.mergeObject(encaissement, {
-      resteEndurance: perteEndurance.newValue,
-      sonne: perteEndurance.sonne,
-      jetEndurance: perteEndurance.jetEndurance,
-      endurance: perteEndurance.perte,
-      vie: santeOrig.vie.value - perteVie.newValue,
-      blessure: blessure
-    });
-  }
-  /* -------------------------------------------- */
-  async santeIncDec(name, inc, isCritique = false) {
-    if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
-      return;
-    }
-    const sante = foundry.utils.duplicate(this.system.sante)
-    let compteur = sante[name];
-    if (!compteur) {
-      return;
-    }
-    let result = {
-      sonne: false,
-    };
-
-    let minValue = name == "vie" ? -this.getSConst() - 1 : 0;
-
-    result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
-    //console.log("New value ", inc, minValue, result.newValue);
-    let fatigue = 0;
-    if (name == "endurance") {
-      if (result.newValue == 0 && inc < 0 && !isCritique) { // perte endurance et endurance devient 0 (sauf critique) -> -1 vie
-        sante.vie.value--;
-        result.perteVie = true;
-      }
-      result.newValue = Math.max(0, result.newValue);
-      if (inc > 0) { // le max d'endurance s'applique seulement à la récupération
-        result.newValue = Math.min(result.newValue, this._computeEnduranceMax())
-      }
-      const perte = compteur.value - result.newValue;
-      result.perte = perte;
-      if (perte > 1) {
-        // Peut-être sonné si 2 points d'endurance perdus d'un coup
-        foundry.utils.mergeObject(result, await this.jetEndurance(result.newValue));
-      } else if (inc > 0) {
-        await this.setSonne(false);
-      }
-      if (sante.fatigue && inc < 0) { // Each endurance lost -> fatigue lost
-        fatigue = perte;
-      }
-    }
-    compteur.value = result.newValue;
-    // If endurance lost, then the same amount of fatigue cannot be recovered
-    if (ReglesOptionnelles.isUsing("appliquer-fatigue") && sante.fatigue && fatigue > 0) {
-      sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this.getFatigueMin());
-    }
-    await this.update({ "system.sante": sante })
-    if (this.isDead()) {
-      await this.setEffect(STATUSES.StatusComma, true);
-    }
-    return result
-  }
-
-  /* -------------------------------------------- */
-  _computeEnduranceMax() {
-    const diffVie = this.system.sante.vie.max - this.system.sante.vie.value;
-    const maxEndVie = this.system.sante.endurance.max - (diffVie * 2);
-    const nbGraves = this.countBlessures(it => it.isGrave()) > 0
-    const nbCritiques = this.countBlessures(it => it.isCritique()) > 0
-    const maxEndGraves = Math.floor(this.system.sante.endurance.max / (2 * nbGraves));
-    const maxEndCritiques = nbCritiques > 0 ? 1 : this.system.sante.endurance.max;
-    return Math.max(0, Math.min(maxEndVie, maxEndGraves, maxEndCritiques));
-  }
-
-
-  /* -------------------------------------------- */
-  async ajouterBlessure(encaissement, attackerToken = undefined) {
-    if (encaissement.gravite < 0) return;
-    if (encaissement.gravite > 0) {
-      while (this.countBlessures(it => it.system.gravite == encaissement.gravite) >= RdDItemBlessure.maxBlessures(encaissement.gravite) && encaissement.gravite <= 6) {
-        // Aggravation
-        encaissement.gravite += 2
-        if (encaissement.gravite > 2) {
-          encaissement.vie += 2;
-        }
-      }
-    }
-    const endActuelle = this.getEnduranceActuelle();
-    const blessure = await RdDItemBlessure.createBlessure(this, encaissement.gravite, encaissement.dmg?.loc.label ?? '', attackerToken);
-    if (blessure.isCritique()) {
-      encaissement.endurance = endActuelle;
-    }
-
-    if (blessure.isMort()) {
-      this.setEffect(STATUSES.StatusComma, true);
-      encaissement.mort = true;
-      ChatMessage.create({
-        content: `<img class="chat-icon" src="icons/svg/skull.svg" data-tooltip="charge" />
-        <strong>${this.getAlias()} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
-      });
-    }
-    return blessure;
-  }
-
-  async supprimerBlessure({ gravite }) {
-    const toDelete = this.itemTypes[ITEM_TYPES.blessure].find(it => it.system.gravite == gravite)?.id
-    if (toDelete) {
-      await this.deleteEmbeddedDocuments('Item', [toDelete]);
-    }
-  }
-
-  async supprimerBlessures(filterToDelete) {
-    const toDelete = this.filterItems(filterToDelete, ITEM_TYPES.blessure)
-      .map(it => it.id);
-    await this.deleteEmbeddedDocuments('Item', toDelete);
-  }
-
-  countBlessures(filter = it => !it.isContusion()) {
-    return this.filterItems(filter, ITEM_TYPES.blessure).length
-  }
-
-  /* -------------------------------------------- */
-  async jetDeVie() {
-    if (this.isDead()) {
-      ChatMessage.create({
-        content: `Jet de Vie: ${this.getAlias()} est déjà mort, ce n'est pas la peine d'en rajouter !!!!!`,
-        whisper: ChatUtility.getOwners(this)
-      })
-      return
-    }
-    const jetDeVie = await RdDDice.roll("1d20");
-
-    const sConst = this.getSConst();
-    const vie = this.system.sante.vie.value;
-    const isCritique = this.nbBlessuresCritiques() > 0;
-    const isGrave = this.nbBlessuresGraves();
-    const isEchecTotal = jetDeVie.total == 20;
-    const isSuccess = jetDeVie.total == 1 || jetDeVie.total <= vie;
-    const perte = isSuccess ? 0 : 1 + (isEchecTotal ? vie + sConst : 0)
-    const prochainJet = (jetDeVie.total == 1 && vie > 0 ? 20 : 1) * (isCritique ? 1 : isGrave > 0 ? sConst : 0)
-
-    let msgText = `Jet de Vie: <strong>${jetDeVie.total} / ${vie}</strong>`
-    if (isSuccess) {
-      msgText += "<br>Réussi, pas de perte de point de vie."
-    } else {
-      msgText += `<br>Echoué, perte ${perte} point de vie`;
-      await this.santeIncDec("vie", -perte);
-    }
-    if (this.isDead()) {
-      msgText += `<br><strong>${this.getAlias()} est mort !!!!</strong>`;
-    }
-    else if (prochainJet > 0) {
-      msgText += `<br>Prochain jet de vie dans ${prochainJet} ${isCritique ? 'round' : 'minute'}${prochainJet > 1 ? 's' : ''} ${isCritique ? '(état critique)' : '(état grave)'}`
-    }
-    ChatMessage.create({
-      content: msgText,
-      whisper: ChatUtility.getOwners(this)
-    });
-  }
-
-  /* -------------------------------------------- */
-  async jetEndurance(resteEndurance = undefined) {
-    const jetEndurance = (await RdDDice.roll("1d20")).total;
-    const sonne = jetEndurance == 20 || jetEndurance > (resteEndurance ?? this.system.sante.endurance.value)
-    if (sonne) {
-      await this.setSonne();
-    }
-    return { jetEndurance, sonne }
-  }
-
-  async finDeRoundBlessures() {
-    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
-    if (nbGraves > 0) {
-      // Gestion blessure graves : -1 pt endurance par blessure grave
-      await this.santeIncDec("endurance", -nbGraves);
-    }
-  }
-
-  async setSonne(sonne = true) {
-    if (!game.combat && sonne) {
-      ui.notifications.info(`${this.getAlias()} est hors combat, il ne reste donc pas sonné`);
-      return;
-    }
-    await this.setEffect(STATUSES.StatusStunned, sonne)
-  }
-
-  isSonne() {
-    return this.getEffectByStatus(STATUSES.StatusStunned)
-  }
-
-  isEffectAllowed(effectId) { return true }
-
-  /* -------------------------------------------- */
-  async computeEtatGeneral() { this.system.compteurs.etat.value = this.malusVie() + this.malusFatigue() + this.malusEthylisme() }
-  getEtatGeneral(options = { ethylisme: false }) { return this.system.compteurs.etat.value }
-
-  malusVie() { return Math.min(this.system.sante.vie.value - this.system.sante.vie.max, 0) }
-  malusEthylisme() { return 0 }
-
-
-}
--- a/module/actor/base-actor-sheet.js
+++ b/module/actor/base-actor-sheet.js
@@ -3,35 +3,34 @@ import { Misc } from "../misc.js";
 import { DialogSplitItem } from "../dialog-split-item.js";
 import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { Monnaie } from "../item-monnaie.js";
-import { ITEM_TYPES } from "../constants.js";
 import { RdDItem } from "../item.js";
-import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
-import { RdDTextEditor } from "../apps/rdd-text-roll-editor.js";
-import { ItemAction } from "../item/item-actions.js";

 /* -------------------------------------------- */
 /**
 * Extend the basic ActorSheet with some very simple modifications
 * @extends {ActorSheet}
 */
-export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
-  static _warnedAppV1 = true
+export class RdDBaseActorSheet extends ActorSheet {

  /** @override */
  static get defaultOptions() {
-    return foundry.utils.mergeObject(foundry.appv1.sheets.ActorSheet.defaultOptions, {
+    RdDUtility.initAfficheContenu();
+    return mergeObject(super.defaultOptions, {
      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
+      width: 550,
      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
+      showCompNiveauBase: false,
      vueDetaillee: false
-    }, { inplace: false })
+    });
  }

  /* -------------------------------------------- */
  async getData() {
-    Monnaie.validerMonnaies(this.actor)
+    Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);

-    this.actor.computeEtatGeneral();
+    this.actor.recompute();
    let formData = {
      title: this.title,
      id: this.actor.id,
@@ -39,32 +38,28 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
      img: this.actor.img,
      name: this.actor.name,
      system: this.actor.system,
-      description: await RdDTextEditor.enrichHTML(this.actor.system.description, this.actor),
-      notesmj: await RdDTextEditor.enrichHTML(this.actor.system.notesmj, this.actor),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable),
-      effects: this.actor.effects
+      description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
+      notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
    }

-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
+    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
    formData.calc = {
      fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
      encTotal: await this.actor.computeEncTotal(),
    }

-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
-    this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    this._appliquerRechercheObjets(formData.objets, formData.conteneurs);
    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
-    formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
-      .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
-
    return formData;
  }

-  _appliquerRechercheObjets(conteneurs, inventaires) {
+  _appliquerRechercheObjets(objets, conteneurs) {
    if (this.options.recherche?.text) {
      const recherche = this.options.recherche;
-      const allVisible = inventaires.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
+      const allVisible = objets.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
      let addVisible = conteneurs.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id)
      do {
        allVisible.push(...addVisible)
@@ -72,58 +67,102 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
        addVisible = parentsIds.filter(id => !allVisible.includes(id))
      }
      while (addVisible.length > 0)
-      inventaires.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
+      objets.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
      conteneurs.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
    }
    else {
-      inventaires.forEach(it => it.system.isHidden = false)
+      objets.forEach(it => it.system.isHidden = false)
      conteneurs.forEach(it => it.system.isHidden = false)
    }
  }

-  /* -------------------------------------------- */  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
+  /* -------------------------------------------- */
+  static filterItemsPerTypeForSheet(formData, itemTypes) {
+    formData.blessures = Misc.arrayOrEmpty(itemTypes['blessure']);
+    formData.recettescuisine = Misc.arrayOrEmpty(itemTypes['recettecuisine']);
+    formData.recettesAlchimiques = Misc.arrayOrEmpty(itemTypes['recettealchimique']);
+    formData.maladies = Misc.arrayOrEmpty(itemTypes['maladie']);
+    formData.poisons = Misc.arrayOrEmpty(itemTypes['poison']);
+    formData.possessions = Misc.arrayOrEmpty(itemTypes['possession']);
+    formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
+    formData.competences = (itemTypes['competence'] ?? []).concat(itemTypes['competencecreature'] ?? []);
+    formData.sortsReserve = Misc.arrayOrEmpty(itemTypes['sortreserve']);

-    this.html.find('.actionItem').click(async event => await ItemAction.onActionItem(event, this.actor, this.options))
-    this.html.find('.item-edit').click(async event => await this.itemActionEdit(event))
-    this.html.find('.conteneur-name a').click(async event => {
-      RdDUtility.toggleAfficheContenu(this.getItemId(event))
-      this.render(true)
-    })
+    formData.sorts = Misc.arrayOrEmpty(itemTypes['sort']);
+    formData.rencontres = Misc.arrayOrEmpty(itemTypes['rencontre']);
+    formData.casestmr = Misc.arrayOrEmpty(itemTypes['casetmr']);
+    formData.signesdraconiques = Misc.arrayOrEmpty(itemTypes['signedraconique']);
+    formData.queues = Misc.arrayOrEmpty(itemTypes['queue']);
+    formData.souffles = Misc.arrayOrEmpty(itemTypes['souffle']);
+    formData.ombres = Misc.arrayOrEmpty(itemTypes['ombre']);
+    formData.tetes = Misc.arrayOrEmpty(itemTypes['tete']);
+    formData.taches = Misc.arrayOrEmpty(itemTypes['tache']);
+    formData.meditations = Misc.arrayOrEmpty(itemTypes['meditation']);
+    formData.chants = Misc.arrayOrEmpty(itemTypes['chant']);
+    formData.danses = Misc.arrayOrEmpty(itemTypes['danse']);
+    formData.musiques = Misc.arrayOrEmpty(itemTypes['musique']);
+    formData.oeuvres = Misc.arrayOrEmpty(itemTypes['oeuvre']);
+    formData.jeux = Misc.arrayOrEmpty(itemTypes['jeu']);

-    this.html.find('.actor-montrer').click(async event => await this.actor.postActorToChat());
-
-    this.html.find('.recherche')
-      .each((index, field) => {
-        this._rechercheSelectArea(field);
-      })
-      .keyup(async event => this._rechercherKeyup(event))
-      .change(async event => this._rechercherKeyup(event))
-
-    this.html.find('.recherche').prop("disabled", false)
+    formData.services = Misc.arrayOrEmpty(itemTypes['service']);
+    formData.conteneurs = Misc.arrayOrEmpty(itemTypes['conteneur']);
+    formData.materiel = Misc.arrayOrEmpty(itemTypes['objet']);
+    formData.armes = Misc.arrayOrEmpty(itemTypes['arme']);
+    formData.armures = Misc.arrayOrEmpty(itemTypes['armure']);
+    formData.munitions = Misc.arrayOrEmpty(itemTypes['munition']);
+    formData.livres = Misc.arrayOrEmpty(itemTypes['livre']);
+    formData.potions = Misc.arrayOrEmpty(itemTypes['potion']);
+    formData.plantes = Misc.arrayOrEmpty(itemTypes['plante']);
+    formData.ingredients = Misc.arrayOrEmpty(itemTypes['ingredient']);
+    formData.faunes = Misc.arrayOrEmpty(itemTypes['faune']);
+    formData.herbes = Misc.arrayOrEmpty(itemTypes['herbe']);
+    formData.nourritureboissons = Misc.arrayOrEmpty(itemTypes['nourritureboisson']);
+    formData.gemmes = Misc.arrayOrEmpty(itemTypes['gemme']);
+    formData.monnaie = Misc.arrayOrEmpty(itemTypes['monnaie']).sort(Monnaie.triValeurEntiere());

+    formData.objets = RdDItem.getItemTypesInventaire('all')
+      .map(t => Misc.arrayOrEmpty(itemTypes[t]))
+      .reduce((a, b) => a.concat(b), [])
+      .sort(Misc.ascending(it => it.name));
+    }
+    
+    /* -------------------------------------------- */  /** @override */
+    activateListeners(html) {
+      super.activateListeners(html);
+      this.html = html;
+      
+      this.html.find('.conteneur-name a').click(async event => {
+        RdDUtility.toggleAfficheContenu(this.getItemId(event));
+        this.render(true);
+      });
+      this.html.find('.item-edit').click(async event => this.getItem(event)?.sheet.render(true))
+      this.html.find('.item-montrer').click(async event => this.getItem(event)?.postItemToChat());
+      this.html.find('.actor-montrer').click(async event => this.actor.postActorToChat());
+      this.html.find('.recherche')
+        .each((index, field) => {
+          this._rechercheSelectArea(field);
+        })
+        .keyup(async event => this._rechercherKeyup(event))
+        .change(async event => this._rechercherKeyup(event));
+    this.html.find('.recherche').prop( "disabled", false );
    // Everything below here is only needed if the sheet is editable
    if (!this.options.editable) return;

-    this.html.find('.item-equip-armure').click(async event => await this.actor.equiperObjet(this.getItem(event)))
-    this.html.find('.item-delete').click(async event => await RdDUtility.confirmActorItemDelete(this.getItem(event), this.actor));
-    this.html.find('.item-quantite-plus').click(async event => await this.actor.itemQuantiteIncDec(this.getItemId(event), 1));
-    this.html.find('.item-quantite-moins').click(async event => await this.actor.itemQuantiteIncDec(this.getItemId(event), -1));
-
-    this.html.find('.creer-un-objet').click(async event => await this.selectObjetTypeToCreate())
-    this.html.find('.nettoyer-conteneurs').click(async event => await this.actor.nettoyerConteneurs())
-
-    this.html.find('.vue-detaillee').click(async event => {
-      this.options.vueDetaillee = !this.options.vueDetaillee
-      this.render(true)
+    this.html.find('.item-split').click(async event => {
+      const item = this.getItem(event);
+      RdDSheetUtility.splitItem(item, this.actor);
    });
-  }
+    this.html.find('.item-quantite-plus').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), 1));
+    this.html.find('.item-quantite-moins').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), -1));
+    this.html.find('.item-delete').click(async event => RdDUtility.confirmActorItemDelete(this, this.getItem(event)));
+    this.html.find('.item-vendre').click(async event => this.vendre(this.getItem(event)));

-  itemActionEdit(event) {
-    const item = this.getItem(event);
-    return item?.sheet.render(true);
+    this.html.find('.creer-un-objet').click(async event => {
+      this.selectObjetTypeToCreate();
+    });
+    this.html.find('.nettoyer-conteneurs').click(async event => {
+      this.actor.nettoyerConteneurs();
+    });
  }

  _rechercherKeyup(event) {
@@ -191,9 +230,9 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {

  /* -------------------------------------------- */
  async selectObjetTypeToCreate() {
-    let types = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
-    let content = `<span class="generic-label">Selectionnez le type d'équipement</span><select class="item-type">`;
-    for (let typeName of types) {
+    let typeObjets = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
+    let content = `<span class="competence-label">Selectionnez le type d'équipement</span><select class="item-type">`;
+    for (let typeName of typeObjets) {
      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
    }
    content += '</select>';
@@ -245,7 +284,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
  async _onSplitItem(item, split) {
    if (split >= 1 && split < item.system.quantite) {
      await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
      splitItem.system.quantite = split;
      await this.actor.createEmbeddedDocuments('Item', [splitItem])
    }
--- a/module/actor/base-actor.js
+++ b/module/actor/base-actor.js
@@ -1,115 +1,74 @@
-import { ChatVente } from "../achat-vente/chat-vente.js";
 import { ChatUtility } from "../chat-utility.js";
 import { SYSTEM_SOCKET_ID } from "../constants.js";
-import { Grammar } from "../grammar.js";
 import { Monnaie } from "../item-monnaie.js";
-import { ITEM_TYPES } from "../constants.js";
 import { Misc } from "../misc.js";
 import { RdDAudio } from "../rdd-audio.js";
-import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
+import { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";

 export class RdDBaseActor extends Actor {

-  static _findCaracNode(carac, name) {
-    return Object.entries(carac)
-      .filter(it => Grammar.equalsInsensitive(it[1].label, name))
-      .map(it => it[0])
-      .find(it => it)
-  }
-
-  static $findCaracByName(carac, name) {
-    const caracList = Object.entries(carac);
-    let entry = Misc.findFirstLike(name, caracList, { mapper: it => it[0], description: 'caractéristique', onMessage: m => { } });
-    if (!entry || entry.length == 0) {
-      entry = Misc.findFirstLike(name, caracList, { mapper: it => it[1].label, description: 'caractéristique' });
-    }
-    return entry && entry.length > 0 ? carac[entry[0]] : undefined;
-  }
-
-  static getDefaultValue(actorType, path) {
-    if (path.includes('.')) {
-      path = path.split('.')
-    }
-    let obj = game.model.Actor[actorType]
-    for (let p of path) {
-      obj = obj ? obj[p] : undefined
-    }
-    return obj
-  }
-
  static getDefaultImg(itemType) {
    return game.system.rdd.actorClasses[itemType]?.defaultIcon ?? defaultItemImg[itemType];
  }

+  /* -------------------------------------------- */
  static init() {
-    Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
-    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
-    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
-    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
+    Hooks.on("preUpdateItem", (item, change, options, id) => RdDBaseActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
+    Hooks.on("createItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onCreateItem(item, options, id));
+    Hooks.on("deleteItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onDeleteItem(item, options, id));
+    Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
  }

  static onSocketMessage(sockmsg) {
    switch (sockmsg.msg) {
      case "msg_remote_actor_call":
        return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
+      case "msg_reset_nombre_astral":
+        game.user.character.resetNombresAstraux();
+        game.system.rdd.calendrier.notifyChangeNombresAstraux();
+        return;
+      case "msg_refresh_nombre_astral":
+        Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+        return;
    }
  }

-  static remoteActorCall(callData) {
-    if (game.user.isGM) {
-      RdDBaseActor.onRemoteActorCall(callData, game.user.id)
-      return false
+  static remoteActorCall(callData, userId = undefined) {
+    userId = userId ?? Misc.firstConnectedGMId();
+    if (userId == game.user.id) {
+      RdDBaseActor.onRemoteActorCall(callData, userId);
+      return false;
    }
    else {
-      game.socket.emit(SYSTEM_SOCKET_ID, {
-        msg: "msg_remote_actor_call",
-        data: callData,
-        userId: Misc.firstConnectedGMId()
-      })
-      return true
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: callData, userId: userId });
+      return true;
    }
  }

  static onRemoteActorCall(callData, userId) {
-    const actor = RdDBaseActor.getRealActor(callData?.actorId, callData?.tokenId);
    if (userId == game.user.id) {
-      // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
-      const args = callData.args;
-      console.info(`RdDBaseActor.onRemoteActorCall: pour l'Actor ${callData.actorId}, appel de RdDBaseActor.${callData.method}(`, ...args, ')');
-      actor[callData.method](...args);
-    }
-  }
-
-  static getRealActor(actorId, tokenId) {
-    if (tokenId) {
-      let token = canvas.tokens.get(tokenId)
-      if (token) {
-        return token.actor
+      const actor = game.actors.get(callData?.actorId);
+      if (Misc.isOwnerPlayerOrUniqueConnectedGM(actor)) { // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
+        const args = callData.args;
+        console.info(`RdDBaseActor.onRemoteActorCall: pour l'Actor ${callData.actorId}, appel de RdDBaseActor.${callData.method}(`, ...args, ')');
+        actor[callData.method](...args);
      }
    }
-    return game.actors.get(actorId)
  }

-  getAlias() {
-    if (this.token?.name != null && this.token != this.prototypeToken) {
-      return this.token.name
-    }
-    return this.name
+  static getParentActor(document) {
+    return document?.parent instanceof Actor ? document.parent : undefined
  }

-  isPersonnageJoueur() { return false }
-
-  static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
-
  /**
-   * Cette methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
+   * Cet methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
   * compétences et monnaies.
-   *
-   * @param {Object} actorData template d'acteur auquel ajouter des informations.
-   * @param {Object} options   optionspour customiser la création
-   */
+  *
+  * @param {Object} actorData template d'acteur auquel ajouter des informations.
+  * @param {Object} options   optionspour customiser la création
+  */
  static async create(actorData, options) {
    // import depuis un compendium
    if (actorData instanceof Array) {
@@ -133,7 +92,7 @@ export class RdDBaseActor extends Actor {

  constructor(docData, context = {}) {
    if (!context.rdd?.ready) {
-      foundry.utils.mergeObject(context, { rdd: { ready: true } });
+      mergeObject(context, { rdd: { ready: true } });
      const ActorConstructor = game.system.rdd.actorClasses[docData.type];
      if (ActorConstructor) {
        if (!docData.img) {
@@ -142,81 +101,14 @@ export class RdDBaseActor extends Actor {
        return new ActorConstructor(docData, context);
      }
    }
-    context.rdd = undefined
    super(docData, context);
  }

-  findCaracByName(name) {
-    name = Grammar.toLowerCaseNoAccent(name)
-    switch (name) {
-      case 'reve-actuel': case 'reve actuel':
-        return this.system.carac.reve
-      case 'chance-actuelle': case 'chance actuelle':
-        return this.system.carac.chance
-      case 'vie':
-        return this.system.sante.vie
-    }
-
-    const carac = this.system.carac;
-    return RdDBaseActor.$findCaracByName(carac, name);
-  }
-
-  mapCarac(caracCode) { return caracCode }
-
-  getCaracByName(name) {
-    name = this.mapCarac(Grammar.toLowerCaseNoAccent(name))
-    switch (name) {
-      case 'reve-actuel': case 'reve actuel':
-        return this.getCaracReveActuel();
-      case 'chance-actuelle': case 'chance-actuelle':
-        return this.getCaracChanceActuelle();
-    }
-    return this.findCaracByName(name);
-  }
-
-  /* -------------------------------------------- */
-  async _preCreate(data, options, user) {
-    await super._preCreate(data, options, user);
-
-    // Configure prototype token settings
-    if (this.type === "personnage") {
-      this.updateSource({
-        sight: { enabled: true },
-        actorLink: options.fromCompendium ? data.prototypeToken.actorLink : true,
-        disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
-      })
-    } else {
-      const prototypeToken = {
-        sight: { enabled: true },
-        disposition: CONST.TOKEN_DISPOSITIONS.NEUTRAL
-      }
-      this.updateSource({ prototypeToken });
-    }
-  }
-
-  /* -------------------------------------------- */
-  prepareData() {
-    super.prepareData()
-    this.prepareActorData()
-    this.cleanupConteneurs()
-    this.computeEtatGeneral()
-    this.computeEncTotal()
-  }
-
-  prepareActorData() { }
-
-  async computeEtatGeneral() { }
-  /* -------------------------------------------- */
-  findPlayer() {
-    return game.users.players.find(player => player.active && player.character?.id == this.id);
-  }
-
-  isCreatureEntite() { return this.isCreature() || this.isEntite() }
-  isCreature() { return false }
-  isEntite(typeentite = []) { return false }
-  isHautRevant() { return false }
-  isVehicule() { return false }
-  isPersonnage() { return false }
+  isCreatureEntite() { return this.type == 'creature' || this.type == 'entite'; }
+  isCreature() { return this.type == 'creature'; }
+  isEntite() { return this.type == 'entite'; }
+  isPersonnage() { return this.type == 'personnage'; }
+  isVehicule() { return this.type == 'vehicule'; }
  getItem(id, type = undefined) {
    const item = this.items.get(id);
    if (type == undefined || (item?.type == type)) {
@@ -225,71 +117,32 @@ export class RdDBaseActor extends Actor {
    return undefined;
  }

-  listeSuivants(filter = suivant => true) { return [] }
-  listeSuivants(filter = suivant => true) { return [] }
  listItems(type = undefined) { return (type ? this.itemTypes[type] : this.items); }
-  filterItems(filter, type = undefined) { return (type ? this.itemTypes[type] : this.items)?.filter(filter) ?? []; }
+  filterItems(filter, type = undefined) { return type ? this.itemTypes[type]?.filter(filter) ?? [] : []; }
  findItemLike(idOrName, type) {
    return this.getItem(idOrName, type)
      ?? Misc.findFirstLike(idOrName, this.listItems(type), { description: Misc.typeName('Item', type) });
  }

  getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
-  getEncombrementMax() { return 0 }

-  /* -------------------------------------------- */
-  async updateCarac(caracName, to) {
-  }
+  recompute() { }
+
+
  /* -------------------------------------------- */
  async onPreUpdateItem(item, change, options, id) { }
-  async onCreateItem(item, options, id) { }
-  async onUpdateActor(update, options, actorId) { }
-  async onDeleteItem(item, options, id) {
-    if (item.isInventaire()) {
-      await this._removeItemFromConteneur(item)
-    }
-  }

-  async _removeItemFromConteneur(item) {
-    const updates = this.items.filter(it => it.isConteneur() && it.system.contenu.includes(item.id))
-      .map(conteneur => {
-        const nouveauContenu = conteneur.system.contenu.filter(id => id != item.id)
-        return { _id: conteneur.id, 'system.contenu': nouveauContenu }
-      })
-    if (updates.length > 0) {
-      await this.updateEmbeddedDocuments('Item', updates)
-    }
-  }
+  async onCreateItem(item, options, id) { }
+
+  async onDeleteItem(item, options, id) { }
+
+  async onUpdateActor(update, options, actorId) { }

  async onTimeChanging(oldTimestamp, newTimestamp) {
    this.items.filter(it => it.isFinPeriode(oldTimestamp, newTimestamp))
      .forEach(async it => await it.onFinPeriodeTemporel(oldTimestamp, newTimestamp))
  }

-  async creerObjetParMJ(object) {
-    if (this.isOwner) {
-      await this.createEmbeddedDocuments('Item', [object])
-      return
-    }
-    RdDBaseActor.remoteActorCall({
-      tokenId: this.token?.id,
-      actorId: this.id,
-      method: 'creerObjetParMJ', args: [object]
-    })
-  }
-
-  /* -------------------------------------------- */
-  async cleanupConteneurs() {
-    if (Misc.isOwnerPlayer(this)) {
-      let updates = this.itemTypes['conteneur']
-        .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
-        .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
-      if (updates.length > 0) {
-        await this.updateEmbeddedDocuments("Item", updates)
-      }
-    }
-  }
-
  /* -------------------------------------------- */
  getFortune() {
    return Monnaie.getFortune(this.itemTypes['monnaie']);
@@ -300,7 +153,7 @@ export class RdDBaseActor extends Actor {
    let item = this.getItem(id);
    if (item && item.isInventaire()) {
      const quantite = Math.max(0, item.system.quantite + value);
-      await item.update({ 'system.quantite': quantite });
+      await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'system.quantite': quantite }]);
    }
  }

@@ -318,7 +171,6 @@ export class RdDBaseActor extends Actor {
    }
    let fortune = this.getFortune();
    console.log("payer", game.user.character, depense, fortune);
-    // TODO: passer en handlebars
    let msg = "";
    if (fortune >= depense) {
      await Monnaie.optimiserFortune(this, fortune - depense);
@@ -328,10 +180,11 @@ export class RdDBaseActor extends Actor {
      msg = "Vous n'avez pas assez d'argent pour payer cette somme !";
    }

-    ChatMessage.create({
-      whisper: ChatUtility.getOwners(this),
+    let message = {
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
      content: msg
-    })
+    };
+    ChatMessage.create(message);
  }

  async depenserSols(sols) {
@@ -351,10 +204,9 @@ export class RdDBaseActor extends Actor {
      ui.notifications.error(`Impossible d'ajouter un gain de ${sols} <0`);
      return;
    }
-    if (fromActorId && !this.isOwner) {
+    if (fromActorId && !game.user.isGM) {
      RdDBaseActor.remoteActorCall({
        userId: Misc.connectedGMOrUser(),
-        tokenId: this.token?.id,
        actorId: this.id,
        method: 'ajouterSols', args: [sols, fromActorId]
      });
@@ -365,7 +217,7 @@ export class RdDBaseActor extends Actor {

      RdDAudio.PlayContextAudio("argent"); // Petit son
      ChatMessage.create({
-        whisper: ChatUtility.getOwners(this),
+        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
        content: `Vous avez reçu <strong>${sols} Sols</strong> ${fromActor ? " de " + fromActor.name : ''}, qui ont été ajoutés à votre argent.`
      });
    }
@@ -383,23 +235,25 @@ export class RdDBaseActor extends Actor {
      ui.notifications.info("Inutile de se vendre à soi-même");
      return;
    }
-    if (!Misc.isFirstConnectedGM()) {
+    if (!Misc.isUniqueConnectedGM()) {
      RdDBaseActor.remoteActorCall({
        actorId: achat.vendeurId ?? achat.acheteurId,
-        method: 'achatVente', args: [achat]
+        method: 'achatVente',
+        args: [achat]
      });
-      return
+      return;
    }
    const cout = Number(achat.prixTotal ?? 0);
    const vendeur = achat.vendeurId ? game.actors.get(achat.vendeurId) : undefined;
    const acheteur = achat.acheteurId ? game.actors.get(achat.acheteurId) : undefined;
    const quantite = (achat.choix.nombreLots ?? 1) * (achat.vente.tailleLot);
-    const itemVendu = vendeur?.getItem(achat.vente.item._id) ?? game.items.get(achat.vente.item._id);
+    const itemVendu = vendeur?.getItem(achat.vente.item._id) ?? game.items.get(achat.vente.item._id) ?? achat.vente.item;
    if (!itemVendu) {
-      ChatUtility.notifyUser(achat.userId, 'warn', vendeur ? `Le vendeur n'a pas plus de ${achat.vente.item.name} !` : `Impossible de retrouver: ${achat.vente.item.name} !`);
+      ui.notifications.warn("Erreur sur achat: rien à acheter<br>Si possible, transmettez les logs de la console aux développeurs");
+      console.log('Erreur sur achat: rien à acheter', achat);
      return;
    }
-    if (vendeur && !vendeur.verifierQuantite(itemVendu, quantite)) {
+    if (!this.verifierQuantite(vendeur, itemVendu, quantite)) {
      ChatUtility.notifyUser(achat.userId, 'warn', `Le vendeur n'a pas assez de ${itemVendu.name} !`);
      return
    }
@@ -407,42 +261,43 @@ export class RdDBaseActor extends Actor {
      ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
      return;
    }
-    await vendeur?.vendre(itemVendu, quantite, cout);
-    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-
+    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    if (acheteur) {
+      await acheteur.depenserSols(cout);
+      const createdItemId = await acheteur.creerQuantiteItem(achat.vente.item, quantite);
+      await acheteur.consommerNourritureAchetee(achat, achat.vente, createdItemId);
+    }
    if (cout > 0) {
      RdDAudio.PlayContextAudio("argent");
    }
-    const chatAchatItem = foundry.utils.duplicate(achat.vente);
+    const chatAchatItem = duplicate(achat.vente);
    chatAchatItem.quantiteTotal = quantite;
    ChatMessage.create({
      user: achat.userId,
-      speaker: { alias: (acheteur ?? vendeur).getAlias() },
-      whisper: ChatUtility.getOwners(this),
-      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.hbs', chatAchatItem)
+      speaker: { alias: (acheteur ?? vendeur).name },
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem)
    });

    if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.nbLots <= achat.choix.nombreLots) {
+      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
        ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
      }
      else if (achat.chatMessageIdVente) {
-        await ChatVente.diminuerQuantiteAchatVente(achat.chatMessageIdVente, achat.choix.nombreLots)
+        achat.vente.properties = itemVendu.getProprietes();
+        achat.vente.quantiteNbLots -= achat.choix.nombreLots;
+        achat.vente.jsondata = JSON.stringify(achat.vente.item);
+        const messageVente = game.messages.get(achat.chatMessageIdVente);
+        messageVente.update({ content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', achat.vente) });
+        messageVente.render(true);
      }
    }
  }

-  async vendre(item, quantite, cout) {
-    await this.ajouterSols(cout);
-    await this.decrementerQuantiteItem(item, quantite);
-  }
-
-  async acheter(item, quantite, cout, achat) {
-    await this.depenserSols(cout)
-    const createdItemId = await this.creerQuantiteItem(item, quantite)
-    if (achat.choix.consommer && item.type == 'nourritureboisson' && createdItemId != undefined) {
-      achat.choix.doses = achat.choix.nombreLots;
-      await this.consommerNourritureboisson(createdItemId, achat.choix, achat.vente.actingUserId);
+  async decrementerVente(vendeur, itemVendu, quantite, cout) {
+    if (vendeur) {
+      await vendeur.ajouterSols(cout);
+      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
    }
  }

@@ -450,33 +305,36 @@ export class RdDBaseActor extends Actor {
    return this.getFortune() >= cout;
  }

-  verifierQuantite(item, quantiteDemande) {
-    const disponible = this.getQuantiteDisponible(item);
-    return disponible == undefined || disponible >= quantiteDemande;
+  verifierQuantite(vendeur, item, quantiteTotal) {
+    const disponible = vendeur?.getQuantiteDisponible(item);
+    return disponible == undefined || disponible >= quantiteTotal;
+  }
+
+  async consommerNourritureAchetee(achat, vente, createdItemId) {
+    if (achat.choix.consommer && vente.item.type == 'nourritureboisson' && createdItemId != undefined) {
+      achat.choix.doses = achat.choix.nombreLots;
+      await this.consommerNourritureboisson(createdItemId, achat.choix, vente.actingUserId);
+    }
  }

-  async consommerNourritureboisson(itemId, choix, userId) { }

  async decrementerQuantiteItem(item, quantite, options = { supprimerSiZero: true }) {
    if (item.isService()) {
      return;
    }
-    const itemId = item.id;
    let resteQuantite = (item.system.quantite ?? 1) - quantite;
    if (resteQuantite <= 0) {
      if (options.supprimerSiZero) {
        await this.deleteEmbeddedDocuments("Item", [item.id]);
      }
      else {
-        await this.updateEmbeddedDocuments("Item", [{ _id: itemId, 'system.quantite': 0 }]);
+        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': 0 }]);
      }
      if (resteQuantite < 0) {
        ui.notifications.warn(`La quantité de ${item.name} était insuffisante, l'objet a donc été supprimé`)
      }
    }
    else if (resteQuantite > 0) {
-      const realItem = this.getItem(item.id)
-      realItem.update({ 'system.quantite': resteQuantite });
      await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': resteQuantite }]);
    }
  }
@@ -488,7 +346,7 @@ export class RdDBaseActor extends Actor {
        type: item.type,
        img: item.img,
        name: item.name,
-        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined }, { inplace: false })
+        system: mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
      };
      const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
      const items = await this.createEmbeddedDocuments("Item", newItems);
@@ -497,6 +355,14 @@ export class RdDBaseActor extends Actor {
  }

  /* -------------------------------------------- */
+  computeMalusSurEncombrement() {
+    return 0;
+  }
+
+  getEncombrementMax() {
+    return 0;
+  }
+
  async computeEncTotal() {
    if (!this.pack) {
      this.encTotal = this.items.map(it => it.getEncTotal()).reduce(Misc.sum(), 0);
@@ -505,10 +371,6 @@ export class RdDBaseActor extends Actor {
    return 0;
  }

-  getEncTotal() {
-    return Math.floor(this.encTotal ?? 0);
-  }
-
  async createItem(type, name = undefined) {
    if (!name) {
      name = 'Nouveau ' + Misc.typeName('Item', type);
@@ -521,15 +383,14 @@ export class RdDBaseActor extends Actor {
  }

  async processDropItem(params) {
-    const targetActorId = this.id
-    const sourceActorId = params.sourceActorId
-    const sourceTokenId = params.sourceTokenId
-    const itemId = params.itemId
-    const destId = params.destId
-    const srcId = params.srcId
+    const targetActorId = this.id;
+    const sourceActorId = params.sourceActorId;
+    const itemId = params.itemId;
+    const destId = params.destId;
+    const srcId = params.srcId;
    if (sourceActorId && sourceActorId != targetActorId) {
-      console.log("Moving objects", sourceActorId, sourceTokenId, targetActorId, itemId);
-      this.moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId);
+      console.log("Moving objects", sourceActorId, targetActorId, itemId);
+      this.moveItemsBetweenActors(itemId, sourceActorId);
      return false;
    }
    let result = true;
@@ -574,45 +435,77 @@ export class RdDBaseActor extends Actor {


  /* -------------------------------------------- */
-  conteneurPeutContenir(dest, moved) {
+  conteneurPeutContenir(dest, item) {
    if (!dest) {
      return true;
    }
    if (!dest.isConteneur()) {
      return false;
    }
-    if (moved.isConteneurContenu(dest)) {
-      ui.notifications.warn(`Impossible de déplacer un conteneur parent (${moved.name}) dans un de ses contenus ${dest.name} !`);
-      return false;
+    const destData = dest
+    if (this._isConteneurContenu(item, dest)) {
+      ui.notifications.warn(`Impossible de déplacer un conteneur parent (${item.name}) dans un de ses contenus ${destData.name} !`);
+      return false; // Loop detected !
    }

    // Calculer le total actuel des contenus
-    const encContenu = dest.getEncContenu();
-    const newEnc = moved.getEncTotal(); // Calculer le total actuel du nouvel objet
-    const placeDisponible = Misc.keepDecimals(dest.system.capacite - encContenu - newEnc, 4)
+    let encContenu = this.getRecursiveEnc(dest) - Number(destData.system.encombrement);
+    let newEnc = this.getRecursiveEnc(item); // Calculer le total actuel du nouvel objet

    // Teste si le conteneur de destination a suffisament de capacité pour recevoir le nouvel objet
-    if (placeDisponible < 0) {
+    if (Number(destData.system.capacite) < encContenu + newEnc) {
      ui.notifications.warn(
-        `Le conteneur ${dest.name} a une capacité de ${dest.system.capacite}, et contient déjà ${encContenu}.
-        Impossible d'y ranger: ${moved.name} d'encombrement ${newEnc}!`);
+        `Le conteneur ${dest.name} a une capacité de ${destData.system.capacite}, et contient déjà ${encContenu}.
+        Impossible d'y ranger: ${item.name} d'encombrement ${newEnc}!`);
      return false;
    }
    return true;
  }

  /* -------------------------------------------- */
-  /** Ajoute un item dans un conteneur, sur la base de leurs ID */
-  async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
-    if (conteneur?.isConteneur()) {
-      item.estContenu = true;
-      const nouveauContenu = [...conteneur.system.contenu, item.id];
-      await conteneur.update({ 'system.contenu': nouveauContenu });
-      onAjouterDansConteneur(item.id, conteneur.id)
+  _isConteneurContenu(item, conteneur) {
+    if (item?.isConteneur()) { // Si c'est un conteneur, il faut vérifier qu'on ne le déplace pas vers un sous-conteneur lui appartenant
+      for (let id of item.system.contenu) {
+        let subObjet = this.getItem(id);
+        if (subObjet?.id == conteneur.id) {
+          return true; // Loop detected !
+        }
+        if (subObjet?.isConteneur()) {
+          return this._isConteneurContenu(subObjet, conteneur);
+        }
+      }
    }
-    else {
+    return false;
+  }
+  /* -------------------------------------------- */
+  getRecursiveEnc(objet) {
+    if (!objet) {
+      return 0;
+    }
+    const tplData = objet.system;
+    if (objet.type != 'conteneur') {
+      return Number(tplData.encombrement) * Number(tplData.quantite);
+    }
+    const encContenus = tplData.contenu.map(idContenu => this.getRecursiveEnc(this.getItem(idContenu)));
+    return encContenus.reduce(Misc.sum(), 0)
+      + Number(tplData.encombrement) /* TODO? Number(tplData.quantite) -- on pourrait avoir plusieurs conteneurs...*/
+  }
+
+  /* -------------------------------------------- */
+  /** Ajoute un item dans un conteneur, sur la base
+   * de leurs ID */
+  async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
+    if (!conteneur) {
+      // TODO: afficher
      item.estContenu = false;
-      await conteneur?.update({ 'system.-=contenu': undefined })
+    }
+    else if (conteneur.isConteneur()) {
+      item.estContenu = true;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': [...conteneur.system.contenu, item.id]
+      }]);
+      onAjouterDansConteneur(item.id, conteneur.id);
    }
  }

@@ -630,13 +523,8 @@ export class RdDBaseActor extends Actor {
          if (item.estContenu) {
            item.estContenu = undefined;
          }
-          if (item.system.contenu != undefined) {
-            if (item.type == 'conteneur') {
-              corrections.push({ _id: item.id, 'system.contenu': [] });
-            }
-            else {
-              corrections.push({ _id: item.id, 'system.-=contenu': undefined });
-            }
+          if (item.type == 'conteneur' && item.system.contenu.length > 0) {
+            corrections.push({ _id: item.id, 'system.contenu': [] });
          }
        }
        if (corrections.length > 0) {
@@ -671,31 +559,28 @@ export class RdDBaseActor extends Actor {
  }

  /* -------------------------------------------- */
-  /**
-   * Supprime un item d'un conteneur, sur la base de leurs ID
-   */
+  /** Supprime un item d'un conteneur, sur la base
+   * de leurs ID */
  async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
-    if (conteneur) {
-      if (conteneur.isConteneur()) {
-        const contenu = conteneur.system.contenu.filter(id => id != item.id);
-        await conteneur.update({ 'system.contenu': contenu });
-        onEnleverDeConteneur();
-      }
-      else {
-        await conteneur.update({ 'system.-=contenu': undefined })
-      }
+    if (conteneur?.isConteneur()) {
+      item.estContenu = false;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': conteneur.system.contenu.filter(id => id != item.id)
+      }]);
+      onEnleverDeConteneur();
    }
-    item.estContenu = false;
  }

  /* -------------------------------------------- */
-  async moveItemsBetweenActors(itemId, sourceActorId, sourceTokenId) {
-    let sourceActor = RdDBaseActor.getRealActor(sourceActorId, sourceTokenId)
-    let itemsList = [{ id: itemId, conteneurId: undefined }]
+  async moveItemsBetweenActors(itemId, sourceActorId) {
+    let itemsList = []
+    let sourceActor = game.actors.get(sourceActorId);
+    itemsList.push({ id: itemId, conteneurId: undefined }); // Init list
    sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list

    const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => foundry.utils.duplicate(it))
+      .map(it => duplicate(it))
      .map(it => { it.system.contenu = []; return it; });
    let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);

@@ -704,17 +589,20 @@ export class RdDBaseActor extends Actor {
    for (let item of itemsList) { // Second boucle pour traiter la remise en conteneurs
      // gestion conteneur/contenu
      if (item.conteneurId) { // l'Objet était dans un conteneur
-        const newConteneurId = itemMap[item.conteneurId];
-        const newConteneur = this.getItem(newConteneurId);
-        const newItemId = itemMap[item.id]; // Get newItem
+        let newConteneurId = itemMap[item.conteneurId]; // Get conteneur
+        let newConteneur = this.getItem(newConteneurId);
+
+        let newItemId = itemMap[item.id]; // Get newItem

        console.log('New conteneur filling!', newConteneur, newItemId, item);
-        const nouveauContenu = [...newConteneur.system.contenu, newItemId]
-        await newConteneur.update({ 'system.contenu': nouveauContenu })
+        let contenu = duplicate(newConteneur.system.contenu);
+        contenu.push(newItemId);
+        await this.updateEmbeddedDocuments('Item', [{ _id: newConteneurId, 'system.contenu': contenu }]);
      }
    }
-    const deletedItemIds = itemsList.map(it => it.id)
-    await sourceActor.deleteEmbeddedDocuments('Item', deletedItemIds);
+    for (let item of itemsList) {
+      await sourceActor.deleteEmbeddedDocuments('Item', [item.id]);
+    }
  }

  _buildMapOldNewId(itemsList, newItems) {
@@ -733,45 +621,12 @@ export class RdDBaseActor extends Actor {
      type: this.type,
      img: this.img,
      pack: this.pack,
-      name: this.getAlias(),
+      name: this.name,
      system: { description: this.system.description }
    }
-    foundry.applications.handlebars.renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.hbs', chatData)
+    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.html', chatData)
      .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride)));
  }

-  actionImpossible(action) {
-    ui.notifications.info(`${this.getAlias()} ne peut pas faire cette action: ${action}`)
-  }
-
-  isAlcoolise() { return false }
-  async jetEthylisme() { this.actionImpossible("jet d'éthylisme") }
-  async rollAppelChance() { this.actionImpossible("appel à la chance") }
-  async jetDeMoral() { this.actionImpossible("jet de moral") }
-
-  async resetItemUse() { }
-  async incDecItemUse(itemId, shouldIncrease = true) { }
-  getItemUse(itemId) { return 0; }
-
-  async finDeRound(options = { terminer: false }) { }
-  isActorCombat() { return false }
-  getCaracInit(competence) { return 0 }
-
-  listAttaques() {
-    return this.listActions({ isAttaque: true, isEquipe:false })
-  }
-
-  listActions({ isAttaque = false, isEquipe=false }) { return [] }
-
-  listActionsPossessions() {
-    return this.itemTypes[ITEM_TYPES.possession]
-      .map(p => {
-        return {
-          name: p.name,
-          action: 'possession',
-          possessionid: p.system.possessionid,
-        }
-      })
-  }

 }
--- a/module/actor/commerce-sheet.js
+++ b/module/actor/commerce-sheet.js
@@ -1,5 +1,9 @@
+import { DialogItemAchat } from "../dialog-item-achat.js";
 import { RdDItem } from "../item.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
+import { RdDCommerce } from "./commerce.js";

 /**
 * Extend the basic ActorSheet with some very simple modifications
@@ -9,11 +13,14 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {

  /** @override */
  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.hbs",
-      width: 600, height: 720,
-      tabs: []
-    }, { inplace: false })
+    return mergeObject(super.defaultOptions, {
+      classes: ["rdd", "sheet", "actor"],
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
+      width: 600,
+      height: 720,
+      tabs: [],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
+    });
  }
  get title() {
    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
@@ -25,7 +32,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
  async getData() {
    const formData = await super.getData();
    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      foundry.utils.mergeObject(formData,
+      mergeObject(formData,
        {
          title: this.actor.token.name,
          token: {
@@ -42,8 +49,12 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
  activateListeners(html) {
    super.activateListeners(html);

+    this.html.find('a.item-acheter').click(async event => await this.vente(this.getItem(event)));
+
    if (!this.options.editable) return;

+    this.html.find('a.item-quantite-moins').click(async event => await this.getItem(event)?.quantiteIncDec(-1, { supprimerSiZero: false }));
+    this.html.find('a.item-quantite-plus').click(async event => await this.getItem(event)?.quantiteIncDec(1));
    this.html.find('input.item-quantite').change(async event => {
      const newQuantite = Math.max(0, Number.parseInt(this.html.find(event.currentTarget).val()));
      await this.getItem(event)?.update({ "system.quantite": newQuantite });
@@ -57,4 +68,28 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
  getTypesInventaire() {
    return RdDItem.getItemTypesInventaire('all');
  }
+
+
+  async vente(item) {
+    const acheteur = RdDUtility.getSelectedActor();
+    if (!acheteur) {
+      ui.notifications.warn(`Pas d'acheteur sélectionné`);
+      return;
+    }
+    const disponible = this.actor.getQuantiteDisponible(item)
+    if (disponible == 0) {
+      ui.notifications.warn(`${this.name} n'a plus de ${item.name} en vente`);
+      return;
+    }
+
+    await DialogItemAchat.onAcheter({
+      item,
+      vendeur: this.actor,
+      acheteur,
+      quantiteIllimite: disponible == undefined,
+      nbLots: disponible ?? 1,
+      tailleLot: 1,
+      prixLot: item.calculerPrixCommercant()
+    });
+  }
 }
--- a/module/actor/commerce.js
+++ b/module/actor/commerce.js
@@ -1,6 +1,4 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { Misc } from "../misc.js";
-import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActor } from "./base-actor.js";

 export class RdDCommerce extends RdDBaseActor {
@@ -9,18 +7,27 @@ export class RdDCommerce extends RdDBaseActor {
    return "systems/foundryvtt-reve-de-dragon/icons/services/commerce.webp";
  }

+  prepareData() {
+    super.prepareData();
+  }
+  prepareDerivedData() {
+    super.prepareDerivedData();
+  }
+
  canReceive(item) {
-    return item.isInventaire('all');
+    if (item.isInventaire('all')) {
+      return true;
+    }
+    return super.canReceive(item);
  }

  getQuantiteDisponible(item) {
-    return (this.system.illimite || item?.isService()) ? undefined : item.getQuantite();
+    return this.system.illimite || item.isService() ? undefined : item.getQuantite();
  }

  verifierFortune(cout) {
    return this.system.illimite || super.verifierFortune(cout);
  }
-
  async depenserSols(cout) {
    if (this.system.illimite) {
      return
@@ -28,6 +35,10 @@ export class RdDCommerce extends RdDBaseActor {
    await super.depenserSols(cout)
  }

+  async consommerNourritureAchetee(achat, vente, createdItemId) {
+    // ne pas consommer pour un commerce
+  }
+
  async decrementerQuantiteItem(item, quantite) {
    if (this.system.illimite) {
      return;
@@ -39,27 +50,4 @@ export class RdDCommerce extends RdDBaseActor {
    const pourcentage = this.system.pourcentage ?? 100;
    return Misc.keepDecimals(Math.ceil(item.system.cout * pourcentage) / 100, 2);
  }
-  async vente(item) {
-    const acheteur = RdDUtility.getSelectedActor();
-    if (!acheteur) {
-      ui.notifications.warn(`Pas d'acheteur sélectionné`);
-      return;
-    }
-    const disponible = this.getQuantiteDisponible(item)
-    if (disponible == 0) {
-      ui.notifications.warn(`${this.getAlias()} n'a plus de ${item.name} en vente`);
-      return;
-    }
-
-    await DialogItemAchat.onAcheter({
-      item,
-      vendeur: this,
-      acheteur,
-      quantiteIllimite: disponible == undefined,
-      nbLots: disponible ?? 1,
-      tailleLot: 1,
-      prixLot: item.calculerPrixCommercant()
-    });
-  }
-  
 }
--- a/module/actor/creature.js
+++ b/module/actor/creature.js
@@ -1,49 +0,0 @@
-import { Grammar } from "../grammar.js";
-import { ITEM_TYPES } from "../constants.js";
-import { LIST_CARAC_AUTRES } from "../rdd-carac.js";
-import { RdDBaseActorSang } from "./base-actor-sang.js";
-
-export class RdDCreature extends RdDBaseActorSang {
-
-  static get defaultIcon() {
-    return "systems/foundryvtt-reve-de-dragon/icons/creatures/bramart.svg";
-  }
-
-  getEnduranceMax() { return Math.max(1, this.getVieMax() + this.getConstitution()) }
-  isCreature() { return true }
-
-  canReceive(item) {
-    return item.type == ITEM_TYPES.competencecreature || item.isInventaire();
-  }
-
-  async remiseANeuf() {
-    await this.removeEffects(e => true);
-    await this.supprimerBlessures(it => true);
-    await this.update({
-      'system.sante.endurance.value': this.system.sante.endurance.max,
-      'system.sante.vie.value': this.system.sante.vie.max,
-      'system.sante.fatigue.value': 0
-    });
-  }
-
-  async finDeRoundBlessures() {
-    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
-    if (nbGraves > 0) {
-      // Gestion blessure graves : -1 pt endurance par blessure grave
-      await this.santeIncDec("endurance", -nbGraves);
-    }
-  }
-
-  mapCarac(caracCode) {
-    switch (caracCode) {
-      case 'vue': case 'ouie': case 'odoratgout': case 'empathie': case 'perception':
-        return 'perception'
-      case 'agilite':
-        return 'force'
-      case 'force': case 'constitution': case 'taille': case 'reve': case 'volonte':
-        return caracCode
-    }
-    return undefined
-  }
-
-}
--- a/module/actor/entite-sheet.js
+++ b/module/actor/entite-sheet.js
@@ -1,80 +0,0 @@
-import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
-import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { DialogSelect } from "../dialog-select.js";
-
-export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.hbs",
-      width: 640, height: 720,
-    }, { inplace: false })
-  }
-
-  async getData() {
-    let formData = await super.getData();
-    formData.niveau = this.actor.getNiveau()
-    delete formData.system.carac.niveau
-    formData.resonances = this.actor.system.sante.resonnance.actors.map(actorId => game.actors.get(actorId))
-      .map(actor => { return { id: actor.id, name: actor.name, img: actor.img } })
-    return formData
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    // On competence change
-    this.html.find('.creature-carac').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
-    });
-    this.html.find('.creature-dommages').change(async event => {
-      let compName = event.currentTarget.attributes.compname.value;
-      await this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
-    })
-
-    this.html.find('.resonance-add').click(async event =>
-      await DialogSelect.select({
-        label: "Choisir un acteur à accorder",
-        list: game.actors.filter(it => it.isPersonnage() && it.prototypeToken.actorLink)
-      },
-        it => this.resonanceAdd(it.id))
-    )
-
-    this.html.find('.resonance-delete').click(async event => {
-      const li = RdDSheetUtility.getEventElement(event);
-      const actorId = li.data("actor-id");
-      if (actorId) {
-        const actorResonance = game.actors.get(actorId);
-        RdDUtility.confirmSubActeurDelete(this, actorResonance, li, () => {
-          this.resonanceDelete(actorId);
-          RdDUtility.slideOnDelete(this, li);
-        })
-      }
-    })
-  }
-
-  async _onDropActor(event, dragData) {
-    const dropActor = fromUuidSync(dragData.uuid)
-    await this.actor.setEntiteReveAccordee(dropActor)
-    super._onDropActor(event, dragData)
-  }
-
-  async resonanceAdd(actorId) {
-    let newResonances = [...this.actor.system.sante.resonnance.actors, actorId]
-    await this.actor.update({ 'system.sante.resonnance.actors': newResonances });
-  }
-
-  async resonanceDelete(actorId) {
-    console.log('Delete : ', actorId);
-    let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
-    await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });
-  }
-}
--- a/module/actor/entite.js
+++ b/module/actor/entite.js
@@ -1,130 +0,0 @@
-import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
-import { ITEM_TYPES } from "../constants.js";
-import { Misc } from "../misc.js";
-import { RdDCarac } from "../rdd-carac.js";
-import { RdDEncaisser } from "../rdd-roll-encaisser.js";
-import { STATUSES } from "../settings/status-effects.js";
-import { RdDBaseActorReve } from "./base-actor-reve.js";
-
-export class RdDEntite extends RdDBaseActorReve {
-
-  static get defaultIcon() {
-    return "systems/foundryvtt-reve-de-dragon/icons/entites/darquoine.webp";
-  }
-
-  canReceive(item) {
-    return item.type == ITEM_TYPES.competencecreature
-  }
-
-  isEntite(typeentite = []) {
-    return (typeentite.length == 0 || typeentite.includes(this.system.definition.typeentite));
-  }
-
-  isNonIncarnee() { return this.isEntite([ENTITE_NONINCARNE]) }
-
-  getReveActuel() {
-    return Misc.toInt(this.system.carac.reve?.value)
-  }
-
-  getCarac() {
-    const carac = super.getCarac()
-    delete carac.niveau
-    return carac
-  }
-
-  getNiveau() {
-    const reve = this.getReve()
-    return RdDCarac.getCaracDerivee(reve).niveau
-  }
-  getForce() { return this.getReve() }
-  getAgilite() { return this.getReve() }
-  getChance() { return this.getReve() }
-  getEnduranceMax() { return Math.max(1, this.getTaille() + this.getReve()) }
-
-  getDraconicOuPossession() {
-    return this.itemTypes[ITEM_TYPES.competencecreature]
-      .filter(it => it.system.categorie == 'possession')
-      .sort(Misc.descending(it => it.system.niveau))
-      .find(it => true);
-  }
-
-  async remiseANeuf() {
-    await this.removeEffects(e => true);
-    if (!this.isNonIncarnee()) {
-      await this.update({
-        'system.sante.endurance.value': this.system.sante.endurance.max
-      });
-    }
-  }
-
-  isDead() {
-    return this.isNonIncarnee() ? false : this.system.sante.endurance.value <= 0
-  }
-
-  async santeIncDec(name, inc, isCritique = false) {
-    if (name == 'endurance' && !this.isNonIncarnee()) {
-      const oldValue = this.system.sante.endurance.value;
-      const endurance = Math.max(0,
-        Math.min(oldValue + inc,
-          this.system.sante.endurance.max));
-      await this.update({ "system.sante.endurance.value": endurance })
-      await this.setEffect(STATUSES.StatusComma, endurance <= 0);
-      return {
-        perte: oldValue - endurance,
-        newValue: endurance
-      }
-    }
-    return {}
-  }
-
-  async encaisser() {
-    if (this.isNonIncarnee()) {
-      return
-    }
-    await RdDEncaisser.encaisser(this)
-  }
-
-  isEffectAllowed(effectId) {
-    return [STATUSES.StatusComma].includes(effectId);
-  }
-
-  async onAppliquerJetEncaissement(encaissement, attackerToken) {
-    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
-    foundry.utils.mergeObject(encaissement, {
-      resteEndurance: perteEndurance.newValue,
-      endurance: perteEndurance.perte
-    });
-  }
-
-  isEntiteAccordee(attacker) {
-    if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = this.system.sante.resonnance
-      return (resonnance.actors.find(it => it == attacker.id))
-    }
-    return true
-  }
-
-  /* -------------------------------------------- */
-  async setEntiteReveAccordee(actor) {
-    if (this.isEntite([ENTITE_INCARNE])) {
-      if (this.system.sante.resonnance.actors.find(it => it == actor.id)) {
-        // déjà accordé
-        return
-      }
-      await this.update({ "system.sante.resonnance.actors": [...this.system.sante.resonnance.actors, actor.id] })
-    }
-    else {
-      super.setEntiteReveAccordee(actor)
-    }
-  }
-
-  mapCarac(caracCode) {
-    switch (caracCode) {
-      case 'taille':
-      case 'reve':
-        return caracCode
-    }
-    return 'reve'
-  }
-
-}
--- a/module/actor/experience-log.js
+++ b/module/actor/experience-log.js
@@ -1,39 +0,0 @@
-
-export const XP_TOPIC = {
-  XP: { code: 'xp', label: 'xp' },
-  XPSORT: { code: 'xpsort', label: 'xp sort' },
-  NIVEAU: { code: 'niveau', label: 'Niveau' },
-  XPCARAC: { code: 'xpcarac', label: 'xp carac' },
-  CARAC: { code: 'carac', label: 'Carac' },
-  STRESS: { code: 'stress', label: 'Stress' },
-  TRANSFORM: { code: 'xps', label: 'Transformé' },
-}
-
-export class ExperienceLog {
-
-  static async add(actor, topic, from, to, raison, manuel = false) {
-    if (!actor.isPersonnageJoueur()) {
-      return
-    }
-    if (from == to) {
-      return
-    }
-    const newXpLog = {
-      mode: topic?.code ?? topic,
-      raison: (manuel ? '(manuel) ' : '') + raison,
-      from: from,
-      to: to,
-      valeur: to - from,
-      daterdd: game.system.rdd.calendrier.dateCourante(),
-      datereel: game.system.rdd.calendrier.dateReel().replace('T', ' ')
-    };
-    console.log('ExperienceLog.add', newXpLog)
-    const newExperienceLog = (actor.system.experiencelog ?? []).concat([newXpLog]);
-    await actor.update({ [`system.experiencelog`]: newExperienceLog });
-  }
-
-  static labelTopic(topic) {
-    const xpt = Object.values(XP_TOPIC).find(it => it.code == topic);
-    return xpt?.label ?? xpt?.code ?? topic;
-  }
-}
--- a/module/actor/export-scriptarium/actor-encart-sheet.js
+++ b/module/actor/export-scriptarium/actor-encart-sheet.js
@@ -1,117 +0,0 @@
-import { RdDActorSheet } from "../../actor-sheet.js"
-import { SYSTEM_RDD } from "../../constants.js";
-import { Misc } from "../../misc.js";
-import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js";
-import { ExportScriptarium } from "./export-scriptarium.js";
-import { CATEGORIES_COMPETENCES, CATEGORIES_DRACONIC, Mapping } from "./mapping.js";
-
-export class RdDActorExportSheet extends RdDActorSheet {
-  static init() {
-    foundry.applications.handlebars.loadTemplates([
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/arme-titre.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessure.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/blessures.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-compteur.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-derivee.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/carac-derivee-compteur.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/competences.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/esquive.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/fatigue.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/protection.hbs",
-      "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/sort.hbs",
-    ])
-    foundry.documents.collections.Actors.registerSheet(SYSTEM_RDD, RdDActorExportSheet, { types: ["personnage"], makeDefault: false, label: "Feuille simplifiée" })
-  }
-
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDActorSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/export-scriptarium/actor-encart-sheet.hbs",
-      width: 550,
-      showCompNiveauBase: false,
-      vueArchetype: false,
-    }, { inplace: false })
-  }
-
-  constructor(actor, options) {
-    super(actor, options)
-  }
-
-  async getData() {
-    const formData = await super.getData()
-    // Add any structured, precomputed list of data
-    formData.context = Mapping.prepareContext(this.actor)
-    formData.attaques = this.actor.listActionsAttaque()
-    formData.export = this.getMappingValues(formData.context, this.actor)
-    formData.competences = this.getCompetences(CATEGORIES_COMPETENCES)
-    formData.draconic = this.getCompetences(CATEGORIES_DRACONIC)
-    const legeres = this.actor.nbBlessuresLegeres()
-    const graves = this.actor.nbBlessuresGraves()
-    const critiques = this.actor.nbBlessuresCritiques()
-    formData.etat = {
-      surenc: this.actor.computeMalusSurEncombrement(),
-      fatigue: {
-        value: this.actor.getFatigueActuelle(),
-        max: this.actor.getFatigueMax(),
-        malus: this.actor.malusFatigue()
-      },
-      blessures: legeres + graves + critiques,
-      blessure: [legeres > 0, legeres > 1, legeres > 2, legeres > 3, legeres > 4, graves > 0, graves > 1, critiques > 0],
-    }
-    formData.options.exportScriptarium = OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM)
-    return formData
-  }
-
-  getMappingValues(context, actor) {
-    return Object.fromEntries(Mapping.getMapping().map(it => [it.column, {
-      colName: it.colName ?? it.column,
-      column: it.column,
-      rollClass: it.rollClass,
-      value: String(it.getter(actor, context))
-    }]))
-  }
-
-  getCompetences(categories) {
-    const competences = Mapping.getCompetencesCategorie(this.actor, categories)
-    if (competences.length == 0) {
-      return ''
-    }
-    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
-    const listByCategories = Object.values(byCategories)
-      .map(it => it.competencesParNiveau)
-      .map(byNiveau => {
-        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
-        if (niveaux.length == 0) {
-          return undefined
-        }
-        const listCategorieByNiveau = niveaux.map(niveau => {
-          const list = byNiveau[niveau].sort(Misc.ascending(it => it.name))
-          return { niveau, list }
-        })
-        return Misc.concat(listCategorieByNiveau)
-      }).filter(it => it != undefined)
-
-    return Misc.concat(listByCategories)
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    this.html.find('.click-blessure-remove').click(async event =>
-      await this.actor.supprimerBlessure({
-        gravite: this.html.find(event.currentTarget).data('gravite')
-      })
-    )
-    this.html.find('.click-blessure-add').click(async event =>
-      await this.actor.ajouterBlessure({
-        gravite: this.html.find(event.currentTarget).data('gravite')
-      })
-    )
-    this.html.find('.button-export').click(async event => await
-      ExportScriptarium.INSTANCE.exportActors([this.actor],
-        `${this.actor.uuid}-${this.actor.name}`
-      )
-    )
-  }
-}
--- a/module/actor/export-scriptarium/export-scriptarium.js
+++ b/module/actor/export-scriptarium/export-scriptarium.js
@@ -1,88 +0,0 @@
-import { ACTOR_TYPES } from "../../constants.js"
-import { Misc } from "../../misc.js"
-import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js"
-import { Mapping } from "./mapping.js"
-
-const IMG_SCRIPTARIUM = '<img class="context-menu-img" src="systems/foundryvtt-reve-de-dragon/assets/ui/scriptarium.svg">'
-
-export class ExportScriptarium {
-
-  static init() {
-    ExportScriptarium.INSTANCE = new ExportScriptarium()
-  }
-
-  constructor() {
-    //Hooks.on("getActorDirectoryFolderContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-    Hooks.on("getFolderContextOptions", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-    //Hooks.on("getActorDirectoryEntryContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-    Hooks.on("getActorContextOptions", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
-
-  }
-
-  onActorDirectoryMenu(actorDirectory, menus) {
-    // DEBUG console.log("ExportScriptarium.onActorDirectoryMenu", actorDirectory, menus)
-    menus.push({
-      name: 'Export Personnages',
-      icon: '<i class="fa-solid fa-download"></i>', //IMG_SCRIPTARIUM,
-      condition: (target) => game.user.isGM &&
-        OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM) &&
-        this.$getActors(actorDirectory, target).length > 0,
-      callback: target => this.exportActors(this.$getActors(actorDirectory, target), this.$getTargetName(actorDirectory, target))
-    })
-  }
-
-  $getTargetName(actorDirectory, target) {
-    target = $(target)
-    const li = target.closest(".directory-item")
-    const folderId = li.data("folderId")
-    const actorId = li.data("entryId")
-    return actorId
-      ? game.actors.get(actorId).name
-      : actorDirectory.collection.filter(it => it.folder.id == folderId).name
-  }
-
-  $getActors(actorDirectory, target) {
-    if (actorDirectory.id != "actors") {
-      return []
-    }
-    // DEBUG console.log("ExportScriptarium.$getActors", actorDirectory, target)
-    target = $(target)
-    const li = target.closest(".directory-item")
-    const folderId = li.data("folderId")
-    const actorId = li.data("entryId")
-    const actors = actorId
-      ? [game.actors.get(actorId)]
-      : folderId
-        ? actorDirectory.collection.filter(it => it.folder.id == folderId)
-        : []
-    return actors.filter(it => it.type == ACTOR_TYPES.personnage)
-  }
-
-  exportActors(actors, targetName) {
-    const eol = '\n\r'
-    const header = Misc.join(this.getHeaderLine(), ';')
-    const actorLines = actors.map(actor => Misc.join(this.getActorLine(actor), ';'))
-    const data = Misc.join([header, ...actorLines], eol)
-    const filename = `scriptarium-${targetName?.slugify()}.csv`;
-    foundry.utils.saveDataToFile(data, "text/csv;charset=windows-1252", `${filename}`);
-  }
-
-  getHeaderLine() {
-    return Mapping.getColumns()
-  }
-
-  getActorLine(actor) {
-    const values = Mapping.getValues(actor)
-    return values
-      .map(it => this.$escapeQuotes(it))
-      .map(it => it.replaceAll("\n", " ").replaceAll("\r", ""))
-  }
-
-  $escapeQuotes(it) {
-    it = '' + it
-    if (it.includes('"') || it.includes(';')) {
-      return `"${it.replaceAll('"', '\\"')}"`
-    }
-    return it
-  }
-}
--- a/module/actor/export-scriptarium/mapping.js
+++ b/module/actor/export-scriptarium/mapping.js
@@ -1,381 +0,0 @@
-import { Grammar } from "../../grammar.js"
-import { RdDItemArme } from "../../item/arme.js"
-import { RdDItemCompetence } from "../../item-competence.js"
-import { RdDItemSort } from "../../item-sort.js"
-import { ITEM_TYPES } from "../../constants.js"
-import { Misc } from "../../misc.js"
-import { RdDTimestamp } from "../../time/rdd-timestamp.js"
-import { RdDBonus } from "../../rdd-bonus.js"
-import { TMRType } from "../../tmr-utility.js"
-
-
-export const CATEGORIES_COMPETENCES = [
-  "generale",
-  "particuliere",
-  "specialisee",
-  "connaissance",
-]
-export const CATEGORIES_DRACONIC = [
-  "draconic",
-]
-
-const CATEGORIES_COMBAT = [
-  "melee",
-  "tir",
-  "lancer"
-]
-
-const NIVEAU_BASE = {
-  "generale": -4,
-  "particuliere": -8,
-  "specialisee": -11,
-  "connaissance": -11,
-  "draconic": -11,
-  "melee": -6,
-  "tir": -8,
-  "lancer": -8,
-}
-
-class ColumnMappingFactory {
-  static createMappingArme(part, i) {
-    return { column: `arme_${part}_${i}`, getter: (actor, context) => Mapping.getArme(actor, context, part, i) }
-  }
-
-  static createMappingSort(part, i) {
-    return { column: `sort_${part}_${i}`, getter: (actor, context) => Mapping.getSort(actor, context, part, i) }
-  }
-}
-
-const NB_ARMES = 10
-const NB_SORTS = 20
-const TABLEAU_ARMES = [...Array(NB_ARMES).keys()]
-const TABLEAU_SORTS = [...Array(NB_SORTS).keys()]
-
-const MAPPING_BASE = [
-  { column: "ID", colName: 'ID', getter: (actor, context) => actor.id },
-  { column: "name", getter: (actor, context) => actor.name },
-  { column: "metier", colName: 'Métier', getter: (actor, context) => actor.system.metier },
-  { column: "biographie", colName: 'Biographie', getter: (actor, context) => actor.system.biographie },
-  { column: "taille", getter: (actor, context) => actor.system.carac.taille.value },
-  { column: "apparence", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.apparence.value },
-  { column: "constitution", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.constitution.value },
-  { column: "force", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.force.value },
-  { column: "agilite", rollClass: 'roll-carac', colName: 'Agilité', getter: (actor, context) => actor.system.carac.agilite.value },
-  { column: "dexterite", rollClass: 'roll-carac', colName: 'Dextérité', getter: (actor, context) => actor.system.carac.dexterite.value },
-  { column: "vue", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.vue.value },
-  { column: "ouie", rollClass: 'roll-carac', colName: 'Ouïe', getter: (actor, context) => actor.system.carac.ouie.value },
-  { column: "odoratgout", rollClass: 'roll-carac', colName: 'Odo-goût', getter: (actor, context) => actor.system.carac.odoratgout.value },
-  { column: "volonte", rollClass: 'roll-carac', colName: 'Volonté', getter: (actor, context) => actor.system.carac.volonte.value },
-  { column: "intellect", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.intellect.value },
-  { column: "empathie", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.empathie.value },
-  { column: "reve", rollClass: 'roll-carac', colName: 'Rêve', getter: (actor, context) => actor.system.carac.reve.value },
-  { column: "chance", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.chance.value },
-  { column: "melee", rollClass: 'roll-carac', colName: 'Mêlée', getter: (actor, context) => actor.system.carac.melee.value },
-  { column: "tir", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.tir.value },
-  { column: "lancer", rollClass: 'roll-carac', getter: (actor, context) => actor.system.carac.lancer.value },
-  { column: "derobee", rollClass: 'roll-carac', colName: 'Dérobée', getter: (actor, context) => actor.system.carac.derobee.value },
-  { column: "vie", getter: (actor, context) => actor.system.sante.vie.max },
-  { column: "endurance", getter: (actor, context) => actor.system.sante.endurance.max },
-  { column: "plusdom", colName: '+dom', getter: (actor, context) => actor.getBonusDegat() },
-  { column: "protectionnaturelle", colName: 'Protection naturelle', getter: (actor, context) => actor.system.attributs.protection.value > 0 ? actor.system.attributs.protection.value : '' },
-  { column: "description", getter: (actor, context) => Mapping.getDescription(actor) },
-  { column: "armure", getter: (actor, context) => Mapping.getArmure(actor, context) },
-  { column: "protectionarmure", colName: 'Protection', getter: (actor, context) => Mapping.getProtectionArmure(actor, context) },
-  { column: "malus_armure", getter: (actor, context) => Mapping.getMalusArmure(actor, context) },
-  { column: "reve_actuel", rollClass: 'roll-reve-actuel', colName: 'Rêve actuel', getter: (actor, context) => actor.system.reve.reve.value },
-  { column: "chance_actuel", rollClass: 'roll-chance-actuelle', colName: 'Chance actuelle', getter: (actor, context) => actor.system.compteurs.chance.value },
-  { column: "vie_actuel", rollClass: 'jet-vie', getter: (actor, context) => actor.system.sante.vie.value },
-  { column: "endurance_actuel", rollClass: 'jet-endurance', getter: (actor, context) => actor.system.sante.endurance.value },
-  { column: "esquive", getter: (actor, context) => Mapping.getEsquive(context) },
-  { column: "esquive_armure", getter: (actor, context) => Mapping.getEsquiveArmure(context) },
-  { column: "competences", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_COMPETENCES) },
-  { column: "draconic", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_DRACONIC) },
-]
-
-const MAPPING_ARMES = TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('name', i))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('niveau', i)))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('init', i)))
-  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('dommages', i)))
-const MAPPING_SORTS = TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('voie', i))
-  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('description', i)))
-  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('bonus', i)))
-const MAPPING = MAPPING_BASE
-  .concat(MAPPING_ARMES)
-  .concat(MAPPING_SORTS)
-
-export class Mapping {
-
-  static getMapping() {
-    return MAPPING
-  }
-
-  static getColumns() {
-    return MAPPING.map(it => it.column)
-  }
-
-  static getValues(actor) {
-    const context = Mapping.prepareContext(actor)
-    return MAPPING.map(it => it.getter(actor, context))
-  }
-  static getAsObject(actor) {
-    const context = Mapping.prepareContext(actor)
-    return Object.fromEntries(MAPPING.map(it => [it.column, {
-      colName: it.colName ?? it.column,
-      value: it.getter(actor, context)
-    }]))
-  }
-
-  static getValues(actor) {
-    const context = Mapping.prepareContext(actor)
-    return MAPPING.map(it => it.getter(actor, context))
-  }
-
-  static prepareContext(actor) {
-    return {
-      armes: Mapping.prepareArmes(actor),
-      armure: Mapping.prepareArmure(actor),
-      esquive: Mapping.prepareEsquive(actor),
-      sorts: Mapping.prepareSorts(actor)
-    }
-  }
-
-  static prepareArmes(actor) {
-    const armes = actor.items.filter(it => it.type == ITEM_TYPES.arme)
-    armes.push(RdDItemArme.corpsACorps(actor));
-    armes.push(RdDItemArme.empoignade(actor));
-    return armes.map(arme => [
-      arme.system.unemain ? Mapping.prepareArme(actor, arme, '(1 main)') : undefined,
-      arme.system.deuxmains ? Mapping.prepareArme(actor, arme, 'deuxmains') : undefined,
-      !(arme.system.unemain || arme.system.deuxmains) ? Mapping.prepareArme(actor, arme, 'competence') : undefined,
-      arme.system.lancer != "" ? Mapping.prepareArme(actor, arme, 'lancer') : undefined,
-      arme.system.tir != "" ? Mapping.prepareArme(actor, arme, 'tir') : undefined]
-      .filter(it => it != undefined))
-      .reduce((a, b) => a.concat(b), [])
-  }
-
-  static prepareArme(actor, arme, maniement) {
-    const nameCompetenceArme = RdDItemArme.getCompetenceArme(arme, maniement)
-    const competence = actor.getCompetence(nameCompetenceArme)
-    if (RdDItemCompetence.isNiveauBase(competence)) {
-      return undefined
-    }
-    const categorie = Mapping.complementCategorie(arme, maniement)
-    const dommages = Mapping.dommagesArme(actor, arme, maniement)
-    return {
-      name: arme.name + categorie,
-      niveau: Misc.toSignedString(competence.system.niveau),
-      init: Mapping.calculBaseInit(actor, competence.system.categorie) + competence.system.niveau,
-      dommages: dommages,
-      competence: competence,
-      arme: arme
-    }
-  }
-  static dommagesArme(actor, arme, maniement) {
-    const dmgArme = RdDItemArme.dommagesReels(arme, maniement)
-    const dommages = Misc.toSignedString(dmgArme + RdDBonus.bonusDmg(actor, maniement, dmgArme))
-    switch (arme.system.mortalite) {
-      case 'non-mortel': return `(${dommages})`
-      case 'empoignade': return '-'
-    }
-    return dommages
-  }
-
-  static complementCategorie(arme, maniement) {
-    switch (maniement) {
-      case 'unemain': return (arme.system.deuxmains) ? ' 1 main' : (arme.system.lancer || arme.system.tir) ? ' mêlée' : ''
-      case 'deuxmains': return (arme.system.unemain) ? ' 2 mains' : (arme.system.lancer || arme.system.tir) ? ' mêlée' : ''
-      case 'lancer': return (arme.system.unemain || arme.system.deuxmains || arme.system.tir) ? ' jet' : ''
-      case 'tir': return (arme.system.unemain || arme.system.deuxmains || arme.system.lancer) ? ' tir' : ''
-    }
-    return ''
-  }
-
-  static calculBaseInit(actor, categorie) {
-    const mapping = MAPPING_BASE.find(it => it.column == categorie)
-    if (mapping) {
-      switch (categorie) {
-        case 'melee':
-        case 'tir':
-        case 'lancer':
-          const caracteristique = Number(actor.system.carac[categorie].value)
-          return Math.floor(caracteristique / 2)
-      }
-    }
-    return 0
-  }
-
-  static prepareArmure(actor) {
-    const armures = actor.itemTypes[ITEM_TYPES.armure].filter(it => it.system.equipe)
-    if (armures.length > 1) {
-      console.warn(`${actor.name} a équipé ${armures.length} armures, seule la première sera considérée`)
-    }
-    if (armures.length > 0) {
-      const armure = armures[0]
-      return {
-        name: armure.name,
-        protection: armure.system.protection,
-        malus: armure.system.malus ?? 0
-      }
-    }
-    return {
-      name: '',
-      protection: actor.system.attributs.protection.value,
-      malus: 0
-    }
-  }
-
-  static prepareEsquive(actor) {
-    const esquives = actor.getCompetences("Esquive")
-    if (esquives.length > 0) {
-      const esquive = esquives[0]
-      return {
-        name: esquive.name,
-        niveau: esquive.system.niveau,
-        competence: esquive
-      }
-    }
-    return undefined
-  }
-
-  static prepareSorts(actor) {
-    const codeVoies = Mapping.getCompetencesCategorie(actor, CATEGORIES_DRACONIC)
-      .map(it => RdDItemSort.getCodeVoie(it.name))
-
-    return actor.itemTypes[ITEM_TYPES.sort].map(it => Mapping.prepareSort(it, codeVoies))
-      .sort(Misc.ascending(it => `${it.voie} : ${it.description}`))
-  }
-
-  static prepareSort(sort, voies) {
-    return {
-      voie: RdDItemSort.getCode(sort, voies),
-      description: Mapping.descriptionSort(sort),
-      bonus: Mapping.bonusCase(sort)
-    }
-  }
-
-  static descriptionSort(sort) {
-    const ptSeuil = Array(sort.system.coutseuil).map(it => '*')
-    const caseTMR = sort.system.caseTMRspeciale.length > 0 ? Mapping.toVar(sort.system.caseTMRspeciale) : Misc.upperFirst(TMRType[sort.system.caseTMR].name)
-    const coutReve =RdDItemSort.coutReve(sort)
-    const diff = RdDItemSort.diffReve(sort)
-    return `${sort.name}${ptSeuil} (${caseTMR}) ${diff} ${coutReve}`
-  }
-  static toVar(caseSpeciale) {
-    return Grammar.toLowerCaseNoAccent(caseSpeciale).startsWith('var') ? 'var' : caseSpeciale
-  }
-
-  static bonusCase(sort) {
-    const list = RdDItemSort.stringToBonuscases(sort.system.bonuscase).sort(Misc.descending(it => it.bonus))
-    if (list.length > 0) {
-      const bonus = list[0]
-      return `+${bonus.bonus}% en ${bonus.case}`
-    }
-    return ''
-  }
-
-  static getDescription(actor) {
-    const sexe = actor.system.sexe
-    const sexeFeminin = sexe.length > 0 && sexe.charAt(0).toLowerCase() == 'f' ? 'Née' : 'Né'
-    const race = ['', 'humain'].includes(Grammar.toLowerCaseNoAccent(actor.system.race)) ? '' : (actor.system.race + ' ')
-    const heure = actor.system.heure
-    const hn = `${sexeFeminin} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
-    const age = (actor.system.age && actor.system.age >0) ? `${actor.system.age} ans` : undefined
-    const taille = actor.system.taille
-    const poids = actor.system.poids
-    const cheveux = actor.system.cheveux ? `cheveux ${actor.system.cheveux}` : undefined
-    const yeux = actor.system.yeux ? `yeux ${actor.system.yeux}` : undefined
-    const beaute = actor.system.beaute ? `beauté ${actor.system.beaute}` : undefined
-    const list = [race, hn, age, taille, poids, cheveux, yeux, beaute]
-    return Misc.join(list.filter(it => it), ', ')
-  }
-
-  static getArmure(actor, context) {
-    return context.armure?.name ?? ''
-  }
-
-  static getProtectionArmure(actor, context) {
-    const naturelle = Number(actor.system.attributs.protection.value)
-    if (context?.armure?.protection == undefined) {
-      return naturelle
-    }
-    if (Number.isNumeric(context?.armure?.protection)) {
-      return Number(context?.armure?.protection ?? 0) + naturelle
-    }
-    return context?.armure.protection + (naturelle > 0 ? `+${naturelle}` : '')
-  }
-
-  static getMalusArmure(actor, context) {
-    return context?.armure?.malus ?? 0
-  }
-
-  static getEsquive(context) {
-    if (context.esquive) {
-      return Misc.toSignedString(context.esquive.niveau)
-    }
-    return ''
-  }
-  static getEsquiveArmure(context) {
-    if (context.esquive) {
-      const niveau = context.esquive.niveau + context.armure.malus
-      return Misc.toSignedString(niveau)
-    }
-    return ''
-  }
-
-  static getCompetences(actor, categories) {
-    const competences = Mapping.getCompetencesCategorie(actor, categories)
-    if (competences.length == 0) {
-      return ''
-    }
-    const byCategories = Mapping.competencesByCategoriesByNiveau(competences, categories)
-    const txtByCategories = Object.values(byCategories)
-      .map(it => it.competencesParNiveau)
-      .map(byNiveau => {
-        const niveaux = Object.keys(byNiveau)
-          .map(it => Number(it)).sort(Misc.ascending())
-        if (niveaux.length == 0) {
-          return ''
-        }
-        const txtCategorieByNiveau = niveaux.map(niveau => {
-          const names = Misc.join(byNiveau[niveau].map(it => it.name).sort(Misc.ascending()), ', ')
-          return names + ' ' + Misc.toSignedString(niveau)
-        })
-        const txtCategorie = Misc.join(txtCategorieByNiveau, ' / ')
-        return txtCategorie
-      }).filter(it => it != '')
-
-    return Misc.join(txtByCategories, ' / ')
-  }
-
-  static competencesByCategoriesByNiveau(competences, categories) {
-    return categories.map(c => {
-      return {
-        categorie: c,
-        competencesParNiveau: Misc.classify(
-          competences.filter(comp => comp.system.categorie == c),
-          comp => comp.system.niveau)
-      }
-    })
-  }
-
-  static getArme(actor, context, part, numero) {
-    if (numero < context.armes.length) {
-      return context.armes[numero][part] ?? ''
-    }
-    return ''
-  }
-
-  static getCompetencesCategorie(actor, categories) {
-    return actor.itemTypes[ITEM_TYPES.competence]
-      .filter(it => categories.includes(it.system.categorie))
-      .filter(it => !RdDItemCompetence.isNiveauBase(it))
-  }
-
-  static getSort(actor, context, part, numero) {
-    if (numero < context.sorts.length) {
-      return context.sorts[numero][part]
-    }
-    return ''
-  }
-}
-
--- a/module/actor/random/app-personnage-aleatoire.js
+++ b/module/actor/random/app-personnage-aleatoire.js
@@ -1,188 +0,0 @@
-import { SHOW_DICE } from "../../constants.js";
-import { Misc } from "../../misc.js";
-import { RdDCarac } from "../../rdd-carac.js";
-import { RdDDice } from "../../rdd-dice.js";
-import { RdDNameGen } from "../../rdd-namegen.js";
-import { RdDTimestamp } from "../../time/rdd-timestamp.js";
-
-const PATHS = [
-  'name',
-  'system.sexe',
-  'system.age',
-  'system.taille',
-  'system.poids',
-  'system.main',
-  'system.heure',
-  'system.cheveux',
-  'system.yeux'
-]
-
-const RANDOM_VALUES = {
-  'system.sexe': { 'masculin': 1, 'féminin': 1 },
-  'system.main': { 'droitier': 51, 'gaucher': 15, 'ambidextre': 6 },
-  'system.cheveux': { 'noirs': 2, 'bruns': 5, 'châtains clair': 5, 'blonds': 4, 'blonds très clair': 1, 'roux carotte': 1, 'roux cuivré': 3 },
-  'system.yeux': { 'noirs': 2, 'noisettes': 3, 'bruns vert': 4, 'verts': 3, 'bleus clair': 3, 'bleus gris': 2, 'gris': 1, 'mauves': 1, 'indigos': 1 },
-}
-
-export class AppPersonnageAleatoire extends FormApplication {
-  static preloadHandlebars() {
-    foundry.applications.handlebars.loadTemplates([
-      'systems/foundryvtt-reve-de-dragon/templates/actor/random/champ-aleatoire.hbs',
-    ])
-  }
-
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor/random/app-personnage-aleatoire.hbs",
-      title: "Génération aléatoire",
-      width: 'fit-content',
-      height: 'fit-content',
-      classes: ['app-personnage-aleatoire'],
-      popOut: true,
-      resizable: true
-    }, { inplace: false })
-  }
-
-  constructor(actor) {
-    super({})
-    this.actor = actor
-    this.current = foundry.utils.duplicate(actor)
-    this.checked = {
-      'name': false,
-      'system.sexe': true,
-      'system.age': true,
-      'system.taille': true,
-      'system.poids': true,
-      'system.main': true,
-      'system.heure': true,
-      'system.cheveux': true,
-      'system.yeux': true
-    }
-  }
-
-  async getData(options) {
-    return foundry.utils.mergeObject(await super.getData(options), {
-      actor: this.actor,
-      current: this.current,
-      checked: this.checked,
-      options: { isGM: game.user.isGM }
-    })
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html)
-    this.html = html
-    this.html.find("button.button-cancel").click(async event => await this.close())
-    this.html.find("button.button-apply").click(async event => await this.onApply())
-    this.html.find("input.current-value").change(async event => await this.onChange(event))
-    this.html.find("div.random-field[data-path='system.heure'] select.current-value").change(async event => await this.onChange(event))
-    this.html.find("a.random").click(async event => await this.onRandom(event))
-    this.html.find("a.reset").click(async event => await this.onReset(event))
-    this.html.find("a.randomize-selected").click(async event => await this.onRandomizeSelected())
-    this.html.find("input.check-for-random").click(async event => await this.onCheckForRandom(event))
-  }
-  async _updateObject(event, formData) { }
-
-  async onApply() {
-    const updates = Object.fromEntries(
-      PATHS.filter(path => game.user.isGM || path != 'name')
-        .map(path => [path, this.current[path]])
-    )
-    await this.actor.update(updates)
-    await this.close()
-  }
-
-  getPath(selector) {
-    const fields = this.html.find(selector).parents("div.random-field:first")
-    return fields[0].attributes['data-path'].value
-  }
-
-  async onChange(event) {
-    const path = this.getPath(event.currentTarget)
-    this.current[path] = event.currentTarget.value
-  }
-
-  async onRandom(event) {
-    const path = this.getPath(event.currentTarget)
-    await this.setRandom(path);
-    this.render()
-  }
-
-  async onReset(event) {
-    const path = this.getPath(event.currentTarget)
-    this.current[path] = this.actor[path]
-    await this.render()
-  }
-
-  async onCheckForRandom(event) {
-    const path = this.getPath(event.currentTarget)
-    this.checked[path] = event.currentTarget.checked
-    this.render()
-  }
-
-  async onRandomizeSelected() {
-    const paths = this.html.find("input.check-for-random:checked")
-      .parents("div.random-field")
-      .toArray()
-      .map(it => it.attributes['data-path'].value)
-    await Promise.all(paths.map(path => this.setRandom(path)))
-    this.render()
-  }
-
-  async setRandom(path) {
-    this.current[path] = await this.random(path);
-  }
-
-  async random(path) {
-    switch (path) {
-      case 'name':
-        return await RdDNameGen.generate()
-      case 'system.sexe':
-      case 'system.main':
-      case 'system.cheveux':
-      case 'system.yeux':
-        return await this.randomFromMap(RANDOM_VALUES[path])
-      case 'system.poids':
-        return await this.randomPoids()
-      case 'system.taille':
-        return await this.randomTaille()
-      case 'system.age':
-        return await RdDDice.rollTotal('(2d4kl)*10 + 1d7xo + 2d20kl')
-      case 'system.heure':
-        return RdDTimestamp.defHeure(await RdDDice.rollHeure({ rollMode: "selfroll", showDice: SHOW_DICE })).key
-    }
-    return 'unknown'
-  }
-
-  async randomFromMap(valuesMap) {
-    const max = Object.values(valuesMap).reduce(Misc.sum(), 0)
-    const total = await RdDDice.rollTotal(`1d${max}`)
-    let sum = 0
-    for (let entry of Object.entries(valuesMap)) {
-      sum = sum + entry[1]
-      if (sum >= total) {
-        return entry[0]
-      }
-    }
-    return Object.keys(valuesMap)[0]
-  }
-
-  async randomPoids() {
-    const caracTaille = RdDCarac.getCaracDerivee(this.current.system.carac.taille.value)
-    const range = caracTaille.poidsMax - caracTaille.poidsMin + 1
-    const total = await RdDDice.rollTotal(`1d${range} + ${caracTaille.poidsMin}`)
-    return total + ' kg'
-  }
-
-  async randomTaille() {
-    const caracTaille = RdDCarac.getCaracDerivee(this.current.system.carac.taille.value)
-    const base = this.current.system.carac.taille.value * 2 + 60 + caracTaille.poidsMin
-    const variation = Math.floor((caracTaille.poidsMax - caracTaille.poidsMin + base / 5) / 2)
-    const total = await RdDDice.rollTotal(`2d${variation} + ${base}`)
-    const cm = total % 100
-    const m = (total - cm) / 100
-    return `${m}m${cm}`
-  }
-
-
-}
--- a/module/actor/vehicule-sheet.js
+++ b/module/actor/vehicule-sheet.js
@@ -1,41 +0,0 @@
-import { RdDUtility } from "../rdd-utility.js";
-import { RdDBaseActorSheet } from "./base-actor-sheet.js";
-
-/* -------------------------------------------- */
-export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
-
-  /** @override */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.hbs",
-      width: 640, height: 720,
-    }, { inplace: false })
-  }
-
-  /* -------------------------------------------- */
-  async getData() {
-    let formData = await super.getData();
-    foundry.utils.mergeObject(formData,
-      {
-        editable: this.isEditable,
-        cssClass: this.isEditable ? "editable" : "locked",
-        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
-        limited: this.actor.limited,
-        owner: this.actor.isOwner,
-      });
-
-    this.timerRecherche = undefined;
-    return formData;
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    if (!this.options.editable) return;
-
-    this.html.find('.resistance-moins').click(async event => await this.actor.vehicleIncDec("resistance", -1))
-    this.html.find('.resistance-plus').click(async event => await this.actor.vehicleIncDec("resistance", 1))
-    this.html.find('.structure-moins').click(async event => await this.actor.vehicleIncDec("structure", -1))
-    this.html.find('.structure-plus').click(async event => await this.actor.vehicleIncDec("structure", 1))
-  }
-
-}
--- a/module/actor/vehicule.js
+++ b/module/actor/vehicule.js
@@ -1,28 +0,0 @@
-import { RdDBaseActor } from "./base-actor.js";
-
-export class RdDVehicule extends RdDBaseActor {
-
-  static get defaultIcon() {
-    return "systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp";
-  }
-  isVehicule() { return true }
-
-  canReceive(item) {
-    return item.isInventaire();
-  }
-
-  getEncombrementMax() {
-    return this.system.capacite_encombrement;
-  }
-
-  async vehicleIncDec(name, inc) {
-    if (!['resistance', 'structure'].includes(name)) {
-      return
-    }
-    const newValue = this.system.etat[name].value + inc;
-    if (0 <= newValue && newValue <= this.system.etat[name].max) {
-      await this.update({ [`system.etat.${name}.value`]: newValue })
-    }
-  }
-
-}
--- a/module/applications/sheets/_module.mjs
+++ b/module/applications/sheets/_module.mjs
@@ -1,5 +0,0 @@
-export { default as RdDItemBaseSheet} from "./common-item-sheet.mjs"
-export { default as RdDMonnaieSheet } from "./monnaie-sheet.mjs"
-export { default as RdDMunitionSheet } from "./munition-sheet.mjs"
-export { default as RdDTarotSheet } from "./tarot-sheet.mjs"
-
--- a/module/applications/sheets/common-item-sheet.mjs
+++ b/module/applications/sheets/common-item-sheet.mjs
@@ -1,111 +0,0 @@
-const { HandlebarsApplicationMixin } = foundry.applications.api
-import { SYSTEM_RDD } from "../../constants.js"
-import { Misc } from "../../misc.js"
-import { RdDSheetUtility } from "../../rdd-sheet-utility.js";
-
-
-export default class RdDItemBaseSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
-
-  static preloadHandlebars(...templatesList) {
-    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
-    templatesList.forEach(templates =>
-      templates.forEach(t =>
-        t.handlebars().forEach(h => handlebars.push(h))
-      )
-    )
-    loadTemplates(Misc.distinct(handlebars))
-  }
-
-  static register(sheetClass) {
-    const itemType = sheetClass.ITEM_TYPE
-    Items.registerSheet(SYSTEM_RDD, sheetClass, {
-      label: Misc.typeName('Item', itemType),
-      types: [itemType],
-      makeDefault: true
-    })
-  }
-
-  static registerAll(...sheetClasses) {
-    const handlebars = ["systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"]
-    sheetClasses.forEach(sheetClass => {
-      sheetClass.TEMPLATES.forEach(t =>
-        t.handlebars().forEach(h => handlebars.push(h))
-      )
-      const itemType = sheetClass.ITEM_TYPE
-      foundry.documents.collections.Items.registerSheet(SYSTEM_RDD, sheetClass, {
-        label: Misc.typeName('Item', itemType),
-        types: [itemType],
-        makeDefault: true
-      })
-    })
-    foundry.applications.handlebars.loadTemplates(Misc.distinct(handlebars))
-  }
-
-  static get ITEM_TYPE() { return undefined }
-
-  constructor(options = {}) {
-    super(options)
-  }
-
-  static get TEMPLATES() { return [] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = {
-    classes: ["fvtt-rdd", "item"],
-    position: {
-      width: 448,
-      height: "auto",
-    },
-    form: {
-      submitOnChange: true,
-    },
-    window: {
-      resizable: true,
-    },
-    actions: {
-      editImage: RdDItemBaseSheet.#onEditImage,
-    }
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return {
-      item: this.document,
-      options: RdDSheetUtility.getOptions(this.document, this.isEditable),
-      fields: this.document.schema.fields,
-      systemFields: this.document.system.schema.fields,
-      system: this.document.system,
-      source: this.document.toObject(),
-      isEditable: this.isEditable,
-    }
-  }
-
-  // #region Actions
-
-  /**
-   * Handle changing a Document's image.
-   *
-   * @this RdDItemBaseSheet
-   * @param {PointerEvent} event   The originating click event
-   * @param {HTMLElement} target   The capturing HTML element which defined a [data-action]
-   * @returns {Promise}
-   * @private
-   */
-  static async #onEditImage(event, target) {
-    const attr = target.dataset.edit
-    const current = foundry.utils.getProperty(this.document, attr)
-    const { img } = this.document.constructor.getDefaultArtwork?.(this.document.toObject()) ?? {}
-    const fp = new FilePicker({
-      current,
-      type: "image",
-      redirectToRoot: img ? [img] : [],
-      callback: (path) => {
-        this.document.update({ [attr]: path })
-      },
-      top: this.position.top + 40,
-      left: this.position.left + 10,
-    })
-    return fp.browse()
-  }
-  // #endregion
-}
--- a/module/applications/sheets/monnaie-sheet.mjs
+++ b/module/applications/sheets/monnaie-sheet.mjs
@@ -1,35 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDMonnaieSheet extends RdDItemBaseSheet {
-
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.monnaie }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "monnaie"],
-      position: { width: 448 },
-      window: { contentClasses: ["monnaie-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/monnaie.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.document)
-    )
-  }
-}
--- a/module/applications/sheets/munition-sheet.mjs
+++ b/module/applications/sheets/munition-sheet.mjs
@@ -1,34 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDMunitionSheet extends RdDItemBaseSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.munition }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "munition"],
-      position: { width: 448 },
-      window: { contentClasses: ["munition-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/munition.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document),
-      await TEMPLATE_INVENTAIRE.prepareContext(this.document)
-    )
-  }
-}
--- a/module/applications/sheets/tarot-sheet.mjs
+++ b/module/applications/sheets/tarot-sheet.mjs
@@ -1,33 +0,0 @@
-import { TEMPLATE_DESCRIPTION, TEMPLATE_INVENTAIRE } from "../../common/_module.mjs";
-import { ITEM_TYPES } from "../../constants.js";
-import RdDItemBaseSheet from "./common-item-sheet.mjs";
-
-export default class RdDTarotSheet extends RdDItemBaseSheet {
-  /** @override */
-  static get ITEM_TYPE() { return ITEM_TYPES.tarot }
-  static get TEMPLATES() { return [TEMPLATE_DESCRIPTION] }
-
-  /** @override */
-  static DEFAULT_OPTIONS = Object.assign({},
-    RdDItemBaseSheet.DEFAULT_OPTIONS,
-    {
-      classes: ["fvtt-rdd", "item", "tarot"],
-      position: { width: 448 },
-      window: { contentClasses: ["tarot-content"] }
-    })
-
-  /** @override */
-  static PARTS = {
-    main: {
-      template: "systems/foundryvtt-reve-de-dragon/templates/sheets/item/tarot.hbs",
-    },
-  }
-
-  /** @override */
-  async _prepareContext() {
-    return Object.assign(
-      await super._prepareContext(),
-      await TEMPLATE_DESCRIPTION.prepareContext(this.document)
-    )
-  }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="height: 256px; width: 256px;"><g class="" transform="translate(0,0)" style=""><path d="m214.02 19.115-.02.06a433.415 433.415 0 0 1 106.393 58.446L368.02 158.4C292.254 72.063 181.72 20.678 64.66 20.604c-14.96-.01-30.027.834-45.14 2.535v18.8c108.174-12.774 213.91 21.292 293.527 88.554l42.314 97.416C290.887 132.486 182.425 73.885 66.395 73.21a349.119 349.119 0 0 0-46.879 2.906v18.85c98.998-13.552 196.12 18.532 267.11 82.264l30.708 87.82c-53.922-85.58-148.482-138.656-249.986-139.69a297.451 297.451 0 0 0-47.83 3.398v18.914c93.33-15.18 185.38 18.05 247.677 83.27l20.694 83.917C246.555 230.42 160.67 176.716 67.7 175.423a248.202 248.202 0 0 0-48.182 4.06v19.036c89.513-17.794 178.655 19.16 230.357 89.468l4.62 73.348c-28.973-83.013-107.888-136.692-193.257-135.87a201.938 201.938 0 0 0-41.72 4.78v19.188c77.22-18.904 155.333 13.983 197.095 77.14l5.873 57.49c23.33-6.283 47.534-13.218 68.727-20.873 19.194-6.93 35.884-14.525 46.596-22.038 5.354-3.756 9.142-7.478 11.174-10.574 2.033-3.096 2.47-5.184 2.098-7.59l-1.252-8.123 137.074-39.556C446.897 159.92 363.67 69.964 260.654 19.114H214.02zm278.86 273.922-40.196 11.6c1.63 18.66-4.666 36.567-16.397 52.043-14.18 18.707-35.934 34.627-62.363 48.257-45.23 23.33-104.45 39.877-164.397 47.97l4.38 16.35c68.63-7.66 143.34-22.038 198.17-48.538 30.517-14.75 54.633-33.123 68.722-55.33 12.74-20.084 17.775-43.384 12.08-72.353zm-58.513 16.885-65.027 18.765c-.736 4.345-2.345 8.51-4.733 12.147-3.925 5.98-9.462 10.986-16.068 15.62-13.213 9.266-30.996 17.098-50.978 24.316-31.927 11.53-68.41 20.998-99.558 29.134l6.644 24.79c59.027-7.79 117.64-24.153 160.71-46.366 24.828-12.805 44.388-27.573 56.037-42.94 8.804-11.614 13.283-23.135 12.972-35.466zm-261.754 77.43-33.033 8.85 8.197 30.59c10.812 3.95 18.623 14.38 18.623 26.485 0 6.87-2.52 13.2-6.673 18.114l4.716 17.6 33.034-8.85-24.864-92.788zM138.22 443.79c-1.49 0-2.88.33-4.12.91l-75.6 20.255a30.49 30.49 0 0 1 4.625 16.14c0 .67-.03 1.33-.072 1.987l75.96-20.352c4.96-.386 8.698-4.37 8.698-9.453 0-5.35-4.138-9.488-9.49-9.488zM32.327 468.985c-6.798 0-12.11 5.312-12.11 12.11 0 6.798 5.312 12.11 12.11 12.11 6.798 0 12.111-5.312 12.111-12.11 0-6.798-5.313-12.11-12.11-12.11z" fill="#fff" fill-opacity="1"></path></g></svg>