diff --git a/Emberwind/emberwind.html b/Emberwind/emberwind.html
index 1fd7a25f44..f8bcf3231c 100644
--- a/Emberwind/emberwind.html
+++ b/Emberwind/emberwind.html
@@ -235,6 +235,7 @@
                     </div>
                     <!--                DAMAGE. MODS-->
                     <div class="col advantage-box width20 padding-right2">
+                        <input type="hidden" name="attr_damage_mod_text" value="">
                         <div class="header">
                             <span class="header">Damage Modifiers</span>
                         </div>
@@ -738,7 +739,7 @@
                                            style="width: 25px; height: 25px"/>
                                     <span>y</span>
                                     <button type='roll' name='roll_cap'
-                                            value='@{whisper_state}&{template:basic-action} {{name=@{melee_name}}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{melee_dice} + @{melee_dice_bonus} + @{damage_bonus_mod} + @{damage_dice_mod}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{melee_dice}kh1*{{@{melee_dice}>1}}+@{melee_dice_bonus}+@{damage_bonus_mod}+@{damage_dice_mod}]]}} {{speed=Slow}} {{type=Melee}} {{range=@{melee_range}}} {{target=@{melee_target}}} {{description=@{melee_description}}} {{against=[[@{melee_against}]]}}'>
+                                            value='@{whisper_state}&{template:basic-action} {{name=@{melee_name}}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{melee_dice} + @{melee_dice_bonus}@{damage_mod_text}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{melee_dice}kh1*{{@{melee_dice}>1}}+@{melee_dice_bonus}@{damage_mod_text}]]}} {{speed=Slow}} {{type=Melee}} {{range=@{melee_range}}} {{target=@{melee_target}}} {{description=@{melee_description}}} {{against=[[@{melee_against}]]}}'>
                                     </button>
                                 </div>
                             </div>
@@ -822,7 +823,7 @@
                                            style="width: 25px; height: 25px"/>
                                     <span>y</span>
                                     <button type='roll' name='roll_cap'
-                                            value='@{whisper_state}&{template:basic-action} {{name=@{ranged_name}}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{ranged_dice} + @{ranged_dice_bonus} + @{damage_bonus_mod} + @{damage_dice_mod}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{ranged_dice}kh1*{{@{ranged_dice}>1}}+@{ranged_dice_bonus}+@{damage_bonus_mod}+@{damage_dice_mod}]]}} {{speed=Slow}} {{type=Ranged}} {{range=@{ranged_range}}} {{target=@{ranged_target}}} {{description=@{ranged_description}}} {{against=[[@{ranged_against}]]}}'>
+                                            value='@{whisper_state}&{template:basic-action} {{name=@{ranged_name}}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{ranged_dice} + @{ranged_dice_bonus}@{damage_mod_text}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{ranged_dice}kh1*{{@{ranged_dice}>1}}+@{ranged_dice_bonus}@{damage_mod_text}]]}} {{speed=Slow}} {{type=Ranged}} {{range=@{ranged_range}}} {{target=@{ranged_target}}} {{description=@{ranged_description}}} {{against=[[@{ranged_against}]]}}'>
                                     </button>
                                 </div>
                             </div>
@@ -923,7 +924,7 @@
                                             <span>y</span>
                                         </div>
                                         <button type='roll' name='roll_action'
-                                                value='@{whisper_state}&{template:action} {{tideTurner=[[0]]}} {{name=@{action_name}}} {{subtag1=@{action_subtype1}}} {{subtag2=@{action_subtype2}}} {{rollType=[[@{action_roll_type}]]}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{action_dice} + @{action_dice_bonus} + @{damage_bonus_mod} + @{damage_dice_mod}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{action_dice}kh1*{{@{action_dice}>1}}+@{action_dice_bonus}+@{damage_bonus_mod}+@{damage_dice_mod}]]}} {{against=[[@{action_against}]]}} {{healing=[[0@{action_healing_dice} + @{action_healing_dice_bonus}]]}} {{speed=@{action_speed}}} {{target=@{action_target}}} {{type=@{action_type}}} {{range=@{action_range}@{action_field_description}}} {{description=@{action_description}}} {{ampEffect=@{action_amp_effect}}} {{trigCondition=@{action_trig_condition}}} {{trigEffect=@{action_trig_effect}}} {{sustEffect=@{action_sust_effect}}}'>
+                                                value='@{whisper_state}&{template:action} {{tideTurner=[[0]]}} {{name=@{action_name}}} {{subtag1=@{action_subtype1}}} {{subtag2=@{action_subtype2}}} {{rollType=[[@{action_roll_type}]]}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{action_dice} + @{action_dice_bonus}@{damage_mod_text}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{action_dice}kh1*{{@{action_dice}>1}}+@{action_dice_bonus}@{damage_mod_text}]]}} {{against=[[@{action_against}]]}} {{healing=[[0@{action_healing_dice} + @{action_healing_dice_bonus}]]}} {{speed=@{action_speed}}} {{target=@{action_target}}} {{type=@{action_type}}} {{range=@{action_range}@{action_field_description}}} {{description=@{action_description}}} {{ampEffect=@{action_amp_effect}}} {{trigCondition=@{action_trig_condition}}} {{trigEffect=@{action_trig_effect}}} {{sustEffect=@{action_sust_effect}}}'>
                                         </button>
                                     </div>
 
