diff --git a/DreamsAndMachines/Dreams and Machines.css b/DreamsAndMachines/Dreams and Machines.css
index 8564838711..b06cb2e5cd 100644
--- a/DreamsAndMachines/Dreams and Machines.css	
+++ b/DreamsAndMachines/Dreams and Machines.css	
@@ -608,6 +608,8 @@ img {
 }
 .sheet-rolltemplate-foweapon .sheet-hidden-attribute[data-i18n-placeholder*=might] ~ .sheet-container .sheet-might,
 .sheet-rolltemplate-foweapon .sheet-hidden-attribute[data-i18n-placeholder*=quickness] ~ .sheet-container .sheet-quickness,
+.sheet-rolltemplate-foweapon .sheet-hidden-attribute[data-i18n-placeholder*=main] ~ .sheet-container .sheet-main,
+.sheet-rolltemplate-foweapon .sheet-hidden-attribute[data-i18n-placeholder*=default] ~ .sheet-container .sheet-default,
 .sheet-rolltemplate-foskill .sheet-hidden-attribute[data-i18n-placeholder*=might] ~ .sheet-container .sheet-might,
 .sheet-rolltemplate-foskill .sheet-hidden-attribute[data-i18n-placeholder*=quickness] ~ .sheet-container .sheet-quickness,
 .sheet-rolltemplate-foskill .sheet-hidden-attribute[data-i18n-placeholder*=insight] ~ .sheet-container .sheet-insight,
