diff --git a/Hawkmoon/hawkmoon.html b/Hawkmoon/hawkmoon.html
index fe7e139423..5fe392c4c3 100644
--- a/Hawkmoon/hawkmoon.html
+++ b/Hawkmoon/hawkmoon.html
@@ -87,7 +87,7 @@
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_con" type="number" data-i18n-title="con-title" title="Constitution du personnage" /><button class="sheet-text-button" type="roll" name="roll_CON-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{constitution-ab}}} {{ability_value=[[@{con}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{con}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="CON">CON</span></button></label>
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_hgt" type="number" data-i18n-title="hgt-title" title="Taille du personnage" /><button class="sheet-text-button" type="roll" name="roll_HGT-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{height-ab}}} {{ability_value=[[@{hgt}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{hgt}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="HGT">TAI</span></button></label>
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_int" type="number" data-i18n-title="int-title" title="Intelligence du personnage" /><button class="sheet-text-button" type="roll" name="roll_INT-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{intelligence-ab}}} {{ability_value=[[@{int}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{int}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="INT">INT</span></button></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_pow" type="number" data-i18n-title="pow-title" title="Pouvoir du personnage" /><button class="sheet-text-button" type="roll" name="roll_PWO-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{power-ab}}} {{ability_value=[[@{pow}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{pow}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="POW">POU</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_pow" type="number" data-i18n-title="pow-title" title="Pouvoir du personnage" /><button class="sheet-text-button" type="roll" name="roll_POW-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{power-ab}}} {{ability_value=[[@{pow}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{pow}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="POW">POU</span></button></label>
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_dex" type="number" data-i18n-title="dex-title" title="Dextérité du personnage" /><button class="sheet-text-button" type="roll" name="roll_DEX-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{dexterity-ab}}} {{ability_value=[[@{dex}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{dex}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="DEX">DEX</span></button></label>
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_app" type="number" data-i18n-title="app-title" title="Apparence du personnage" /><button class="sheet-text-button" type="roll" name="roll_APP-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{ability_name=^{appearance-ab}}} {{ability_value=[[@{app}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{app}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="APP">APP</span></button></label>
 
@@ -187,7 +187,7 @@
                             <div class="sheet-rTableCell sheet-border-left"><input type="checkbox" name="attr_dodgeCheck" data-i18n-title="upgrade-skill-title" title="Augmentez cette compétence à la montée de niveau" /></div>
                             <div class="sheet-rTableCell"><span data-i18n="dodge">Esquive</span> (DEX x 2%)</div>
                             <div class="sheet-rTableCell"><input name="attr_dodge" type="number" /></div>
-                            <div class="sheet-rTableCell"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{skill_name=^{dodge}}} {{skill_value=[[@{dodge}]]}} {{diceroll=[[1d100cs<[[(ceil(@{riding}/5))]]cf>99]]}}"
+                            <div class="sheet-rTableCell"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{skill_name=^{dodge}}} {{skill_value=[[@{dodge}]]}} {{diceroll=[[1d100cs<[[(ceil(@{dodge}/5))]]cf>99]]}}"
                                     name="roll_dodgeCheck" /></div>
                             <div class="sheet-rTableCell sheet-border-left"><input type="checkbox" name="attr_swimCheck" data-i18n-title="upgrade-skill-title" title="Augmentez cette compétence à la montée de niveau" /></div>
                             <div class="sheet-rTableCell"><span data-i18n="swim">Natation</span> (25%)</div>
@@ -227,7 +227,7 @@
                             <div class="sheet-rTableCell"><span data-i18n="direction">Orientation</span> (10%)</div>
                             <div class="sheet-rTableCell"><input name="attr_direction" type="number" /></div>
                             <div class="sheet-rTableCell"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{skill_name=^{direction}}} {{skill_value=[[@{direction}]]}} {{diceroll=[[1d100cs<[[(ceil(@{direction}/5))]]cf>99]]}}"
-                                    name="roll_orientationCheck" /></div>
+                                    name="roll_directionCheck" /></div>
                         </div>
                         <div class="sheet-rTableRow">
                             <div class="sheet-rTableCell"><input type="checkbox" name="attr_artSpe2Check" data-i18n-title="upgrade-skill-title" title="Augmentez cette compétence à la montée de niveau" /></div>
@@ -370,7 +370,7 @@
                             <div class="sheet-rTableCell"><span data-i18n="stealth">Depl. Silencieux</span> (20%)</div>
                             <div class="sheet-rTableCell"><input name="attr_stealth" type="number" /></div>
                             <div class="sheet-rTableCell"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{skill_name=^{stealth}}} {{skill_value=[[@{stealth}]]}} {{diceroll=[[1d100cs<[[(ceil(@{stealth}/5))]]cf>99]]}}"
-                                    name="roll_quietMoveCheck" /></div>
+                                    name="roll_stealthCheck" /></div>
                             <div class="sheet-rTableCell sheet-border-left"><input type="checkbox" name="attr_motherTongueCheck" data-i18n-title="upgrade-skill-title" title="Augmentez cette compétence à la montée de niveau" /></div>
                             <div class="sheet-rTableCell"><span data-i18n="mother-tongue">Langue Matern.</span> (INT x 5%)</div>
                             <div class="sheet-rTableCell"><input name="attr_motherTongue" type="number" /></div>
@@ -903,12 +903,12 @@
                                 <span class="sheet-nontable-name" data-i18n="mount-abilities-desc">Caractéristiques</span>
 
                                 <label class="sheet-small-label2" style="width: 14%;"><span data-i18n="abilities">Caractéristiques :</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountStr" type="number" data-i18n-title="mount-str-title" title="Force de la monture" /><span data-i18n="STR">FOR</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountCon" type="number" data-i18n-title="mount-con-title" title="Constitution de la monture" /><span data-i18n="CON">CON</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountHgt" type="number" data-i18n-title="mount-hgt-title" title="Taille de la monture" /><span data-i18n="HGT">TAI</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountInt" type="number" data-i18n-title="mount-int-title" title="Intelligence de la monture" /><span data-i18n="INT">INT</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountPow" type="number" data-i18n-title="mount-pow-title" title="Pouvoir de la monture" /><span data-i18n="POW">POU</span></label>
-                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountDex" type="number" data-i18n-title="mount-dex-title" title="Dextérité de la monture" /><span data-i18n="DEX">DEX</span></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountStr" type="number" data-i18n-title="mount-str-title" title="Force de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-STR-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{strength-ab}}} {{ability_value=[[@{mountStr}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountStr}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="STR">FOR</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountCon" type="number" data-i18n-title="mount-con-title" title="Constitution de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-CON-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{constitution-ab}}} {{ability_value=[[@{mountCon}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountCon}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="CON">CON</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountHgt" type="number" data-i18n-title="mount-hgt-title" title="Taille de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-HGT-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{height-ab}}} {{ability_value=[[@{mountHgt}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountHgt}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="HGT">TAI</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountInt" type="number" data-i18n-title="mount-int-title" title="Intelligence de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-INT-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{intelligence-ab}}} {{ability_value=[[@{mountInt}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountInt}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="INT">INT</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountPow" type="number" data-i18n-title="mount-pow-title" title="Pouvoir de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-POW-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{power-ab}}} {{ability_value=[[@{mountPow}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountPow}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="POW">POU</span></button></label>
+                                <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountDex" type="number" data-i18n-title="mount-dex-title" title="Dextérité de la monture" /><button class="sheet-text-button" type="roll" name="roll_MNT-DEX-Check" value="@{PC-whisper} &{template:hm_ability} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{ability_name=^{dexterity-ab}}} {{ability_value=[[@{mountDex}*?{Multiplicateur|1}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountDex}/5))]]cf>99]]}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="DEX">DEX</span></button></label>
                                 <label class="sheet-small-label2" style="width: 9%;"><input name="attr_mountMov" type="number" data-i18n-title="mount-mov-title" title="Déplacement de la monture" /><span data-i18n="MOV">DEP</span></label>
 
                                 <!-- Health Points -->
@@ -918,7 +918,7 @@
                                 <label class="sheet-small-label2" style="width: 7%;"><input name="attr_mountHp_max" type="number" disable="true" data-i18n-title="mount-hp-max-title" title="Points de vie max de la monture" /><span data-i18n="max">Max</span></label>
 
                                 <label class="sheet-small-label2" style="width: 5%;"></label>
-                                <label class="sheet-small-label2" style="width: 13%;"><input name="attr_mountArmor" type="number" data-i18n-title="mount-armor-title" title="Armure de la monture" /><span data-i18n="armor">Armure</span></label>
+                                <label class="sheet-small-label2" style="width: 13%;"><input name="attr_mountArmor" type="text" data-i18n-title="mount-armor-title" title="Armure de la monture" /><button class="sheet-text-button" type="roll" name="roll_APP-Check" value="@{PC-whisper} &{template:hm_macro} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{macro_name=^{mount-armor-title}}} {{diceroll=@{mountArmor}}}">&nbsp;<span style="vertical-align: text-bottom; color: white;" data-i18n="armor">Armure</span></button></label>
 
                                 <label class="sheet-small-label2" style="width: 5%;"></label>
 
@@ -931,6 +931,58 @@
                     </div>
                     <br/>
 
+                    <!-- MOUNT WEAPONS -->
+                    <div class="sheet-section">
+                        <div class="sheet-h2-section">
+                            <h2 data-i18n="weapons">Armes</h2>
+                            <label for="attr_weapons-details-show" class="sheet-label-a" data-i18n="weapons-exp">Développer les armes</label>
+                            <input type="checkbox" class="sheet-sect-show" title="Cliquer pour développer" data-i18n-title="showsect-cmd" id="attr_weapons-details-show" name="attr_weapons-details-show" value="1" style="width: 12em;margin: -0.5em -1em 0 -11em;" checked="checked"
+                            /><span></span>
+                            <div class="sheet-nontable sheet-sect">
+                                <div class="sheet-divbox sheet-repeating-sect">
+                                    <div class="sheet-header sheet-text-center" style="width:100%;"><span data-i18n="weapons">Armes</span></div>
+                                    <br/>
+                                    <div class="sheet-repeating-fields">
+                                        <fieldset class="repeating_mountWeapons">
+                                            <div style="border-spacing:2px; border-collapse:separate; margin:2px;">
+
+                                                <input type="checkbox" class="sheet-counted sheet-sect-show" data-i18n-title="minimize-cmd" title="Minimize Row" name="attr_row-show" value="1" checked="checked" /><span></span>
+                                                <span class="sheet-repeating-rollbutton sheet-small-label2"><button type="roll" value="@{PC-whisper} &{template:hm_weapons} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{weapon_name=@{mountWeaponName}}} {{weapon_value=[[@{mountWeaponPercent}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountWeaponPercent}/5))]]cf>99]]}} {{diceroll_damage=[[@{mountWeaponDamage} + @{mountWeaponDamageMod}]]}} {{weapon_impale=@{mountWeaponImpale}}} {{weapon_counter=@{mountWeaponCounter}}}" name="roll_mountWeaponCheck"><span data-i18n="attack"></span></button>
+                                                </span>
+
+                                                <span class="sheet-small-label2 sheet-sect" style="width:2.125em;"><input type="checkbox" name="attr_mountWeaponCheck" data-i18n-title="upgrade-skill-title" data-i18n-title="upgrade-skill-title" title="Augmentez cette compétence à la montée de niveau" /></span>
+                                                <span class="sheet-small-label2 sheet-entry-25p-shrink"><input type="text" name="attr_mountWeaponName" data-i18n-placeholder="melee-weapon-name-place" placeholder="Nom de l'arme" /><span data-i18n="name">Nom</span></span>
+                                                <span class="sheet-small-label2 sheet-entry-vvshort"><input name="attr_mountWeaponPercent" type="number" data-i18n-title="melee-weapon-percent-title" title="Niveau l'arme" /><span data-i18n="percent-abbrv">%</span></span>
+                                                <span class="sheet-small-label2 sheet-entry-vshort"><input name="attr_mountWeaponDamage" data-i18n-placeholder="melee-weapon-damage-place" placeholder="ex: 1d6+2" type="text" /><span data-i18n="weapon-damage">Dégâts</span></span>
+                                                <span class="sheet-small-label2 sheet-entry-short"><select name="attr_mountWeaponDamageMod">
+													<option value="" selected></option>
+													<option value="@{mountMod_damage}" >+ MD</option>
+													<option value="ceil(@{mountMod_damage}/2)" >+ 1/2 MD</option>
+													<option value="@{mountMod_damage}*2" >+ 2 MD</option>
+												</select><span data-i18n="weapon-damage-mod">Mod. Dégâts</span></span>
+
+                                                <span class="sheet-small-label2 sheet-sect sheet-entry-vshort"><input name="attr_mountWeaponStructure" data-i18n-title="melee-weapon-structure-title" title="Structure de l'arme" type="number" /><span data-i18n="structure">Structure</span></span>
+                                                <span class="sheet-small-label2 sheet-sect sheet-entry-vshort"><input name="attr_mountWeaponLength" data-i18n-title="melee-weapon-length-title" title="Longueur de l'arme" type="text" /><span data-i18n="length">Longueur</span></span>
+                                                <span class="sheet-small-label2 sheet-sect sheet-entry-short"><select name="attr_mountWeaponHand" data-i18n-title="melee-weapon-hand-title" title="Tenue en Main de l'arme">
+													<option value="1" selected>1</option>
+													<option value="2" >2</option>
+												</select><span data-i18n="hand">Main</span></span>
+                                                <span class="sheet-small-label2 sheet-sect sheet-entry-short"><select name="attr_mountWeaponImpale">
+													<option value="0" data-i18n="no" selected>Non</option>
+													<option value="1" data-i18n="yes" >Oui</option>
+												</select><span data-i18n="impale">Empale</span></span>
+                                                <span class="sheet-small-label2 sheet-sect sheet-entry-short"><select name="attr_mountWeaponCounter">
+													<option value="0" data-i18n="no" selected>Non</option>
+													<option value="1" data-i18n="yes" >Oui</option>
+												</select><span data-i18n="counter">Pare</span></span>
+
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
 
                     <!-- MOUNT SKILLS -->
                     <div class="sheet-section">
@@ -949,7 +1001,7 @@
                                         <span class="sheet-small-label2" style="width:20%;"><input type="text" name="attr_mountSkillName" data-i18n-placeholder="mount-skill-name-place" placeholder="Nom de la compétence" /><span data-i18n="name">Nom</span></span>
                                         <span class="sheet-small-label2" style="width:5%;"><input type="number" name="attr_mountSkillValue" data-i18n-title="mount-skill-value-title" title="Valeur de la compétence" /><span data-i18n="value">Valeur</span></span>
 
-                                        <span class="sheet-small-label2" style="width:5%;"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{mount_name=@{mount_name}}} {{skill_name=@{mountSkillName}}} {{skill_value=[[@{mountSkillValue}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountSkillValue}/5))]]cf>99]]}}" name="roll_mountSkillCheck" /></span>
+                                        <span class="sheet-small-label2" style="width:5%;"><button type="roll" value="@{PC-whisper} &{template:hm_skill} {{character_name=@{character_name} (^{mount})}} {{character_id=@{character_id}}} {{mount_name=@{mount_name}}} {{skill_name=@{mountSkillName}}} {{skill_value=[[@{mountSkillValue}]]}} {{diceroll=[[1d100cs<[[(ceil(@{mountSkillValue}/5))]]cf>99]]}}" name="roll_mountSkillCheck" /></span>
 
                                     </fieldset>
                                 </div>
diff --git a/Hawkmoon/translation.json b/Hawkmoon/translation.json
index 0b6dbe568a..e8dafdacdb 100644
--- a/Hawkmoon/translation.json
+++ b/Hawkmoon/translation.json
@@ -58,7 +58,7 @@
   "currency-desc": "Monnaies",
   "currency-desc-exp": "Développer les Monnaies",
   "current": "Actuel",
-  "damage": "Dégats",
+  "damage": "Dgt.",
   "damage+push": "Dgt.+Rep.",
   "damage-mod": "Mod. Dégâts",
   "damages": "Dégâts",
@@ -159,6 +159,7 @@
   "misc-title": "Divers",
   "mod-damage-title": "Modificateur de dégâts du personnage",
   "mother-tongue": "Langue Matern.",
+  "mount": "Monture",
   "mount-abilities-desc": "Caractéristiques",
   "mount-abilities-desc-exp": "Développer les Caractéristiques",
   "mount-armor-title": "Armure de la monture",
@@ -310,9 +311,11 @@
   "weapon": "Arme",
   "weapon-damage": "Dégâts",
   "weapon-damage-mod": "Mod. Dégâts",
+  "weapons": "Armes",
+  "weapons-exp": "Développer les armes",
   "whisper-to-gm": "Pour le MJ",
   "without-helmet": "Sans Heaume",
   "without-helmet-absorption-title": "Absorption sans heaume",
   "without-helmet-affect-title": "% Affect sans heaume",
   "yes": "Oui"
-}
\ No newline at end of file
+}