@@ -1189,7 +1190,7 @@
                                             <span>y</span>
                                         </div>
                                         <button type='roll' name='roll_action'
-                                                value='@{whisper_state}&{template:action} {{tideTurner=[[1]]}} {{name=@{tide_action_name}}} {{subtag1=@{tide_action_subtype1}}} {{subtag2=@{tide_action_subtype2}}} {{rollType=[[@{tide_action_roll_type}]]}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{tide_action_dice} + @{tide_action_dice_bonus} + @{damage_bonus_mod} + @{damage_dice_mod}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{tide_action_dice}kh1*{{@{tide_action_dice}>1}}+@{tide_action_dice_bonus}+@{damage_bonus_mod}+@{damage_dice_mod}]]}} {{against=[[@{tide_action_against}]]}} {{healing=[[0@{tide_action_healing_dice} + @{tide_action_healing_dice_bonus}]]}} {{speed=@{tide_action_speed}}} {{target=@{tide_action_target}}} {{type=@{tide_action_type}}} {{range=@{tide_action_range}@{tide_action_field_description}}} {{description=@{tide_action_description}}} {{ampEffect=@{tide_action_amp_effect}}} {{trigCondition=@{tide_action_trig_condition}}} {{trigEffect=@{tide_action_trig_effect}}} {{sustEffect=@{tide_action_sust_effect}}}'>
+                                                value='@{whisper_state}&{template:action} {{tideTurner=[[1]]}} {{name=@{tide_action_name}}} {{subtag1=@{tide_action_subtype1}}} {{subtag2=@{tide_action_subtype2}}} {{rollType=[[@{tide_action_roll_type}]]}} {{cap=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{critical}+@{critical_mod}]]cf>[[@{accuracy}+@{accuracy_mod}+1]]]]}} {{damage=[[0@{tide_action_dice} + @{tide_action_dice_bonus}@{damage_mod_text}]]}} {{penetration=[[@{penetration}+@{penetration_mod}]]}} {{dmgcrit=[[10@{tide_action_dice}kh1*{{@{tide_action_dice}>1}}+@{tide_action_dice_bonus}@{damage_mod_text}]]}} {{against=[[@{tide_action_against}]]}} {{healing=[[0@{tide_action_healing_dice} + @{tide_action_healing_dice_bonus}]]}} {{speed=@{tide_action_speed}}} {{target=@{tide_action_target}}} {{type=@{tide_action_type}}} {{range=@{tide_action_range}@{tide_action_field_description}}} {{description=@{tide_action_description}}} {{ampEffect=@{tide_action_amp_effect}}} {{trigCondition=@{tide_action_trig_condition}}} {{trigEffect=@{tide_action_trig_effect}}} {{sustEffect=@{tide_action_sust_effect}}}'>
                                         </button>
                                     </div>
 
@@ -5288,7 +5289,18 @@
                 return "kh1";
             }
         };
-
+        on("sheet:opened change:damage_bonus_mod change:damage_dice_mod", function () {
+            getAttrs(['damage_bonus_mod','damage_dice_mod'], function(values) {
+                let mod_text = "";
+                if (values.damage_bonus_mod && values.damage_bonus_mod !== "0") {
+                    mod_text = " + @{damage_bonus_mod}";
+                }
+                if (values.damage_dice_mod && values.damage_dice_mod !== "") {
+                    mod_text = mod_text + " + @{damage_dice_mod}";
+                }
+                setAttrs({damage_mod_text: mod_text});
+            });
+        });
         on("clicked:reset_mods", function() {
             setAttrs({
                 "advantage_stack": 0,