@@ -615,6 +617,8 @@ img {
 .sheet-rolltemplate-foskill .sheet-hidden-attribute[data-i18n-placeholder*=main] ~ .sheet-container .sheet-main,
 .sheet-rolltemplate-foskill .sheet-hidden-attribute[data-i18n-placeholder*=default] ~ .sheet-container .sheet-default,
 .sheet-rolltemplate-foweapon .sheet-hidden-skill[data-i18n-placeholder*=fight] ~ .sheet-container .sheet-fight,
+.sheet-rolltemplate-foweapon .sheet-hidden-skill[data-i18n-placeholder*=mainskill] ~ .sheet-container .sheet-mainskill,
+.sheet-rolltemplate-foweapon .sheet-hidden-skill[data-i18n-placeholder*=defaultskill] ~ .sheet-container .sheet-defaultskill,
 .sheet-rolltemplate-foskill .sheet-hidden-skill[data-i18n-placeholder*=fight] ~ .sheet-container .sheet-fight,
 .sheet-rolltemplate-foskill .sheet-hidden-skill[data-i18n-placeholder*=move] ~ .sheet-container .sheet-move,
 .sheet-rolltemplate-foskill .sheet-hidden-skill[data-i18n-placeholder*=operate] ~ .sheet-container .sheet-operate,
@@ -716,3 +720,4 @@ img {
     border: solid 1px #1aa2e1;
     color: #1aa2e1;
 }
+
diff --git a/DreamsAndMachines/Dreams and Machines.html b/DreamsAndMachines/Dreams and Machines.html
index bf0eb89a49..e3664557f2 100644
--- a/DreamsAndMachines/Dreams and Machines.html	
+++ b/DreamsAndMachines/Dreams and Machines.html	
@@ -333,15 +333,17 @@
                         <fieldset class="repeating_weapons">
                             <div class="weapons-row">
                                 <button class="weapon-roll" type="roll" name="roll_weapon" title="Roll 2d20" data-i18n-title="roll-2d20"
-                                value="&{template:foweapon} {{name=@{character_name}}} {{reroll=[Reroll](~repeating_weapons_weapon)}} {{attribute=?{Attribute|Might,@{might}[might]|Quickness,@{quickness}[quickness]}}} {{skill=@{fight}[fight]}} {{attr_num=[[?{Attribute}]]}} {{skill_num=[[@{fight}]]}} {{weapon=@{weaponname}}} {{damage=@{weapondamage}}} {{qualities=@{weaponqualities}}} {{target=[[?{Attribute}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
+                                value="&{template:foweapon} {{name=@{character_name}}} {{reroll=[Reroll](~repeating_weapons_weapon)}} {{attribute=@{weaponattributevalue}[@{weaponattributename}]}} {{skill=@{fight}[fight]}} {{attr_num=[[@{weaponattributevalue}]]}} {{skill_num=[[@{fight}]]}} {{weapon=@{weaponname}}} {{damage=@{weapondamage}}} {{qualities=@{weaponqualities}}} {{target=[[@{weaponattributevalue}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
                                 <input name="attr_weaponname" class="char-inputs-size2" type="text" />
                                 <input name="attr_weapontech" class="char-inputs-size1" type="number" value="0" />
-                                <select id="weapontype" name="attr_attr_weapontype" class="char-select">
+                                <select name="attr_weapontype" class="char-select">
                                     <option value="" data-i18n="choose">Choose</option>
                                     <option value="ranged">Ranged</option>
                                     <option value="melee">Melee</option>
                                 <input name="attr_weapondamage" class="char-inputs-size1" type="text" />
                                 <input name="attr_weaponqualities" class="char-inputs-size4" type="text" />     
+                                <input name="attr_weaponattributename" type="hidden" />
+                                <input name="attr_weaponattributevalue" type="hidden" />
                             </div>
                         </fieldset>
 
@@ -370,7 +372,7 @@
             </div>
             <div class="npcattribute-mainroll">			
                 <button class="skill-character" type="roll" name="roll_main" title="Roll 2d20" data-i18n-title="roll-2d20"
-                value="&{template:foskill} {{name=@{character_name}}} {{reroll=[Reroll](~skill)}} {{attribute=Main,@{main}[main]}}} {{skill=Main Skill,@{mainskill}[mainskill]}} {{attr_num=[[@{main}]]}} {{skill_num=[[@{mainskill}]]}} {{target=[[@{main}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
+                value="&{template:foskill} {{name=@{character_name}}} {{reroll=[Reroll](~main)}} {{attribute=Main,@{main}[main]}}} {{skill=Main Skill,@{mainskill}[mainskill]}} {{attr_num=[[@{main}]]}} {{skill_num=[[@{mainskill}]]}} {{target=[[@{main}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
             </div>	
             <div class="npcattribute-defaulttitle">			
                 <label title="" >Default</label> 
@@ -382,8 +384,8 @@
                 <input name="attr_defaultskill" class="stat-inputs" type="number" value="1" /> 
             </div>
             <div class="npcattribute-defaultroll">			
-                <button class="skill-character" type="roll" name="roll_main" title="Roll 2d20" data-i18n-title="roll-2d20"
-                value="&{template:foskill} {{name=@{character_name}}} {{reroll=[Reroll](~skill)}} {{attribute=Default,@{default}[default]}}} {{skill=Default Skill,@{defaultskill}[defaultskill]}} {{attr_num=[[@{default}]]}} {{skill_num=[[@{defaultskill}]]}} {{target=[[@{default}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
+                <button class="skill-character" type="roll" name="roll_default" title="Roll 2d20" data-i18n-title="roll-2d20"
+                value="&{template:foskill} {{name=@{character_name}}} {{reroll=[Reroll](~default)}} {{attribute=Default,@{default}[default]}}} {{skill=Default Skill,@{defaultskill}[defaultskill]}} {{attr_num=[[@{default}]]}} {{skill_num=[[@{defaultskill}]]}} {{target=[[@{default}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
             </div>	
 
             <div class="npcweapons-title">
@@ -404,8 +406,8 @@
             <div class="npcweapons-list">            
                 <fieldset class="repeating_weapons">
                     <div class="weapons-row">
-                        <button class="weapon-roll" type="roll" name="roll_fight" title="Roll 2d20" data-i18n-title="roll-2d20"
-                        value="&{template:foweapon} {{name=@{character_name}}} {{reroll=[Reroll](~skill)}} {{attribute=Main,@{main}[main]}}} {{skill=Main Skill,@{mainskill}[mainskill]}} {{attr_num=[[@{main}]]}} {{skill_num=[[@{mainskill}]]}} {{weapon=@{weaponname}}} {{damage=@{weapondamage}}} {{qualities=@{weaponqualities}}} {{target=[[@{main}]]}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
+                        <button class="weapon-roll" type="roll" name="roll_nweapon" title="Roll 2d20" data-i18n-title="roll-2d20"
+                        value="&{template:foweapon} {{name=@{character_name}}} {{reroll=[Reroll](~repeating_weapons_nweapon)}}  {{attribute=Main,@{main}[main]}}} {{skill=Main Skill,@{mainskill}[mainskill]}} {{attr_num=[[@{main}]]}} {{skill_num=[[@{mainskill}]]}} {{target=[[@{main}]]}} {{weapon=@{weaponname}}} {{damage=@{weapondamage}}} {{qualities=@{weaponqualities}}} {{dice_num=[[?{Number of dice|2|1|2|3|4|5|6}]]}} {{tag=[[1]]}} {{result_1=[[1d20]]}} {{result_2=[[1d20]]}} {{result_3=[[1d20]]}} {{result_4=[[1d20]]}} {{result_5=[[1d20]]}} {{result_6=[[1d20]]}}" />
                         <input name="attr_weaponname" class="char-inputs-size2" type="text" />
                         <input name="attr_weapontech" class="char-inputs-size1" type="number" value="0" />
                         <select id="weapontype" name="attr_attr_weapontype" class="char-select">
@@ -414,6 +416,8 @@
                             <option value="melee">Melee</option>
                         <input name="attr_weapondamage" class="char-inputs-size1" type="text" />
                         <input name="attr_weaponqualities" class="char-inputs-size4" type="text" />     
+                        <input name="attr_weaponattributename" type="hidden" />
+                        <input name="attr_weaponattributevalue" type="hidden" />
                     </div>
                 </fieldset>
 
@@ -592,6 +596,40 @@ buttonlist.forEach(button => {
 	});
 });
 
