diff --git a/D&D_5e_Shaped/precompiled/components/actions/actions.html b/D&D_5e_Shaped/precompiled/components/actions/actions.html
index 056387f43d..514af5f4f6 100644
--- a/D&D_5e_Shaped/precompiled/components/actions/actions.html
+++ b/D&D_5e_Shaped/precompiled/components/actions/actions.html
@@ -1,326 +1,328 @@
-<div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
-  <div class="sheet-col-15 sheet-center sheet-vert-top sheet-pad-r-sm">
-    <input class="sheet-action-name sheet-center" type="text" placeholder="name" name="attr_repeating_{{action_type}}actions_{{num}}_name">
-  </div>
-  <div class="sheet-col sheet-center sheet-vert-middle">
-    <span class="sheet-en">
-      <select name="attr_repeating_{{action_type}}actions_{{num}}_type">
-        <option value="Melee">Melee</option>
-        <option value="Ranged">Ranged</option>
-        <option value="Thrown">Thrown</option>
-        <option value="Area">Area</option>
-        <option value="Cone">Cone</option>
-        <option value="Line">Line</option>
-      </select>
-    </span>
-    <span class="sheet-de">
-      <select name="attr_repeating_{{action_type}}actions_{{num}}_type">
-        <option value="Melee">Melee</option>
-        <option value="Ranged">Ranged</option>
-        <option value="Thrown">Thrown</option>
-        <option value="Area">Area</option>
-        <option value="Cone">Cone</option>
-        <option value="Line">Line</option>
-      </select>
-    </span>
-    <span class="sheet-fr">
-      <select name="attr_repeating_{{action_type}}actions_{{num}}_type">
-        <option value="Melee">Mêlée</option>
-        <option value="Ranged">Tir</option>
-        <option value="Thrown">Lancé</option>
-        <option value="Area">Zone</option>
-        <option value="Cone">Cône</option>
-        <option value="Line">Ligne</option>
-      </select>
-    </span>
-    <span class="sheet-ru">
-      <select name="attr_repeating_{{action_type}}actions_{{num}}_type">
-        <option value="Melee">Ближнее</option>
-        <option value="Ranged">Дальнее</option>
-        <option value="Thrown">Метател</option>
-        <option value="Area">Область</option>
-        <option value="Cone">Конус</option>
-        <option value="Line">Линия</option>
-      </select>
-    </span>
-    <div class="sheet-small-label">Type</div>
-  </div>
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_emote" value="{{emote=@{repeating_{{action_type}}actions_{{num}}_emote}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_attack" value="{{attack=[[d20cs>@{repeating_{{action_type}}actions_{{num}}_crit_range}@{d20_mod} + @{repeating_{{action_type}}actions_{{num}}_tohit} + (@{global_weapon_attack_bonus})]]}} {{attackadv=[[d20cs>@{repeating_{{action_type}}actions_{{num}}_crit_range}@{d20_mod} + @{repeating_{{action_type}}actions_{{num}}_tohit} + (@{global_weapon_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_details" value="{{target=@{repeating_{{action_type}}actions_{{num}}_target}}} {{reach=@{repeating_{{action_type}}actions_{{num}}_reach}}} {{range=@{repeating_{{action_type}}actions_{{num}}_range}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_reach" value="{{reach=@{repeating_{{action_type}}actions_{{num}}_reach}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_range" value="{{range=@{repeating_{{action_type}}actions_{{num}}_range}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_target" value="{{target=@{repeating_{{action_type}}actions_{{num}}_target}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_damage" value="{{action_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_dmg} + (@{global_weapon_damage_bonus})]]}} {{action_damage_type=@{repeating_{{action_type}}actions_{{num}}_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_alt_dmg} + (@{global_weapon_damage_bonus})]]}} {{action_alt_damage_reason=@{repeating_{{action_type}}actions_{{num}}_alt_dmg_reason}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_second_damage" value="{{action_second_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_second_dmg} + (@{global_weapon_damage_bonus})]]}} {{action_second_damage_type=@{repeating_{{action_type}}actions_{{num}}_second_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_crit_dmg}]]}} {{action_alt_crit_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_alt_crit_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_second_crit_dmg}]]}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_save" value="{{save_dc=[[@{repeating_{{action_type}}actions_{{num}}_save_dc}]]}} {{action_save_stat=@{repeating_{{action_type}}actions_{{num}}_save_stat}}} {{save_success=@{repeating_{{action_type}}actions_{{num}}_save_success}}} {{targetName=@{attacks_vs_target_name}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_save_damage" value="{{save_damage=[[0d0 + @{repeating_{{action_type}}actions_{{num}}_save_dmg} + (@{global_weapon_damage_bonus})]]}} {{save_damage_type=@{repeating_{{action_type}}actions_{{num}}_save_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_effects" value="{{effects=@{repeating_{{action_type}}actions_{{num}}_effect}}}">
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_var_recharge" value="{{recharge=@{repeating_{{action_type}}actions_{{num}}_recharge}}}">
-
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_emote" class="sheet-toggle-emote" value="@{repeating_{{action_type}}actions_{{num}}_var_emote}"><span class="sheet-toggle-emote">Emote</span>
-  <input type="hidden" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_details" value="@{repeating_{{action_type}}actions_{{num}}_var_details}">
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_reach" class="sheet-toggle-reach" value="@{repeating_{{action_type}}actions_{{num}}_var_reach}"><span class="sheet-toggle-reach">Reach</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_range" class="sheet-toggle-range" value="@{repeating_{{action_type}}actions_{{num}}_var_range}"><span class="sheet-toggle-range">Range</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_target" class="sheet-toggle-target" value="@{repeating_{{action_type}}actions_{{num}}_var_target}"><span class="sheet-toggle-target">Target</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_attack" class="sheet-toggle-attack" value="@{repeating_{{action_type}}actions_{{num}}_var_attack}"><span class="sheet-toggle-attack">Attack</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_damage" class="sheet-toggle-damage sheet-mar-t-md" value="@{repeating_{{action_type}}actions_{{num}}_var_damage}"><span class="sheet-toggle-damage sheet-mar-t-md">Dmg</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-lg" value="@{repeating_{{action_type}}actions_{{num}}_var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-lg">Alt</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-lg" value="@{repeating_{{action_type}}actions_{{num}}_var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-lg">Secondary</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_crit" class="sheet-toggle-crit sheet-mar-t-lg" value="@{repeating_{{action_type}}actions_{{num}}_var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-lg">Crit</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_save" class="sheet-toggle-save" value="@{repeating_{{action_type}}actions_{{num}}_var_save}"><span class="sheet-toggle-save">Save</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_save_damage" class="sheet-toggle-sv-damage sheet-mar-t-md" value="@{repeating_{{action_type}}actions_{{num}}_var_save_damage}"><span class="sheet-toggle-sv-damage sheet-mar-t-md">Dmg</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_effects" class="sheet-toggle-effects" value="@{repeating_{{action_type}}actions_{{num}}_var_effects}"><span class="sheet-toggle-effects">Effects</span>
-  <input type="checkbox" name="attr_repeating_{{action_type}}actions_{{num}}_toggle_recharge" class="sheet-toggle-recharge" value="@{repeating_{{action_type}}actions_{{num}}_var_recharge}"><span class="sheet-toggle-recharge">Recharge</span>
-
-  <div class="sheet-shaped-row sheet-action-button-group sheet-right">
-    <div class="sheet-col-25 sheet-toggle-recharge sheet-center sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_recharge">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Recharge</span>
-        <span class="sheet-de">Recharge</span>
-        <span class="sheet-fr">Recharge</span>
-        <span class="sheet-ru">Перезарядка</span>
-      </div>
+<fieldset class="repeating_{{action_type}}actions">
+  <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+    <div class="sheet-col-15 sheet-center sheet-vert-top sheet-pad-r-sm">
+      <input class="sheet-action-name sheet-center" type="text" placeholder="name" name="attr_name">
     </div>
     <div class="sheet-col sheet-center sheet-vert-middle">
-      <button type="roll" name="roll_repeating_{{action_type}}actions_{{num}}_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_{{action_type}}actions_{{num}}_name}}} {{action_type=@{repeating_{{action_type}}actions_{{num}}_type}}} @{repeating_{{action_type}}actions_{{num}}_toggle_emote} @{repeating_{{action_type}}actions_{{num}}_toggle_attack} @{repeating_{{action_type}}actions_{{num}}_toggle_crit} @{repeating_{{action_type}}actions_{{num}}_toggle_details} @{repeating_{{action_type}}actions_{{num}}_toggle_reach} @{repeating_{{action_type}}actions_{{num}}_toggle_range} @{repeating_{{action_type}}actions_{{num}}_toggle_target} @{repeating_{{action_type}}actions_{{num}}_toggle_damage} @{repeating_{{action_type}}actions_{{num}}_toggle_alt_damage} @{repeating_{{action_type}}actions_{{num}}_toggle_second_damage} @{repeating_{{action_type}}actions_{{num}}_toggle_save} @{repeating_{{action_type}}actions_{{num}}_toggle_save_damage} @{repeating_{{action_type}}actions_{{num}}_toggle_effects} @{repeating_{{action_type}}actions_{{num}}_toggle_recharge} @{hide_gm_info}">
-        <span>{{action_name}}</span>
-      </button>
-    </div>
-  </div>
-  <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
-    <textarea class="sheet-xs-textarea" name="attr_repeating_{{action_type}}actions_{{num}}_emote"></textarea>
-    <div class="sheet-small-label">
-      <span class="sheet-en">Emote</span>
-      <span class="sheet-de">Emote</span>
-      <span class="sheet-fr">Emote</span>
-      <span class="sheet-ru">Текст</span>
-    </div>
-  </div>
-  <div class="sheet-shaped-row sheet-mar-t-sm">
-    <div class="sheet-col-06 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_{{action_type}}actions_{{num}}_tohit" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">To Hit</span>
-        <span class="sheet-de">To Hit</span>
-        <span class="sheet-fr">Toucher</span>
-        <span class="sheet-ru">Касание</span>
-      </div>
-    </div>
-    <div class="sheet-col-05 sheet-toggle-details sheet-toggle-reach sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_reach">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Reach</span>
-        <span class="sheet-de">Reichw.</span>
-        <span class="sheet-fr">Allonge</span>
-        <span class="sheet-ru">Длина</span>
-      </div>
-    </div>
-    <div class="sheet-col-08 sheet-toggle-details sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_range">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Range</span>
-        <span class="sheet-de">Reichweite</span>
-        <span class="sheet-fr">Portée</span>
-        <span class="sheet-ru">Дальность</span>
-      </div>
-    </div>
-    <div class="sheet-col-10 sheet-toggle-details sheet-toggle-target sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <textarea class="sheet-center sheet-xs-textarea" name="attr_repeating_{{action_type}}actions_{{num}}_target"></textarea>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Target</span>
-        <span class="sheet-de">Target</span>
-        <span class="sheet-fr">Cible</span>
-        <span class="sheet-ru">Цель</span>
-      </div>
-    </div>
-    <div class="sheet-col-08 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg</span>
-        <span class="sheet-de">Scha.</span>
-        <span class="sheet-fr">Dmg</span>
-        <span class="sheet-ru">Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-11 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Type</span>
-        <span class="sheet-de">Scha. Type</span>
-        <span class="sheet-fr">Type Dmg</span>
-        <span class="sheet-ru">Тип Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_alt_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg</span>
-        <span class="sheet-de">Alt Scha.</span>
-        <span class="sheet-fr">Dmg Alt</span>
-        <span class="sheet-ru">Алт Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <textarea class="sheet-xs-textarea sheet-center" name="attr_repeating_{{action_type}}actions_{{num}}_alt_dmg_reason"></textarea>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg Reason</span>
-        <span class="sheet-de">Alt Scha. Reason</span>
-        <span class="sheet-fr">Raison Dmg Alt</span>
-        <span class="sheet-ru">Причина Алт Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_second_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Secondary<br>Dmg</span>
-        <span class="sheet-de">Secondary<br>Scha.</span>
-        <span class="sheet-fr">Dmg<br>Secondaire</span>
-        <span class="sheet-ru">Урон<br>Вторичный</span>
-      </div>
-    </div>
-    <div class="sheet-col-11 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_second_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Secondary<br>Dmg Type</span>
-        <span class="sheet-de">Secondary<br>Scha. Type</span>
-        <span class="sheet-fr">Type Dmg<br>Secondaire</span>
-        <span class="sheet-ru">Тип Урона<br>Вторичный</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_crit_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Crit Dmg</span>
-        <span class="sheet-de">Crit Scha.</span>
-        <span class="sheet-fr">Dmg Crit</span>
-        <span class="sheet-ru">Крит Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-alt-damage sheet-center sheet-vert-top sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_alt_crit_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Crit Dmg</span>
-        <span class="sheet-de">Alt Crit Scha.</span>
-        <span class="sheet-fr">Dmg Crit Alt</span>
-        <span class="sheet-ru">Крит Урон Алт</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_second_crit_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Secondary<br>Crit Dmg</span>
-        <span class="sheet-de">Secondary<br>Crit Scha.</span>
-        <span class="sheet-fr">Dmg Crit<br>Secondaire</span>
-        <span class="sheet-ru">Крит Урон<br>Вторичный</span>
-      </div>
-    </div>
-    <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_{{action_type}}actions_{{num}}_crit_range" value="20" step="1" min="1" max="20">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Crit Range</span>
-        <span class="sheet-de">Crit Range</span>
-        <span class="sheet-fr">Coup Crit</span>
-        <span class="sheet-ru">Крит при</span>
-      </div>
-    </div>
-  </div>
-  <div class="sheet-shaped-row sheet-toggle-save sheet-mar-t-sm">
-    <div class="sheet-col-06 sheet-center sheet-vert-top sheet-pad-r-md">
-      <input class="sheet-center" type="number" name="attr_repeating_{{action_type}}actions_{{num}}_save_dc" value="0" min="0" step="1">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Save DC</span>
-        <span class="sheet-de">Rettung DC</span>
-        <span class="sheet-fr">DD Sauv</span>
-        <span class="sheet-ru">Спасбросок</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-center sheet-vert-top sheet-pad-r-md">
       <span class="sheet-en">
-        <select name="attr_repeating_{{action_type}}actions_{{num}}_save_stat">
-          <option value="Str">Str</option>
-          <option value="Dex">Dex</option>
-          <option value="Con">Con</option>
-          <option value="Int">Int</option>
-          <option value="Wis">Wis</option>
-          <option value="Cha">Cha</option>
+        <select name="attr_type">
+          <option value="Melee">Melee</option>
+          <option value="Ranged">Ranged</option>
+          <option value="Thrown">Thrown</option>
+          <option value="Area">Area</option>
+          <option value="Cone">Cone</option>
+          <option value="Line">Line</option>
         </select>
       </span>
       <span class="sheet-de">
-        <select name="attr_repeating_{{action_type}}actions_{{num}}_save_stat">
-          <option value="Str">Stä</option>
-          <option value="Dex">Ges</option>
-          <option value="Con">Kon</option>
-          <option value="Int">Int</option>
-          <option value="Wis">Wei</option>
-          <option value="Cha">Cha</option>
+        <select name="attr_type">
+          <option value="Melee">Melee</option>
+          <option value="Ranged">Ranged</option>
+          <option value="Thrown">Thrown</option>
+          <option value="Area">Area</option>
+          <option value="Cone">Cone</option>
+          <option value="Line">Line</option>
         </select>
       </span>
       <span class="sheet-fr">
-        <select name="attr_repeating_{{action_type}}actions_{{num}}_save_stat">
-          <option value="Str">For</option>
-          <option value="Dex">Dex</option>
-          <option value="Con">Con</option>
-          <option value="Int">Int</option>
-          <option value="Wis">Sag</option>
-          <option value="Cha">Cha</option>
+        <select name="attr_type">
+          <option value="Melee">Mêlée</option>
+          <option value="Ranged">Tir</option>
+          <option value="Thrown">Lancé</option>
+          <option value="Area">Zone</option>
+          <option value="Cone">Cône</option>
+          <option value="Line">Ligne</option>
         </select>
       </span>
-	    <span class="sheet-ru">
-        <select name="attr_repeating_{{action_type}}actions_{{num}}_save_stat">
-          <option value="Str">Сил</option>
-          <option value="Dex">Лов</option>
-          <option value="Con">Тел</option>
-          <option value="Int">Инт</option>
-          <option value="Wis">Муд</option>
-          <option value="Cha">Хар</option>
+      <span class="sheet-ru">
+        <select name="attr_type">
+          <option value="Melee">Ближнее</option>
+          <option value="Ranged">Дальнее</option>
+          <option value="Thrown">Метател</option>
+          <option value="Area">Область</option>
+          <option value="Cone">Конус</option>
+          <option value="Line">Линия</option>
         </select>
       </span>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Save Stat</span>
-        <span class="sheet-de">Rettungsstatus</span>
-        <span class="sheet-fr">Stat de Sauv</span>
-		    <span class="sheet-ru">Хар-ка Спасброска</span>
+      <div class="sheet-small-label">Type</div>
+    </div>
+    <input type="hidden" name="attr_var_emote" value="{{emote=@{emote}}}">
+    <input type="hidden" name="attr_var_attack" value="{{attack=[[d20cs>@{crit_range}@{d20_mod} + @{tohit} + (@{global_weapon_attack_bonus})]]}} {{attackadv=[[d20cs>@{crit_range}@{d20_mod} + @{tohit} + (@{global_weapon_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
+    <input type="hidden" name="attr_var_details" value="{{target=@{target}}} {{reach=@{reach}}} {{range=@{range}}}">
+    <input type="hidden" name="attr_var_reach" value="{{reach=@{reach}}}">
+    <input type="hidden" name="attr_var_range" value="{{range=@{range}}}">
+    <input type="hidden" name="attr_var_target" value="{{target=@{target}}}">
+    <input type="hidden" name="attr_var_damage" value="{{action_damage=[[0d0 + @{dmg} + (@{global_weapon_damage_bonus})]]}} {{action_damage_type=@{dmg_type}}}">
+    <input type="hidden" name="attr_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{alt_dmg} + (@{global_weapon_damage_bonus})]]}} {{action_alt_damage_reason=@{alt_dmg_reason}}}">
+    <input type="hidden" name="attr_var_second_damage" value="{{action_second_damage=[[0d0 + @{second_dmg} + (@{global_weapon_damage_bonus})]]}} {{action_second_damage_type=@{second_dmg_type}}}">
+    <input type="hidden" name="attr_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{crit_dmg}]]}} {{action_alt_crit_damage=[[0d0 + @{alt_crit_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{second_crit_dmg}]]}}">
+    <input type="hidden" name="attr_var_save" value="{{save_dc=[[@{save_dc}]]}} {{action_save_stat=@{save_stat}}} {{save_success=@{save_success}}} {{targetName=@{attacks_vs_target_name}}}">
+    <input type="hidden" name="attr_var_save_damage" value="{{save_damage=[[0d0 + @{save_dmg} + (@{global_weapon_damage_bonus})]]}} {{save_damage_type=@{save_dmg_type}}}">
+    <input type="hidden" name="attr_var_effects" value="{{effects=@{effect}}}">
+    <input type="hidden" name="attr_var_recharge" value="{{recharge=@{recharge}}}">
+
+    <input type="checkbox" name="attr_toggle_emote" class="sheet-toggle-emote" value="@{var_emote}"><span class="sheet-toggle-emote">Emote</span>
+    <input type="hidden" name="attr_toggle_details" value="@{var_details}">
+    <input type="checkbox" name="attr_toggle_reach" class="sheet-toggle-reach" value="@{var_reach}"><span class="sheet-toggle-reach">Reach</span>
+    <input type="checkbox" name="attr_toggle_range" class="sheet-toggle-range" value="@{var_range}"><span class="sheet-toggle-range">Range</span>
+    <input type="checkbox" name="attr_toggle_target" class="sheet-toggle-target" value="@{var_target}"><span class="sheet-toggle-target">Target</span>
+    <input type="checkbox" name="attr_toggle_attack" class="sheet-toggle-attack" value="@{var_attack}"><span class="sheet-toggle-attack">Attack</span>
+    <input type="checkbox" name="attr_toggle_damage" class="sheet-toggle-damage sheet-mar-t-md" value="@{var_damage}"><span class="sheet-toggle-damage sheet-mar-t-md">Dmg</span>
+    <input type="checkbox" name="attr_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-lg" value="@{var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-lg">Alt</span>
+    <input type="checkbox" name="attr_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-lg" value="@{var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-lg">Secondary</span>
+    <input type="checkbox" name="attr_toggle_crit" class="sheet-toggle-crit sheet-mar-t-lg" value="@{var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-lg">Crit</span>
+    <input type="checkbox" name="attr_toggle_save" class="sheet-toggle-save" value="@{var_save}"><span class="sheet-toggle-save">Save</span>
+    <input type="checkbox" name="attr_toggle_save_damage" class="sheet-toggle-sv-damage sheet-mar-t-md" value="@{var_save_damage}"><span class="sheet-toggle-sv-damage sheet-mar-t-md">Dmg</span>
+    <input type="checkbox" name="attr_toggle_effects" class="sheet-toggle-effects" value="@{var_effects}"><span class="sheet-toggle-effects">Effects</span>
+    <input type="checkbox" name="attr_toggle_recharge" class="sheet-toggle-recharge" value="@{var_recharge}"><span class="sheet-toggle-recharge">Recharge</span>
+
+    <div class="sheet-shaped-row sheet-action-button-group sheet-right">
+      <div class="sheet-col-25 sheet-toggle-recharge sheet-center sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_recharge">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Recharge</span>
+          <span class="sheet-de">Recharge</span>
+          <span class="sheet-fr">Recharge</span>
+          <span class="sheet-ru">Перезарядка</span>
+        </div>
+      </div>
+      <div class="sheet-col sheet-center sheet-vert-middle">
+        <button type="roll" name="roll_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{action_type=@{type}}} @{toggle_emote} @{toggle_attack} @{toggle_crit} @{toggle_details} @{toggle_reach} @{toggle_range} @{toggle_target} @{toggle_damage} @{toggle_alt_damage} @{toggle_second_damage} @{toggle_save} @{toggle_save_damage} @{toggle_effects} @{toggle_recharge} @{hide_gm_info}">
+          <span>{{action_name}}</span>
+        </button>
       </div>
     </div>
-    <div class="sheet-col-08 sheet-toggle-sv-damage sheet-center sheet-vert-top sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_save_dmg" value="0">
+    <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
+      <textarea class="sheet-xs-textarea" name="attr_emote"></textarea>
       <div class="sheet-small-label">
-        <span class="sheet-en">Save Dmg</span>
-        <span class="sheet-de">Save Dmg</span>
-        <span class="sheet-fr">Dmg Sauv</span>
-		    <span class="sheet-ru">СБ Урон</span>
+        <span class="sheet-en">Emote</span>
+        <span class="sheet-de">Emote</span>
+        <span class="sheet-fr">Emote</span>
+        <span class="sheet-ru">Текст</span>
       </div>
     </div>
-    <div class="sheet-col-11 sheet-toggle-sv-damage sheet-center sheet-vert-top sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_{{action_type}}actions_{{num}}_save_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Save Dmg Type</span>
-        <span class="sheet-de">Save Dmg Type</span>
-        <span class="sheet-fr">Type Dmg Sauv</span>
-		    <span class="sheet-ru">Тип урона СБ</span>
+    <div class="sheet-shaped-row sheet-mar-t-sm">
+      <div class="sheet-col-06 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_tohit" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">To Hit</span>
+          <span class="sheet-de">To Hit</span>
+          <span class="sheet-fr">Toucher</span>
+          <span class="sheet-ru">Касание</span>
+        </div>
+      </div>
+      <div class="sheet-col-05 sheet-toggle-details sheet-toggle-reach sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_reach">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Reach</span>
+          <span class="sheet-de">Reichw.</span>
+          <span class="sheet-fr">Allonge</span>
+          <span class="sheet-ru">Длина</span>
+        </div>
+      </div>
+      <div class="sheet-col-08 sheet-toggle-details sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_range">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Range</span>
+          <span class="sheet-de">Reichweite</span>
+          <span class="sheet-fr">Portée</span>
+          <span class="sheet-ru">Дальность</span>
+        </div>
+      </div>
+      <div class="sheet-col-10 sheet-toggle-details sheet-toggle-target sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <textarea class="sheet-center sheet-xs-textarea" name="attr_target"></textarea>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Target</span>
+          <span class="sheet-de">Target</span>
+          <span class="sheet-fr">Cible</span>
+          <span class="sheet-ru">Цель</span>
+        </div>
+      </div>
+      <div class="sheet-col-08 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg</span>
+          <span class="sheet-de">Scha.</span>
+          <span class="sheet-fr">Dmg</span>
+          <span class="sheet-ru">Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-11 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Type</span>
+          <span class="sheet-de">Scha. Type</span>
+          <span class="sheet-fr">Type Dmg</span>
+          <span class="sheet-ru">Тип Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_alt_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg</span>
+          <span class="sheet-de">Alt Scha.</span>
+          <span class="sheet-fr">Dmg Alt</span>
+          <span class="sheet-ru">Алт Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <textarea class="sheet-xs-textarea sheet-center" name="attr_alt_dmg_reason"></textarea>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg Reason</span>
+          <span class="sheet-de">Alt Scha. Reason</span>
+          <span class="sheet-fr">Raison Dmg Alt</span>
+          <span class="sheet-ru">Причина Алт Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_second_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Secondary<br>Dmg</span>
+          <span class="sheet-de">Secondary<br>Scha.</span>
+          <span class="sheet-fr">Dmg<br>Secondaire</span>
+          <span class="sheet-ru">Урон<br>Вторичный</span>
+        </div>
+      </div>
+      <div class="sheet-col-11 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Secondary<br>Dmg Type</span>
+          <span class="sheet-de">Secondary<br>Scha. Type</span>
+          <span class="sheet-fr">Type Dmg<br>Secondaire</span>
+          <span class="sheet-ru">Тип Урона<br>Вторичный</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_crit_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Crit Dmg</span>
+          <span class="sheet-de">Crit Scha.</span>
+          <span class="sheet-fr">Dmg Crit</span>
+          <span class="sheet-ru">Крит Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-alt-damage sheet-center sheet-vert-top sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_alt_crit_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Crit Dmg</span>
+          <span class="sheet-de">Alt Crit Scha.</span>
+          <span class="sheet-fr">Dmg Crit Alt</span>
+          <span class="sheet-ru">Крит Урон Алт</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_second_crit_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Secondary<br>Crit Dmg</span>
+          <span class="sheet-de">Secondary<br>Crit Scha.</span>
+          <span class="sheet-fr">Dmg Crit<br>Secondaire</span>
+          <span class="sheet-ru">Крит Урон<br>Вторичный</span>
+        </div>
+      </div>
+      <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_crit_range" value="20" step="1" min="1" max="20">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Crit Range</span>
+          <span class="sheet-de">Crit Range</span>
+          <span class="sheet-fr">Coup Crit</span>
+          <span class="sheet-ru">Крит при</span>
+        </div>
       </div>
     </div>
-    <div class="sheet-col-1-3 sheet-center sheet-vert-top">
-      <textarea class="sheet-xs-textarea sheet-center" name="attr_repeating_{{action_type}}actions_{{num}}_save_success"></textarea>
+    <div class="sheet-shaped-row sheet-toggle-save sheet-mar-t-sm">
+      <div class="sheet-col-06 sheet-center sheet-vert-top sheet-pad-r-md">
+        <input class="sheet-center" type="number" name="attr_save_dc" value="0" min="0" step="1">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Save DC</span>
+          <span class="sheet-de">Rettung DC</span>
+          <span class="sheet-fr">DD Sauv</span>
+          <span class="sheet-ru">Спасбросок</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-center sheet-vert-top sheet-pad-r-md">
+        <span class="sheet-en">
+          <select name="attr_save_stat">
+            <option value="Str">Str</option>
+            <option value="Dex">Dex</option>
+            <option value="Con">Con</option>
+            <option value="Int">Int</option>
+            <option value="Wis">Wis</option>
+            <option value="Cha">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-de">
+          <select name="attr_save_stat">
+            <option value="Str">Stä</option>
+            <option value="Dex">Ges</option>
+            <option value="Con">Kon</option>
+            <option value="Int">Int</option>
+            <option value="Wis">Wei</option>
+            <option value="Cha">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-fr">
+          <select name="attr_save_stat">
+            <option value="Str">For</option>
+            <option value="Dex">Dex</option>
+            <option value="Con">Con</option>
+            <option value="Int">Int</option>
+            <option value="Wis">Sag</option>
+            <option value="Cha">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-ru">
+          <select name="attr_save_stat">
+            <option value="Str">Сил</option>
+            <option value="Dex">Лов</option>
+            <option value="Con">Тел</option>
+            <option value="Int">Инт</option>
+            <option value="Wis">Муд</option>
+            <option value="Cha">Хар</option>
+          </select>
+        </span>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Save Stat</span>
+          <span class="sheet-de">Rettungsstatus</span>
+          <span class="sheet-fr">Stat de Sauv</span>
+          <span class="sheet-ru">Хар-ка Спасброска</span>
+        </div>
+      </div>
+      <div class="sheet-col-08 sheet-toggle-sv-damage sheet-center sheet-vert-top sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_save_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Save Dmg</span>
+          <span class="sheet-de">Save Dmg</span>
+          <span class="sheet-fr">Dmg Sauv</span>
+          <span class="sheet-ru">СБ Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-11 sheet-toggle-sv-damage sheet-center sheet-vert-top sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_save_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Save Dmg Type</span>
+          <span class="sheet-de">Save Dmg Type</span>
+          <span class="sheet-fr">Type Dmg Sauv</span>
+          <span class="sheet-ru">Тип урона СБ</span>
+        </div>
+      </div>
+      <div class="sheet-col-1-3 sheet-center sheet-vert-top">
+        <textarea class="sheet-xs-textarea sheet-center" name="attr_save_success"></textarea>
+        <div class="sheet-small-label">
+          <span class="sheet-en">On a successful save</span>
+          <span class="sheet-de">Bei erfolgreichen Rettungswurf</span>
+          <span class="sheet-fr">En cas de sauvegarde réussie</span>
+          <span class="sheet-ru">При успешном броске</span>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-toggle-effects sheet-center sheet-mar-t-sm">
+      <textarea class="sheet-small-textarea" name="attr_effect"></textarea>
       <div class="sheet-small-label">
-        <span class="sheet-en">On a successful save</span>
-        <span class="sheet-de">Bei erfolgreichen Rettungswurf</span>
-        <span class="sheet-fr">En cas de sauvegarde réussie</span>
-		    <span class="sheet-ru">При успешном броске</span>
+        <span class="sheet-en">Effects</span>
+        <span class="sheet-de">Effekte</span>
+        <span class="sheet-fr">Effets</span>
+        <span class="sheet-ru">Эффекты</span>
       </div>
     </div>
   </div>
-  <div class="sheet-toggle-effects sheet-center sheet-mar-t-sm">
-    <textarea class="sheet-small-textarea" name="attr_repeating_{{action_type}}actions_{{num}}_effect"></textarea>
-    <div class="sheet-small-label">
-      <span class="sheet-en">Effects</span>
-      <span class="sheet-de">Effekte</span>
-      <span class="sheet-fr">Effets</span>
-	    <span class="sheet-ru">Эффекты</span>
-    </div>
-  </div>
-</div>
+</fieldset>
\ No newline at end of file
diff --git a/D&D_5e_Shaped/precompiled/components/weapons/melee.html b/D&D_5e_Shaped/precompiled/components/weapons/melee.html
index 6f21d6878d..1cc0d72aa5 100644
--- a/D&D_5e_Shaped/precompiled/components/weapons/melee.html
+++ b/D&D_5e_Shaped/precompiled/components/weapons/melee.html
@@ -1,313 +1,315 @@
-<div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
-  <div class="sheet-col-20 sheet-center sheet-vert-top">
-    <input class="sheet-weapon-name sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_name" placeholder="name">
-  </div>
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_emote" value="{{emote=@{repeating_weapons_melee_{{num}}_emote}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_attack" value="{{attack=[[d20cs>@{repeating_weapons_melee_{{num}}_crit_range}@{d20_mod} + @{repeating_weapons_melee_{{num}}_to_hit} + (@{global_weapon_attack_bonus}) + (@{global_melee_attack_bonus})]]}} {{attackadv=[[d20cs>@{repeating_weapons_melee_{{num}}_crit_range}@{d20_mod} + @{repeating_weapons_melee_{{num}}_to_hit} + (@{global_weapon_attack_bonus}) + (@{global_melee_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_reach" value="{{reach=@{repeating_weapons_melee_{{num}}_reach}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_range" value="{{range=@{repeating_weapons_melee_{{num}}_range}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_ammo" value="{{ammo=[[@{repeating_weapons_melee_{{num}}_ammo}-@{repeating_weapons_melee_{{num}}_toggle_ammo_auto}]]}} {{ammo_auto=@{repeating_weapons_melee_{{num}}_toggle_ammo_auto}}} {{ammo_field=repeating_weapons_melee_{{num}}_ammo}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_ammo_auto" value="1">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_damage" value="{{action_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_dmg} + @{repeating_weapons_melee_{{num}}_dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_melee_damage_bonus})]]}} {{action_damage_type=@{repeating_weapons_melee_{{num}}_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_alt_dmg} + @{repeating_weapons_melee_{{num}}_dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_melee_damage_bonus})]]}} {{action_alt_damage_reason=@{repeating_weapons_melee_{{num}}_alt_dmg_reason}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_second_damage" value="{{action_second_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_second_dmg} + (@{repeating_weapons_melee_{{num}}_second_dmg_bonus} * @{repeating_weapons_melee_{{num}}_toggle_bonuses})]]}} {{action_second_damage_type=@{repeating_weapons_melee_{{num}}_second_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_dmg} + (@{repeating_weapons_melee_{{num}}_bonus_crit_dmg} * @{repeating_weapons_melee_{{num}}_toggle_bonuses})]]}} {{action_alt_crit_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_alt_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{repeating_weapons_melee_{{num}}_second_dmg}]]}}">
-  <input type="hidden" name="attr_repeating_weapons_melee_{{num}}_var_bonuses" value="1">
+<fieldset class="repeating_weapons_melee">
+  <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+    <div class="sheet-col-20 sheet-center sheet-vert-top">
+      <input class="sheet-weapon-name sheet-center" type="text" name="attr_name" placeholder="name">
+    </div>
+    <input type="hidden" name="attr_var_emote" value="{{emote=@{emote}}}">
+    <input type="hidden" name="attr_var_attack" value="{{attack=[[d20cs>@{crit_range}@{d20_mod} + @{to_hit} + (@{global_weapon_attack_bonus}) + (@{global_melee_attack_bonus})]]}} {{attackadv=[[d20cs>@{crit_range}@{d20_mod} + @{to_hit} + (@{global_weapon_attack_bonus}) + (@{global_melee_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
+    <input type="hidden" name="attr_var_reach" value="{{reach=@{reach}}}">
+    <input type="hidden" name="attr_var_range" value="{{range=@{range}}}">
+    <input type="hidden" name="attr_var_ammo" value="{{ammo=[[@{ammo} - @{toggle_ammo_auto}]]}} {{ammo_auto=@{toggle_ammo_auto}}} {{ammo_field=ammo}}">
+    <input type="hidden" name="attr_var_ammo_auto" value="1">
+    <input type="hidden" name="attr_var_damage" value="{{action_damage=[[0d0 + @{dmg} + @{dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_melee_damage_bonus})]]}} {{action_damage_type=@{dmg_type}}}">
+    <input type="hidden" name="attr_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{alt_dmg} + @{dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_melee_damage_bonus})]]}} {{action_alt_damage_reason=@{alt_dmg_reason}}}">
+    <input type="hidden" name="attr_var_second_damage" value="{{action_second_damage=[[0d0 + @{second_dmg} + (@{second_dmg_bonus} * @{toggle_bonuses})]]}} {{action_second_damage_type=@{second_dmg_type}}}">
+    <input type="hidden" name="attr_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{dmg} + (@{bonus_crit_dmg} * @{toggle_bonuses})]]}} {{action_alt_crit_damage=[[0d0 + @{alt_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{second_dmg}]]}}">
+    <input type="hidden" name="attr_var_bonuses" value="1">
 
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_emote" class="sheet-toggle-emote" value="@{repeating_weapons_melee_{{num}}_var_emote}"><span class="sheet-toggle-emote"><span class="sheet-en">Emote</span><span class="sheet-de">Emote</span><span class="sheet-fr">Emote</span><span class="sheet-ru">Текст</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_attack" class="sheet-toggle-attack" value="@{repeating_weapons_melee_{{num}}_var_attack}"><span class="sheet-toggle-attack"><span class="sheet-en">Attack</span><span class="sheet-de">Angriff</span><span class="sheet-fr">Attaque</span><span class="sheet-ru">Атака</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_reach" class="sheet-toggle-reach" value="@{repeating_weapons_melee_{{num}}_var_reach}"><span class="sheet-toggle-reach"><span class="sheet-en">Reach</span><span class="sheet-de">Reichw</span><span class="sheet-fr">Allonge</span><span class="sheet-ru">Длина</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_range" class="sheet-toggle-range" value="@{repeating_weapons_melee_{{num}}_var_range}"><span class="sheet-toggle-range"><span class="sheet-en">Range</span><span class="sheet-de">Range</span><span class="sheet-fr">Portée</span><span class="sheet-ru">Досяг</span></span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_ammo" class="sheet-toggle-ammo sheet-mar-t-md" value="@{repeating_weapons_melee_{{num}}_var_ammo}"><span class="sheet-toggle-ammo sheet-mar-t-md"><span class="sheet-en">Ammo</span><span class="sheet-de">Ammo</span><span class="sheet-fr">Mun</span><span class="sheet-ru">Боепр</span></span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_ammo_auto" class="sheet-toggle-ammo-auto sheet-mar-t-nine" value="@{repeating_weapons_melee_{{num}}_var_ammo_auto}"><span class="sheet-toggle-ammo-auto sheet-mar-t-nine">Auto</span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_damage" class="sheet-toggle-damage" value="@{repeating_weapons_melee_{{num}}_var_damage}"><span class="sheet-toggle-damage"><span class="sheet-en">Dmg</span><span class="sheet-de">Scha</span><span class="sheet-fr">Dmg</span><span class="sheet-ru">Урон</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-md" value="@{repeating_weapons_melee_{{num}}_var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-md"><span class="sheet-en">Alt</span><span class="sheet-de">Alt</span><span class="sheet-fr">Alt</span><span class="sheet-ru">Алт</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-md" value="@{repeating_weapons_melee_{{num}}_var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-md"><span class="sheet-en">Secondary</span><span class="sheet-de">Secondary</span><span class="sheet-fr">Secondaire</span><span class="sheet-ru">Вторичное</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_crit" class="sheet-toggle-crit sheet-mar-t-md" value="@{repeating_weapons_melee_{{num}}_var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-md"><span class="sheet-en">Crit</span><span class="sheet-de">Crit</span><span class="sheet-fr">Crit</span><span class="sheet-ru">Крит</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_melee_{{num}}_toggle_bonuses" class="sheet-toggle-bonuses" value="@{repeating_weapons_melee_{{num}}_var_bonuses}"><span class="sheet-toggle-bonuses"><span class="sheet-en">Bonuses</span><span class="sheet-de">Boni</span><span class="sheet-fr">Bonus</span><span class="sheet-ru">Бонусы</span></span>
+    <input type="checkbox" name="attr_toggle_emote" class="sheet-toggle-emote" value="@{var_emote}"><span class="sheet-toggle-emote"><span class="sheet-en">Emote</span><span class="sheet-de">Emote</span><span class="sheet-fr">Emote</span><span class="sheet-ru">Текст</span></span>
+    <input type="checkbox" name="attr_toggle_attack" class="sheet-toggle-attack" value="@{var_attack}"><span class="sheet-toggle-attack"><span class="sheet-en">Attack</span><span class="sheet-de">Angriff</span><span class="sheet-fr">Attaque</span><span class="sheet-ru">Атака</span></span>
+    <input type="checkbox" name="attr_toggle_reach" class="sheet-toggle-reach" value="@{var_reach}"><span class="sheet-toggle-reach"><span class="sheet-en">Reach</span><span class="sheet-de">Reichw</span><span class="sheet-fr">Allonge</span><span class="sheet-ru">Длина</span></span>
+    <input type="checkbox" name="attr_toggle_range" class="sheet-toggle-range" value="@{var_range}"><span class="sheet-toggle-range"><span class="sheet-en">Range</span><span class="sheet-de">Range</span><span class="sheet-fr">Portée</span><span class="sheet-ru">Досяг</span></span></span>
+    <input type="checkbox" name="attr_toggle_ammo" class="sheet-toggle-ammo sheet-mar-t-md" value="@{var_ammo}"><span class="sheet-toggle-ammo sheet-mar-t-md"><span class="sheet-en">Ammo</span><span class="sheet-de">Ammo</span><span class="sheet-fr">Mun</span><span class="sheet-ru">Боепр</span></span></span>
+    <input type="checkbox" name="attr_toggle_ammo_auto" class="sheet-toggle-ammo-auto sheet-mar-t-nine" value="@{var_ammo_auto}"><span class="sheet-toggle-ammo-auto sheet-mar-t-nine">Auto</span>
+    <input type="checkbox" name="attr_toggle_damage" class="sheet-toggle-damage" value="@{var_damage}"><span class="sheet-toggle-damage"><span class="sheet-en">Dmg</span><span class="sheet-de">Scha</span><span class="sheet-fr">Dmg</span><span class="sheet-ru">Урон</span></span>
+    <input type="checkbox" name="attr_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-md" value="@{var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-md"><span class="sheet-en">Alt</span><span class="sheet-de">Alt</span><span class="sheet-fr">Alt</span><span class="sheet-ru">Алт</span></span>
+    <input type="checkbox" name="attr_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-md" value="@{var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-md"><span class="sheet-en">Secondary</span><span class="sheet-de">Secondary</span><span class="sheet-fr">Secondaire</span><span class="sheet-ru">Вторичное</span></span>
+    <input type="checkbox" name="attr_toggle_crit" class="sheet-toggle-crit sheet-mar-t-md" value="@{var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-md"><span class="sheet-en">Crit</span><span class="sheet-de">Crit</span><span class="sheet-fr">Crit</span><span class="sheet-ru">Крит</span></span>
+    <input type="checkbox" name="attr_toggle_bonuses" class="sheet-toggle-bonuses" value="@{var_bonuses}"><span class="sheet-toggle-bonuses"><span class="sheet-en">Bonuses</span><span class="sheet-de">Boni</span><span class="sheet-fr">Bonus</span><span class="sheet-ru">Бонусы</span></span>
 
-  <div class="sheet-action-button-group sheet-right">
-    <div class="sheet-shaped-row">
-      <div class="sheet-col sheet-center sheet-vert-middle">
-        <button type="roll" name="roll_repeating_weapons_melee_{{num}}_weapon" value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_weapons_melee_{{num}}_name}}} {{action=1}} {{action_type=Melee}} @{classactionmeleeweapon} @{repeating_weapons_melee_{{num}}_toggle_emote} @{repeating_weapons_melee_{{num}}_toggle_attack} @{repeating_weapons_melee_{{num}}_toggle_crit} @{repeating_weapons_melee_{{num}}_toggle_reach} @{repeating_weapons_melee_{{num}}_toggle_range} @{repeating_weapons_melee_{{num}}_toggle_ammo} @{repeating_weapons_melee_{{num}}_toggle_damage} @{repeating_weapons_melee_{{num}}_toggle_alt_damage} @{repeating_weapons_melee_{{num}}_toggle_second_damage}">
-          <span class="sheet-en">Melee</span>
-          <span class="sheet-de">Nahkampf</span>
-          <span class="sheet-fr">Mêlée</span>
-          <span class="sheet-ru">Рукопашное</span>
-        </button>
+    <div class="sheet-action-button-group sheet-right">
+      <div class="sheet-shaped-row">
+        <div class="sheet-col sheet-center sheet-vert-middle">
+          <button type="roll" name="roll_weapon" value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{action=1}} {{action_type=Melee}} @{classactionmeleeweapon} @{toggle_emote} @{toggle_attack} @{toggle_crit} @{toggle_reach} @{toggle_range} @{toggle_ammo} @{toggle_damage} @{toggle_alt_damage} @{toggle_second_damage}">
+            <span class="sheet-en">Melee</span>
+            <span class="sheet-de">Nahkampf</span>
+            <span class="sheet-fr">Mêlée</span>
+            <span class="sheet-ru">Рукопашное</span>
+          </button>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
-    <textarea class="sheet-xs-textarea" name="attr_repeating_weapons_melee_{{num}}_emote"></textarea>
-    <div class="sheet-small-label">
-      <span class="sheet-en">Emote</span>
-      <span class="sheet-de">Emote</span>
-      <span class="sheet-fr">Emote</span>
-      <span class="sheet-ru">Текст</span>
-    </div>
-  </div>
-  <div class="sheet-shaped-row sheet-mar-t-sm">
-    <div class="sheet-col-03 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-checkbox-row-height" type="checkbox" value="@{PB}" name="attr_repeating_weapons_melee_{{num}}_proficient" checked>
+    <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
+      <textarea class="sheet-xs-textarea" name="attr_emote"></textarea>
       <div class="sheet-small-label">
-        <span class="sheet-en">Prof</span>
-        <span class="sheet-de">Prof</span>
-        <span class="sheet-fr">Maîtr</span>
-        <span class="sheet-ru">Влад</span>
+        <span class="sheet-en">Emote</span>
+        <span class="sheet-de">Emote</span>
+        <span class="sheet-fr">Emote</span>
+        <span class="sheet-ru">Текст</span>
       </div>
     </div>
-    <div class="sheet-col-06 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
-      <span class="sheet-en">
-        <select name="attr_repeating_weapons_melee_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>Str</option>
-          <option value="@{dexterity_mod}">Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wis</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-de">
-        <select name="attr_repeating_weapons_melee_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>Str</option>
-          <option value="@{dexterity_mod}">Ges</option>
-          <option value="@{constitution_mod}">Kon</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wei</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-fr">
-        <select name="attr_repeating_weapons_melee_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>For</option>
-          <option value="@{dexterity_mod}">Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Sag</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-	  <span class="sheet-ru">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Фехтовальное</option>
-          <option value="@{strength_mod}">Сил</option>
-          <option value="@{dexterity_mod}" selected>Лов</option>
-          <option value="@{constitution_mod}">Тел</option>
-          <option value="@{intelligence_mod}">Инт</option>
-          <option value="@{wisdom_mod}">Муд</option>
-          <option value="@{charisma_mod}">Хар</option>
-        </select>
-      </span>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Atk Stat</span>
-        <span class="sheet-de">Scha Stat</span>
-        <span class="sheet-fr">Stat Atq</span>
-        <span class="sheet-ru">Хар Атк</span>
+    <div class="sheet-shaped-row sheet-mar-t-sm">
+      <div class="sheet-col-03 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-checkbox-row-height" type="checkbox" value="@{PB}" name="attr_proficient" checked>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Prof</span>
+          <span class="sheet-de">Prof</span>
+          <span class="sheet-fr">Maîtr</span>
+          <span class="sheet-ru">Влад</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-attack sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_attack_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">+Atk</span>
-        <span class="sheet-de">+Atk</span>
-        <span class="sheet-fr">+Atq</span>
-        <span class="sheet-ru">+Атк</span>
+      <div class="sheet-col-06 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
+        <span class="sheet-en">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>Str</option>
+            <option value="@{dexterity_mod}">Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wis</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-de">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>Str</option>
+            <option value="@{dexterity_mod}">Ges</option>
+            <option value="@{constitution_mod}">Kon</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wei</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-fr">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>For</option>
+            <option value="@{dexterity_mod}">Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Sag</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+      <span class="sheet-ru">
+          <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Фехтовальное</option>
+            <option value="@{strength_mod}">Сил</option>
+            <option value="@{dexterity_mod}" selected>Лов</option>
+            <option value="@{constitution_mod}">Тел</option>
+            <option value="@{intelligence_mod}">Инт</option>
+            <option value="@{wisdom_mod}">Муд</option>
+            <option value="@{charisma_mod}">Хар</option>
+          </select>
+        </span>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Atk Stat</span>
+          <span class="sheet-de">Scha Stat</span>
+          <span class="sheet-fr">Stat Atq</span>
+          <span class="sheet-ru">Хар Атк</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_to_hit" value="@{repeating_weapons_melee_{{num}}_proficient} + @{repeating_weapons_melee_{{num}}_attack_stat} + (@{repeating_weapons_melee_{{num}}_attack_bonus} * @{repeating_weapons_melee_{{num}}_toggle_bonuses})" disabled="disabled">
-      <div class="sheet-small-label">
-        <span class="sheet-en">To Hit</span>
-        <span class="sheet-de">To Hit</span>
-        <span class="sheet-fr">Mod Atq</span>
-        <span class="sheet-ru">Попадение</span>
+      <div class="sheet-col-04 sheet-toggle-attack sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_attack_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">+Atk</span>
+          <span class="sheet-de">+Atk</span>
+          <span class="sheet-fr">+Atq</span>
+          <span class="sheet-ru">+Атк</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-05 sheet-toggle-reach sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_reach">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Reach</span>
-        <span class="sheet-de">Reach</span>
-        <span class="sheet-fr">Allonge</span>
-        <span class="sheet-ru">Длина</span>
+      <div class="sheet-col-04 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_to_hit" value="@{proficient} + @{attack_stat} + (@{attack_bonus} * @{toggle_bonuses})" disabled="disabled">
+        <div class="sheet-small-label">
+          <span class="sheet-en">To Hit</span>
+          <span class="sheet-de">To Hit</span>
+          <span class="sheet-fr">Mod Atq</span>
+          <span class="sheet-ru">Попадение</span>
+        </div>
+      </div>
+      <div class="sheet-col-05 sheet-toggle-reach sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_reach">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Reach</span>
+          <span class="sheet-de">Reach</span>
+          <span class="sheet-fr">Allonge</span>
+          <span class="sheet-ru">Длина</span>
+        </div>
       </div>
-    </div>
 
-    <div class="sheet-col-08 sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_range">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Range</span>
-        <span class="sheet-de">Reichweite</span>
-        <span class="sheet-fr">Portée</span>
-        <span class="sheet-ru">Дальность</span>
+      <div class="sheet-col-08 sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_range">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Range</span>
+          <span class="sheet-de">Reichweite</span>
+          <span class="sheet-fr">Portée</span>
+          <span class="sheet-ru">Дальность</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-range sheet-toggle-ammo sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_ammo" min="0" value="1">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Ammo</span>
-        <span class="sheet-de">Ammo</span>
-        <span class="sheet-fr">Munition</span>
-        <span class="sheet-ru">Боеприпас</span>
+      <div class="sheet-col-07 sheet-toggle-range sheet-toggle-ammo sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_ammo" min="0" value="1">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Ammo</span>
+          <span class="sheet-de">Ammo</span>
+          <span class="sheet-fr">Munition</span>
+          <span class="sheet-ru">Боеприпас</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Dice</span>
-        <span class="sheet-de">Dmg Dice</span>
-        <span class="sheet-fr">Dés de Dmg</span>
-        <span class="sheet-ru">Бросок Урона</span>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Dice</span>
+          <span class="sheet-de">Dmg Dice</span>
+          <span class="sheet-fr">Dés de Dmg</span>
+          <span class="sheet-ru">Бросок Урона</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-left sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_alt_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg</span>
-        <span class="sheet-de">Alt Dmg</span>
-        <span class="sheet-fr">Dmg Alt</span>
-        <span class="sheet-ru">Алт Урон</span>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-left sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_alt_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg</span>
+          <span class="sheet-de">Alt Dmg</span>
+          <span class="sheet-fr">Dmg Alt</span>
+          <span class="sheet-ru">Алт Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <textarea class="sheet-xs-textarea sheet-center" name="attr_repeating_weapons_melee_{{num}}_alt_dmg_reason"></textarea>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg Reason</span>
-        <span class="sheet-de">Alt Dmg Reason</span>
-        <span class="sheet-fr">Raison Dmg Alt</span>
-        <span class="sheet-ru">Причина Алт Урона</span>
+      <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <textarea class="sheet-xs-textarea sheet-center" name="attr_alt_dmg_reason"></textarea>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg Reason</span>
+          <span class="sheet-de">Alt Dmg Reason</span>
+          <span class="sheet-fr">Raison Dmg Alt</span>
+          <span class="sheet-ru">Причина Алт Урона</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-06 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
-      <span class="sheet-en">
-        <select name="attr_repeating_weapons_melee_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">None</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>Str</option>
-          <option value="@{dexterity_mod}">Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wis</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-de">
-        <select name="attr_repeating_weapons_melee_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">Keine</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>Str</option>
-          <option value="@{dexterity_mod}">Ges</option>
-          <option value="@{constitution_mod}">Kon</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wei</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-fr">
-        <select name="attr_repeating_weapons_melee_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">Aucune</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}" selected>For</option>
-          <option value="@{dexterity_mod}">Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Sag</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-	  <span class="sheet-ru">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Фехтовальное</option>
-          <option value="@{strength_mod}">Сил</option>
-          <option value="@{dexterity_mod}" selected>Лов</option>
-          <option value="@{constitution_mod}">Тел</option>
-          <option value="@{intelligence_mod}">Инт</option>
-          <option value="@{wisdom_mod}">Муд</option>
-          <option value="@{charisma_mod}">Хар</option>
-        </select>
-      </span>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Stat</span>
-        <span class="sheet-de">Scha Stat</span>
-        <span class="sheet-fr">Stat Dmg</span>
-        <span class="sheet-ru">Хар Урон</span>
+      <div class="sheet-col-06 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
+        <span class="sheet-en">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">None</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>Str</option>
+            <option value="@{dexterity_mod}">Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wis</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-de">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">Keine</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>Str</option>
+            <option value="@{dexterity_mod}">Ges</option>
+            <option value="@{constitution_mod}">Kon</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wei</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-fr">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">Aucune</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}" selected>For</option>
+            <option value="@{dexterity_mod}">Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Sag</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+      <span class="sheet-ru">
+          <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Фехтовальное</option>
+            <option value="@{strength_mod}">Сил</option>
+            <option value="@{dexterity_mod}" selected>Лов</option>
+            <option value="@{constitution_mod}">Тел</option>
+            <option value="@{intelligence_mod}">Инт</option>
+            <option value="@{wisdom_mod}">Муд</option>
+            <option value="@{charisma_mod}">Хар</option>
+          </select>
+        </span>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Stat</span>
+          <span class="sheet-de">Scha Stat</span>
+          <span class="sheet-fr">Stat Dmg</span>
+          <span class="sheet-ru">Хар Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_dmg_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">+Dmg</span>
-        <span class="sheet-de">+Scha</span>
-        <span class="sheet-fr">+Dmg</span>
-        <span class="sheet-ru">+Урон</span>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_dmg_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">+Dmg</span>
+          <span class="sheet-de">+Scha</span>
+          <span class="sheet-fr">+Dmg</span>
+          <span class="sheet-ru">+Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_dmg_total" value="@{repeating_weapons_melee_{{num}}_dmg_stat} + (@{repeating_weapons_melee_{{num}}_dmg_bonus} * @{repeating_weapons_melee_{{num}}_toggle_bonuses})" disabled="disabled">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Mod</span>
-        <span class="sheet-de">Scha Mod</span>
-        <span class="sheet-fr">Mod Dmg</span>
-        <span class="sheet-ru">Мод Урон</span>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_dmg_total" value="@{dmg_stat} + (@{dmg_bonus} * @{toggle_bonuses})" disabled="disabled">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Mod</span>
+          <span class="sheet-de">Scha Mod</span>
+          <span class="sheet-fr">Mod Dmg</span>
+          <span class="sheet-ru">Мод Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-10 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Type</span>
-        <span class="sheet-de">Dmg Type</span>
-        <span class="sheet-fr">Type Dmg</span>
-        <span class="sheet-ru">Тип Урон</span>
+      <div class="sheet-col-10 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Type</span>
+          <span class="sheet-de">Dmg Type</span>
+          <span class="sheet-fr">Type Dmg</span>
+          <span class="sheet-ru">Тип Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_second_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd Dmg Dice</span>
-        <span class="sheet-de">2te Dmg Dice</span>
-        <span class="sheet-fr">2ème Dés de Dmg</span>
-        <span class="sheet-ru">2ой Бросок урона</span>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd Dmg Dice</span>
+          <span class="sheet-de">2te Dmg Dice</span>
+          <span class="sheet-fr">2ème Dés de Dmg</span>
+          <span class="sheet-ru">2ой Бросок урона</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-second-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_second_dmg_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd +Dmg</span>
-        <span class="sheet-de">2te +Scha</span>
-        <span class="sheet-fr">2ème +Dmg</span>
-        <span class="sheet-ru">2ой +Урон</span>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-second-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_second_dmg_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd +Dmg</span>
+          <span class="sheet-de">2te +Scha</span>
+          <span class="sheet-fr">2ème +Dmg</span>
+          <span class="sheet-ru">2ой +Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-10 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_second_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd Dmg Type</span>
-        <span class="sheet-de">2te Scha Type</span>
-        <span class="sheet-fr">2ème Type Dmg</span>
-        <span class="sheet-ru">2ой Тип Урон</span>
+      <div class="sheet-col-10 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd Dmg Type</span>
+          <span class="sheet-de">2te Scha Type</span>
+          <span class="sheet-fr">2ème Type Dmg</span>
+          <span class="sheet-ru">2ой Тип Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-l-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_melee_{{num}}_bonus_crit_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Bonus Crit Dmg</span>
-        <span class="sheet-de">Bonus Crit Dmg</span>
-        <span class="sheet-fr">Bonus Dmg Crit</span>
-        <span class="sheet-ru">Бонус Крит Урон</span>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-l-sm">
+        <input class="sheet-center" type="text" name="attr_bonus_crit_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Bonus Crit Dmg</span>
+          <span class="sheet-de">Bonus Crit Dmg</span>
+          <span class="sheet-fr">Bonus Dmg Crit</span>
+          <span class="sheet-ru">Бонус Крит Урон</span>
+        </div>
       </div>
-    </div>
-    <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_melee_{{num}}_crit_range" value="20" step="1" min="1" max="20">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Crit Range</span>
-        <span class="sheet-de">Crit Range</span>
-        <span class="sheet-fr">Coup Crit</span>
-        <span class="sheet-ru">Крит при</span>
+      <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm">
+        <input class="sheet-center" type="number" name="attr_crit_range" value="20" step="1" min="1" max="20">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Crit Range</span>
+          <span class="sheet-de">Crit Range</span>
+          <span class="sheet-fr">Coup Crit</span>
+          <span class="sheet-ru">Крит при</span>
+        </div>
       </div>
     </div>
   </div>
-</div>
+</fieldset>
\ No newline at end of file
diff --git a/D&D_5e_Shaped/precompiled/components/weapons/ranged.html b/D&D_5e_Shaped/precompiled/components/weapons/ranged.html
index 18ab006327..bfd08fead0 100644
--- a/D&D_5e_Shaped/precompiled/components/weapons/ranged.html
+++ b/D&D_5e_Shaped/precompiled/components/weapons/ranged.html
@@ -1,302 +1,304 @@
-<div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
-  <div class="sheet-col-20 sheet-center sheet-vert-top">
-    <input class="sheet-weapon-name sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_name" placeholder="name">
-  </div>
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_emote" value="{{emote=@{repeating_weapons_ranged_{{num}}_emote}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_attack" value="{{attack=[[d20cs>@{repeating_weapons_ranged_{{num}}_crit_range}@{d20_mod} + @{repeating_weapons_ranged_{{num}}_to_hit} + (@{global_weapon_attack_bonus}) + (@{global_ranged_attack_bonus})]]}} {{attackadv=[[d20cs>@{repeating_weapons_ranged_{{num}}_crit_range}@{d20_mod} + @{repeating_weapons_ranged_{{num}}_to_hit} + (@{global_weapon_attack_bonus}) + (@{global_ranged_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_range" value="{{range=@{repeating_weapons_ranged_{{num}}_range}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_ammo" value="{{ammo=[[@{repeating_weapons_ranged_{{num}}_ammo}-@{repeating_weapons_ranged_{{num}}_toggle_ammo_auto}]]}} {{ammo_auto=@{repeating_weapons_ranged_{{num}}_toggle_ammo_auto}}} {{ammo_field=repeating_weapons_ranged_{{num}}_ammo}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_ammo_auto" value="1">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_damage" value="{{action_damage=[[0d0 + @{repeating_weapons_ranged_{{num}}_dmg} + @{repeating_weapons_ranged_{{num}}_dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_ranged_damage_bonus})]]}} {{action_damage_type=@{repeating_weapons_ranged_{{num}}_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{repeating_weapons_ranged_{{num}}_alt_dmg} + @{repeating_weapons_ranged_{{num}}_dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_ranged_damage_bonus})]]}} {{action_alt_damage_reason=@{repeating_weapons_ranged_{{num}}_alt_dmg_reason}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_second_damage" value="{{action_second_damage=[[@{repeating_weapons_ranged_{{num}}_second_dmg} + (@{repeating_weapons_ranged_{{num}}_second_dmg_bonus} * @{repeating_weapons_ranged_{{num}}_toggle_bonuses})]]}} {{action_second_damage_type=@{repeating_weapons_ranged_{{num}}_second_dmg_type}}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{repeating_weapons_ranged_{{num}}_dmg} + (@{repeating_weapons_ranged_{{num}}_bonus_crit_dmg} * @{repeating_weapons_ranged_{{num}}_toggle_bonuses}))]]}} {{action_alt_crit_damage=[[0d0 + @{repeating_weapons_ranged_{{num}}_alt_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{repeating_weapons_ranged_{{num}}_second_dmg}]]}}">
-  <input type="hidden" name="attr_repeating_weapons_ranged_{{num}}_var_bonuses" value="1">
+<fieldset class="repeating_weapons_ranged">
+  <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+    <div class="sheet-col-20 sheet-center sheet-vert-top">
+      <input class="sheet-weapon-name sheet-center" type="text" name="attr_name" placeholder="name">
+    </div>
+    <input type="hidden" name="attr_var_emote" value="{{emote=@{emote}}}">
+    <input type="hidden" name="attr_var_attack" value="{{attack=[[d20cs>@{crit_range}@{d20_mod} + @{to_hit} + (@{global_weapon_attack_bonus}) + (@{global_ranged_attack_bonus})]]}} {{attackadv=[[d20cs>@{crit_range}@{d20_mod} + @{to_hit} + (@{global_weapon_attack_bonus}) + (@{global_ranged_attack_bonus})]]}} {{targetAC=@{attacks_vs_target_ac}}} {{targetName=@{attacks_vs_target_name}}}">
+    <input type="hidden" name="attr_var_range" value="{{range=@{range}}}">
+    <input type="hidden" name="attr_var_ammo" value="{{ammo=[[@{ammo}-@{toggle_ammo_auto}]]}} {{ammo_auto=@{toggle_ammo_auto}}} {{ammo_field=ammo}}">
+    <input type="hidden" name="attr_var_ammo_auto" value="1">
+    <input type="hidden" name="attr_var_damage" value="{{action_damage=[[0d0 + @{dmg} + @{dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_ranged_damage_bonus})]]}} {{action_damage_type=@{dmg_type}}}">
+    <input type="hidden" name="attr_var_alt_damage" value="{{action_alt_damage=[[0d0 + @{alt_dmg} + @{dmg_total} + (@{global_weapon_damage_bonus}) + (@{global_ranged_damage_bonus})]]}} {{action_alt_damage_reason=@{alt_dmg_reason}}}">
+    <input type="hidden" name="attr_var_second_damage" value="{{action_second_damage=[[@{second_dmg} + (@{second_dmg_bonus} * @{toggle_bonuses})]]}} {{action_second_damage_type=@{second_dmg_type}}}">
+    <input type="hidden" name="attr_var_crit" value="{{can_crit=1}} {{action_crit_damage=[[0d0 + @{dmg} + (@{bonus_crit_dmg} * @{toggle_bonuses}))]]}} {{action_alt_crit_damage=[[0d0 + @{alt_dmg}]]}} {{action_second_crit_damage=[[0d0 + @{second_dmg}]]}}">
+    <input type="hidden" name="attr_var_bonuses" value="1">
 
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_emote" class="sheet-toggle-emote" value="@{repeating_weapons_ranged_{{num}}_var_emote}"><span class="sheet-toggle-emote"><span class="sheet-en">Emote</span><span class="sheet-de">Emote</span><span class="sheet-fr">Emote</span><span class="sheet-ru">Текст</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_attack" class="sheet-toggle-attack" value="@{repeating_weapons_ranged_{{num}}_var_attack}"><span class="sheet-toggle-attack"><span class="sheet-en">Attack</span><span class="sheet-de">Angriff</span><span class="sheet-fr">Attaque</span><span class="sheet-ru">Атака</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_range" class="sheet-toggle-range" value="@{repeating_weapons_ranged_{{num}}_var_range}"><span class="sheet-toggle-range"><span class="sheet-en">Range</span><span class="sheet-de">Range</span><span class="sheet-fr">Portée</span><span class="sheet-ru">Досяг</span></span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_ammo" class="sheet-toggle-ammo sheet-mar-t-md" value="@{repeating_weapons_ranged_{{num}}_var_ammo}"><span class="sheet-toggle-ammo sheet-mar-t-md"><span class="sheet-en">Ammo</span><span class="sheet-de">Ammo</span><span class="sheet-fr">Mun</span><span class="sheet-ru">Боепр</span></span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_ammo_auto" class="sheet-toggle-ammo-auto sheet-mar-t-nine" value="@{repeating_weapons_ranged_{{num}}_var_ammo_auto}"><span class="sheet-toggle-ammo-auto sheet-mar-t-nine">Auto</span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_damage" class="sheet-toggle-damage" value="@{repeating_weapons_ranged_{{num}}_var_damage}"><span class="sheet-toggle-damage"><span class="sheet-en">Dmg</span><span class="sheet-de">Scha</span><span class="sheet-fr">Dmg</span><span class="sheet-ru">Урон</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-md" value="@{repeating_weapons_ranged_{{num}}_var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-md"><span class="sheet-en">Alt</span><span class="sheet-de">Alt</span><span class="sheet-fr">Alt</span><span class="sheet-ru">Алт</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-md" value="@{repeating_weapons_ranged_{{num}}_var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-md"><span class="sheet-en">Secondary</span><span class="sheet-de">Secondary</span><span class="sheet-fr">Secondaire</span><span class="sheet-ru">Вторичное</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_crit" class="sheet-toggle-crit sheet-mar-t-md" value="@{repeating_weapons_ranged_{{num}}_var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-md"><span class="sheet-en">Crit</span><span class="sheet-de">Crit</span><span class="sheet-fr">Crit</span><span class="sheet-ru">Крит</span></span>
-  <input type="checkbox" name="attr_repeating_weapons_ranged_{{num}}_toggle_bonuses" class="sheet-toggle-bonuses" value="@{repeating_weapons_ranged_{{num}}_var_bonuses}"><span class="sheet-toggle-bonuses"><span class="sheet-en">Bonuses</span><span class="sheet-de">Boni</span><span class="sheet-fr">Bonus</span><span class="sheet-ru">Бонусы</span></span>
+    <input type="checkbox" name="attr_toggle_emote" class="sheet-toggle-emote" value="@{var_emote}"><span class="sheet-toggle-emote"><span class="sheet-en">Emote</span><span class="sheet-de">Emote</span><span class="sheet-fr">Emote</span><span class="sheet-ru">Текст</span></span>
+    <input type="checkbox" name="attr_toggle_attack" class="sheet-toggle-attack" value="@{var_attack}"><span class="sheet-toggle-attack"><span class="sheet-en">Attack</span><span class="sheet-de">Angriff</span><span class="sheet-fr">Attaque</span><span class="sheet-ru">Атака</span></span>
+    <input type="checkbox" name="attr_toggle_range" class="sheet-toggle-range" value="@{var_range}"><span class="sheet-toggle-range"><span class="sheet-en">Range</span><span class="sheet-de">Range</span><span class="sheet-fr">Portée</span><span class="sheet-ru">Досяг</span></span></span>
+    <input type="checkbox" name="attr_toggle_ammo" class="sheet-toggle-ammo sheet-mar-t-md" value="@{var_ammo}"><span class="sheet-toggle-ammo sheet-mar-t-md"><span class="sheet-en">Ammo</span><span class="sheet-de">Ammo</span><span class="sheet-fr">Mun</span><span class="sheet-ru">Боепр</span></span></span>
+    <input type="checkbox" name="attr_toggle_ammo_auto" class="sheet-toggle-ammo-auto sheet-mar-t-nine" value="@{var_ammo_auto}"><span class="sheet-toggle-ammo-auto sheet-mar-t-nine">Auto</span>
+    <input type="checkbox" name="attr_toggle_damage" class="sheet-toggle-damage" value="@{var_damage}"><span class="sheet-toggle-damage"><span class="sheet-en">Dmg</span><span class="sheet-de">Scha</span><span class="sheet-fr">Dmg</span><span class="sheet-ru">Урон</span></span>
+    <input type="checkbox" name="attr_toggle_alt_damage" class="sheet-toggle-alt-damage sheet-mar-t-md" value="@{var_alt_damage}"><span class="sheet-toggle-alt-damage sheet-mar-t-md"><span class="sheet-en">Alt</span><span class="sheet-de">Alt</span><span class="sheet-fr">Alt</span><span class="sheet-ru">Алт</span></span>
+    <input type="checkbox" name="attr_toggle_second_damage" class="sheet-toggle-second-damage sheet-mar-t-md" value="@{var_second_damage}"><span class="sheet-toggle-second-damage sheet-mar-t-md"><span class="sheet-en">Secondary</span><span class="sheet-de">Secondary</span><span class="sheet-fr">Secondaire</span><span class="sheet-ru">Вторичное</span></span>
+    <input type="checkbox" name="attr_toggle_crit" class="sheet-toggle-crit sheet-mar-t-md" value="@{var_crit}" checked><span class="sheet-toggle-crit sheet-mar-t-md"><span class="sheet-en">Crit</span><span class="sheet-de">Crit</span><span class="sheet-fr">Crit</span><span class="sheet-ru">Крит</span></span>
+    <input type="checkbox" name="attr_toggle_bonuses" class="sheet-toggle-bonuses" value="@{var_bonuses}"><span class="sheet-toggle-bonuses"><span class="sheet-en">Bonuses</span><span class="sheet-de">Boni</span><span class="sheet-fr">Bonus</span><span class="sheet-ru">Бонусы</span></span>
 
-  <div class="sheet-action-button-group sheet-right">
-    <div class="sheet-shaped-row">
-      <div class="sheet-col sheet-center sheet-vert-middle">
-        <button type="roll" name="roll_repeating_weapons_ranged_{{num}}_weapon" value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{repeating_weapons_ranged_{{num}}_name}}} {{action=1}} {{action_type=Ranged}} @{classactionrangedweapon} @{repeating_weapons_ranged_{{num}}_toggle_emote} @{repeating_weapons_ranged_{{num}}_toggle_attack} @{repeating_weapons_ranged_{{num}}_toggle_crit} @{repeating_weapons_ranged_{{num}}_toggle_range} @{repeating_weapons_ranged_{{num}}_toggle_ammo} @{repeating_weapons_ranged_{{num}}_toggle_damage} @{repeating_weapons_ranged_{{num}}_toggle_alt_damage} @{repeating_weapons_ranged_{{num}}_toggle_second_damage}">
-          <span class="sheet-en">Ranged</span>
-          <span class="sheet-de">Ranged</span>
-          <span class="sheet-fr">Tir</span>
-          <span class="sheet-ru">Дистанционное</span>
-        </button>
+    <div class="sheet-action-button-group sheet-right">
+      <div class="sheet-shaped-row">
+        <div class="sheet-col sheet-center sheet-vert-middle">
+          <button type="roll" name="roll_weapon" value="@{output_option} &{template:5eDefault} {{attack_roll=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{action=1}} {{action_type=Ranged}} @{classactionrangedweapon} @{toggle_emote} @{toggle_attack} @{toggle_crit} @{toggle_range} @{toggle_ammo} @{toggle_damage} @{toggle_alt_damage} @{toggle_second_damage}">
+            <span class="sheet-en">Ranged</span>
+            <span class="sheet-de">Ranged</span>
+            <span class="sheet-fr">Tir</span>
+            <span class="sheet-ru">Дистанционное</span>
+          </button>
+        </div>
+      </div>
+    </div>
+    <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
+      <textarea class="sheet-xs-textarea" name="attr_emote"></textarea>
+      <div class="sheet-small-label">
+        <span class="sheet-en">Emote</span>
+        <span class="sheet-de">Emote</span>
+        <span class="sheet-fr">Emote</span>
+        <span class="sheet-ru">Текст</span>
+      </div>
+    </div>
+    <div class="sheet-shaped-row sheet-mar-t-sm">
+      <div class="sheet-col-03 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-checkbox-row-height" type="checkbox" value="@{PB}" name="attr_proficient" checked>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Prof</span>
+          <span class="sheet-de">Prof</span>
+          <span class="sheet-fr">Maît</span>
+          <span class="sheet-ru">Влад</span>
+        </div>
+      </div>
+      <div class="sheet-col-06 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
+        <span class="sheet-en">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">Str</option>
+            <option value="@{dexterity_mod}" selected>Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wis</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-de">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">Str</option>
+            <option value="@{dexterity_mod}" selected>Ges</option>
+            <option value="@{constitution_mod}">Kon</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wei</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-fr">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">For</option>
+            <option value="@{dexterity_mod}" selected>Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Sag</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+      <span class="sheet-ru">
+          <select name="attr_attack_stat" class="sheet-select-no-arrow">
+            <option value="@{finesse_mod}">Фехтовальное</option>
+            <option value="@{strength_mod}">Сил</option>
+            <option value="@{dexterity_mod}" selected>Лов</option>
+            <option value="@{constitution_mod}">Тел</option>
+            <option value="@{intelligence_mod}">Инт</option>
+            <option value="@{wisdom_mod}">Муд</option>
+            <option value="@{charisma_mod}">Хар</option>
+          </select>
+        </span>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Atk Stat</span>
+          <span class="sheet-de">Atk Stat</span>
+          <span class="sheet-fr">Stat Atq</span>
+          <span class="sheet-ru">Хар Атк</span>
+        </div>
+      </div>
+      <div class="sheet-col-04 sheet-toggle-attack sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_attack_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">+Atk</span>
+          <span class="sheet-de">+Atk</span>
+          <span class="sheet-fr">+Atq</span>
+          <span class="sheet-ru">+Атк</span>
+        </div>
+      </div>
+      <div class="sheet-col-04 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_to_hit" value="@{proficient} + @{attack_stat} + (@{attack_bonus} * @{toggle_bonuses})" disabled="disabled">
+        <div class="sheet-small-label">
+          <span class="sheet-en">To Hit</span>
+          <span class="sheet-de">To Hit</span>
+          <span class="sheet-fr">Mod Atq</span>
+          <span class="sheet-ru">Попадение</span>
+        </div>
+      </div>
+      <div class="sheet-col-08 sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_range">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Range</span>
+          <span class="sheet-de">Reichweite</span>
+          <span class="sheet-fr">Portée</span>
+          <span class="sheet-ru">Дальность</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-range sheet-toggle-ammo sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_ammo" min="0" value="1">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Ammo</span>
+          <span class="sheet-de">Ammo</span>
+          <span class="sheet-fr">Munition</span>
+          <span class="sheet-ru">Боеприпас</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Dice</span>
+          <span class="sheet-de">Dmg Dice</span>
+          <span class="sheet-fr">Dés de Dmg</span>
+          <span class="sheet-ru">Бросок Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-left sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
+        <input class="sheet-center" type="text" name="attr_alt_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg</span>
+          <span class="sheet-de">Alt Dmg</span>
+          <span class="sheet-fr">Dmg Alt</span>
+          <span class="sheet-ru">Алт Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <textarea class="sheet-xs-textarea sheet-center" name="attr_alt_dmg_reason"></textarea>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Alt Dmg Reason</span>
+          <span class="sheet-de">Alt Dmg Reason</span>
+          <span class="sheet-fr">Raison Dmg Alt</span>
+          <span class="sheet-ru">Причина Алт Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-06 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
+        <span class="sheet-en">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">None</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">Str</option>
+            <option value="@{dexterity_mod}" selected>Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wis</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-de">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">None</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">Str</option>
+            <option value="@{dexterity_mod}" selected>Ges</option>
+            <option value="@{constitution_mod}">Kon</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Wei</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+        <span class="sheet-fr">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">Aucun</option>
+            <option value="@{finesse_mod}">Finesse</option>
+            <option value="@{strength_mod}">For</option>
+            <option value="@{dexterity_mod}" selected>Dex</option>
+            <option value="@{constitution_mod}">Con</option>
+            <option value="@{intelligence_mod}">Int</option>
+            <option value="@{wisdom_mod}">Sag</option>
+            <option value="@{charisma_mod}">Cha</option>
+          </select>
+        </span>
+      <span class="sheet-ru">
+          <select name="attr_dmg_stat" class="sheet-select-no-arrow">
+            <option value="0">Нет</option>
+            <option value="@{finesse_mod}">Фехтовальное</option>
+            <option value="@{strength_mod}">Сил</option>
+            <option value="@{dexterity_mod}" selected>Лов</option>
+            <option value="@{constitution_mod}">Тел</option>
+            <option value="@{intelligence_mod}">Инт</option>
+            <option value="@{wisdom_mod}">Муд</option>
+            <option value="@{charisma_mod}">Хар</option>
+          </select>
+        </span>
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Stat</span>
+          <span class="sheet-de">Scha Stat</span>
+          <span class="sheet-fr">Stat Dmg</span>
+          <span class="sheet-ru">Хар Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_dmg_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">+Dmg</span>
+          <span class="sheet-de">+Scha</span>
+          <span class="sheet-fr">+Dmg</span>
+          <span class="sheet-ru">+Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="number" name="attr_dmg_total" value="@{dmg_stat} + (@{dmg_bonus} * @{toggle_bonuses})" disabled="disabled">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Mod</span>
+          <span class="sheet-de">Scha Mod</span>
+          <span class="sheet-fr">Mod Dmg</span>
+          <span class="sheet-ru">Мод Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-10 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Dmg Type</span>
+          <span class="sheet-de">Scha Type</span>
+          <span class="sheet-fr">Type Dmg</span>
+          <span class="sheet-ru">Тип Урон</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd Dmg Dice</span>
+          <span class="sheet-de">2te Scha Dice</span>
+          <span class="sheet-fr">2ème Dés de Dmg</span>
+          <span class="sheet-ru">2ой Бросок урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-second-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg_bonus" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd +Dmg</span>
+          <span class="sheet-de">2te +Scha</span>
+          <span class="sheet-fr">2ème +Dmg</span>
+          <span class="sheet-ru">2ой +Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-10 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
+        <input class="sheet-center" type="text" name="attr_second_dmg_type">
+        <div class="sheet-small-label">
+          <span class="sheet-en">2nd Dmg Type</span>
+          <span class="sheet-de">2te Scha Type</span>
+          <span class="sheet-fr">2ème Type Dmg</span>
+          <span class="sheet-ru">2ой Тип Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-l-sm">
+        <input class="sheet-center" type="text" name="attr_bonus_crit_dmg" value="0">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Bonus Crit Dmg</span>
+          <span class="sheet-de">Bonus Crit Dmg</span>
+          <span class="sheet-fr">Bonus Dmg Crit</span>
+          <span class="sheet-ru">Бонус Крит Урона</span>
+        </div>
+      </div>
+      <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm">
+        <input class="sheet-center" type="number" name="attr_crit_range" value="20" step="1" min="1" max="20">
+        <div class="sheet-small-label">
+          <span class="sheet-en">Crit Range</span>
+          <span class="sheet-de">Crit Range</span>
+          <span class="sheet-fr">Coup Crit</span>
+          <span class="sheet-ru">Крит при</span>
+        </div>
       </div>
     </div>
   </div>
-  <div class="sheet-toggle-emote sheet-center sheet-mar-t-sm">
-    <textarea class="sheet-xs-textarea" name="attr_repeating_weapons_ranged_{{num}}_emote"></textarea>
-    <div class="sheet-small-label">
-      <span class="sheet-en">Emote</span>
-      <span class="sheet-de">Emote</span>
-      <span class="sheet-fr">Emote</span>
-      <span class="sheet-ru">Текст</span>
-    </div>
-  </div>
-  <div class="sheet-shaped-row sheet-mar-t-sm">
-    <div class="sheet-col-03 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-checkbox-row-height" type="checkbox" value="@{PB}" name="attr_repeating_weapons_ranged_{{num}}_proficient" checked>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Prof</span>
-        <span class="sheet-de">Prof</span>
-        <span class="sheet-fr">Maît</span>
-        <span class="sheet-ru">Влад</span>
-      </div>
-    </div>
-    <div class="sheet-col-06 sheet-toggle-attack sheet-center sheet-vert-top sheet-pad-r-sm">
-      <span class="sheet-en">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">Str</option>
-          <option value="@{dexterity_mod}" selected>Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wis</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-de">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">Str</option>
-          <option value="@{dexterity_mod}" selected>Ges</option>
-          <option value="@{constitution_mod}">Kon</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wei</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-fr">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">For</option>
-          <option value="@{dexterity_mod}" selected>Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Sag</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-	  <span class="sheet-ru">
-        <select name="attr_repeating_weapons_ranged_{{num}}_attack_stat" class="sheet-select-no-arrow">
-          <option value="@{finesse_mod}">Фехтовальное</option>
-          <option value="@{strength_mod}">Сил</option>
-          <option value="@{dexterity_mod}" selected>Лов</option>
-          <option value="@{constitution_mod}">Тел</option>
-          <option value="@{intelligence_mod}">Инт</option>
-          <option value="@{wisdom_mod}">Муд</option>
-          <option value="@{charisma_mod}">Хар</option>
-        </select>
-      </span>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Atk Stat</span>
-        <span class="sheet-de">Atk Stat</span>
-        <span class="sheet-fr">Stat Atq</span>
-        <span class="sheet-ru">Хар Атк</span>
-      </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-attack sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_attack_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">+Atk</span>
-        <span class="sheet-de">+Atk</span>
-        <span class="sheet-fr">+Atq</span>
-        <span class="sheet-ru">+Атк</span>
-      </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-attack sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_to_hit" value="@{repeating_weapons_ranged_{{num}}_proficient} + @{repeating_weapons_ranged_{{num}}_attack_stat} + (@{repeating_weapons_ranged_{{num}}_attack_bonus} * @{repeating_weapons_ranged_{{num}}_toggle_bonuses})" disabled="disabled">
-      <div class="sheet-small-label">
-        <span class="sheet-en">To Hit</span>
-        <span class="sheet-de">To Hit</span>
-        <span class="sheet-fr">Mod Atq</span>
-        <span class="sheet-ru">Попадение</span>
-      </div>
-    </div>
-    <div class="sheet-col-08 sheet-toggle-range sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_range">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Range</span>
-        <span class="sheet-de">Reichweite</span>
-        <span class="sheet-fr">Portée</span>
-        <span class="sheet-ru">Дальность</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-range sheet-toggle-ammo sheet-border-right sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_ammo" min="0" value="1">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Ammo</span>
-        <span class="sheet-de">Ammo</span>
-        <span class="sheet-fr">Munition</span>
-        <span class="sheet-ru">Боеприпас</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Dice</span>
-        <span class="sheet-de">Dmg Dice</span>
-        <span class="sheet-fr">Dés de Dmg</span>
-        <span class="sheet-ru">Бросок Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-left sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-md">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_alt_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg</span>
-        <span class="sheet-de">Alt Dmg</span>
-        <span class="sheet-fr">Dmg Alt</span>
-        <span class="sheet-ru">Алт Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-16 sheet-toggle-damage sheet-toggle-alt-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <textarea class="sheet-xs-textarea sheet-center" name="attr_repeating_weapons_ranged_{{num}}_alt_dmg_reason"></textarea>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Alt Dmg Reason</span>
-        <span class="sheet-de">Alt Dmg Reason</span>
-        <span class="sheet-fr">Raison Dmg Alt</span>
-        <span class="sheet-ru">Причина Алт Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-06 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
-      <span class="sheet-en">
-        <select name="attr_repeating_weapons_ranged_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">None</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">Str</option>
-          <option value="@{dexterity_mod}" selected>Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wis</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-de">
-        <select name="attr_repeating_weapons_ranged_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">None</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">Str</option>
-          <option value="@{dexterity_mod}" selected>Ges</option>
-          <option value="@{constitution_mod}">Kon</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Wei</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-      <span class="sheet-fr">
-        <select name="attr_repeating_weapons_ranged_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">Aucun</option>
-          <option value="@{finesse_mod}">Finesse</option>
-          <option value="@{strength_mod}">For</option>
-          <option value="@{dexterity_mod}" selected>Dex</option>
-          <option value="@{constitution_mod}">Con</option>
-          <option value="@{intelligence_mod}">Int</option>
-          <option value="@{wisdom_mod}">Sag</option>
-          <option value="@{charisma_mod}">Cha</option>
-        </select>
-      </span>
-	  <span class="sheet-ru">
-        <select name="attr_repeating_weapons_ranged_{{num}}_dmg_stat" class="sheet-select-no-arrow">
-          <option value="0">Нет</option>
-          <option value="@{finesse_mod}">Фехтовальное</option>
-          <option value="@{strength_mod}">Сил</option>
-          <option value="@{dexterity_mod}" selected>Лов</option>
-          <option value="@{constitution_mod}">Тел</option>
-          <option value="@{intelligence_mod}">Инт</option>
-          <option value="@{wisdom_mod}">Муд</option>
-          <option value="@{charisma_mod}">Хар</option>
-        </select>
-      </span>
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Stat</span>
-        <span class="sheet-de">Scha Stat</span>
-        <span class="sheet-fr">Stat Dmg</span>
-        <span class="sheet-ru">Хар Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_dmg_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">+Dmg</span>
-        <span class="sheet-de">+Scha</span>
-        <span class="sheet-fr">+Dmg</span>
-        <span class="sheet-ru">+Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_dmg_total" value="@{repeating_weapons_ranged_{{num}}_dmg_stat} + (@{repeating_weapons_ranged_{{num}}_dmg_bonus} * @{repeating_weapons_ranged_{{num}}_toggle_bonuses})" disabled="disabled">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Mod</span>
-        <span class="sheet-de">Scha Mod</span>
-        <span class="sheet-fr">Mod Dmg</span>
-        <span class="sheet-ru">Мод Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-10 sheet-toggle-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Dmg Type</span>
-        <span class="sheet-de">Scha Type</span>
-        <span class="sheet-fr">Type Dmg</span>
-        <span class="sheet-ru">Тип Урон</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-second-damage sheet-center sheet-vert-top sheet-pad-l-sm sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_second_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd Dmg Dice</span>
-        <span class="sheet-de">2te Scha Dice</span>
-        <span class="sheet-fr">2ème Dés de Dmg</span>
-        <span class="sheet-ru">2ой Бросок урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-04 sheet-toggle-damage sheet-toggle-second-damage sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_second_dmg_bonus" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd +Dmg</span>
-        <span class="sheet-de">2te +Scha</span>
-        <span class="sheet-fr">2ème +Dmg</span>
-        <span class="sheet-ru">2ой +Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-10 sheet-toggle-damage sheet-toggle-second-damage sheet-border-right sheet-center sheet-vert-top sheet-pad-r-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_second_dmg_type">
-      <div class="sheet-small-label">
-        <span class="sheet-en">2nd Dmg Type</span>
-        <span class="sheet-de">2te Scha Type</span>
-        <span class="sheet-fr">2ème Type Dmg</span>
-        <span class="sheet-ru">2ой Тип Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-07 sheet-toggle-damage sheet-toggle-crit sheet-toggle-bonuses sheet-center sheet-vert-top sheet-pad-l-sm">
-      <input class="sheet-center" type="text" name="attr_repeating_weapons_ranged_{{num}}_bonus_crit_dmg" value="0">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Bonus Crit Dmg</span>
-        <span class="sheet-de">Bonus Crit Dmg</span>
-        <span class="sheet-fr">Bonus Dmg Crit</span>
-        <span class="sheet-ru">Бонус Крит Урона</span>
-      </div>
-    </div>
-    <div class="sheet-col-05 sheet-toggle-damage sheet-toggle-crit sheet-center sheet-vert-top sheet-pad-l-sm">
-      <input class="sheet-center" type="number" name="attr_repeating_weapons_ranged_{{num}}_crit_range" value="20" step="1" min="1" max="20">
-      <div class="sheet-small-label">
-        <span class="sheet-en">Crit Range</span>
-        <span class="sheet-de">Crit Range</span>
-        <span class="sheet-fr">Coup Crit</span>
-        <span class="sheet-ru">Крит при</span>
-      </div>
-    </div>
-  </div>
-</div>
+</fieldset>
\ No newline at end of file
diff --git a/D&D_5e_Shaped/precompiled/gulpfile.js b/D&D_5e_Shaped/precompiled/gulpfile.js
index 48e33d0c98..526204ea86 100644
--- a/D&D_5e_Shaped/precompiled/gulpfile.js
+++ b/D&D_5e_Shaped/precompiled/gulpfile.js
@@ -12,13 +12,12 @@ var gulp = require('gulp'),
 	change = require('gulp-change');
 
 var customSkillCount = 4,
-	outputOptionsCount = 1,
 	traitsCount = 1,
 	actionCount = 12,
 	lairActionCount = 4,
 	legendaryActionCount = 4,
-	meleeCount = 7,
-	rangedCount = 4,
+	meleeCount = 1,
+	rangedCount = 1,
 	quickClassActions = 5,
 	classActionsPerPage = 10,
 	customClassCount = 6,