+on("change:repeating_weapons:weapontype", function() {
+    getAttrs(["repeating_weapons_weapontype","might","quickness"], function(values) {
+        var weapontype = values["repeating_weapons_weapontype"]||"";
+        var migt = values["might"]||"";
+        var quik = values["quickness"]||"";
+        var attributename = "unset";
+        var attributevalue = quik;
+        if (weapontype == "ranged") { attributename= "quickness" ; attributevalue = quik};
+        if (weapontype == "melee") { attributename= "might" ; attributevalue = migt};
+
+        setAttrs({
+            "repeating_class_weaponattributename": attributename,
+            "repeating_class_weaponattributevalue": attributevalue,
+        });
+    });
+  });
+on("change:repeating_weapons:weapontype", function() {
+    getAttrs(["repeating_weapons_weapontype","might","quickness"], function(values) {
+        var weapontype = values["repeating_weapons_weapontype"]||"";
+        var migt = values["might"]||"";
+        var quik = values["quickness"]||"";
+        var attributename = "unset";
+        var attributevalue = quik;
+        if (weapontype == "ranged") { attributename= "quickness" ; attributevalue = quik};
+        if (weapontype == "melee") { attributename= "might" ; attributevalue = migt};
+
+        setAttrs({
+            "repeating_class_weaponattributename": attributename,
+            "repeating_class_weaponattributevalue": attributevalue,
+        });
+    });
+  });
+
+
 </script>
 
 <rolltemplate class="sheet-rolltemplate-foskill">
@@ -928,10 +966,14 @@ buttonlist.forEach(button => {
             {{#attribute}}
                 <span class="hidden might">Might</span>
                 <span class="hidden quickness">Quickness</span>
+                <span class="hidden main">Main</span>
+                <span class="hidden default">Default</span>
                 ({{attr_num}})
             {{/attribute}}
             {{#skill}}
                 <span class="hidden fight">Fight</span>
+                <span class="hidden mainskill">Main Skill</span>
+                <span class="hidden defaultskill">Default Skill</span>
                 ({{skill_num}}{{#rollTotal() tag 1}} {{/rollTotal() tag 1}})
             {{/skill}}
             <br />