diff --git a/microluxe20/README.md b/microluxe20/README.md
index b46c925db9..264c6936dd 100644
--- a/microluxe20/README.md
+++ b/microluxe20/README.md
@@ -4,8 +4,11 @@ This is a Microluxe20 character sheet for games played on Roll20.net, modeled af
 
 ### Changelog
 
+* Complex Weapon Update - 9th March 2017
+Added complex weapon bonuses to combat section.
+
 * Initial release - 28th December 2016
-Initial release of the microluxe20 sheet. All basic functions are working. Casting spells, rolling for stat/skill rolls, saves, combat rolls, etc. all work. Spell saves/savedc needs to be reworked in the future. Weapon/armor weight & connection to the inventory tab should also be reworked in the future.
+Initial release of the Microluxe20 sheet. All basic functions are working. Casting spells, rolling for stat/skill rolls, saves, combat rolls, etc. all work. Spell saves/savedc needs to be reworked in the future. Weapon/armor weight & connection to the inventory tab should also be reworked in the future.
 
 ### Resources
 
diff --git a/microluxe20/microluxe20.html b/microluxe20/microluxe20.html
index 673176305d..815f478960 100644
--- a/microluxe20/microluxe20.html
+++ b/microluxe20/microluxe20.html
@@ -137,9 +137,18 @@
                         <div class="sheet-col-1-8 sheet-skill-name">Physical</div>
                         <div class="sheet-col-1-12 sheet-center sheet-small-label">&nbsp;</div>
                         <div class="sheet-col-1-8 sheet-offset-1-24"><input type="number" name="attr_physical_bonus" value="0" step="1" /></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}}" title="d20 + physical rank + strength mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}}" title="d20 + physical rank + dexterity mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{mind_mod})]]]]}}" title="d20 + physical rank + mind mod"></button></div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}}"
+                                title="d20 + physical rank + strength mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}}"
+                                title="d20 + physical rank + dexterity mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Physical + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{mind_mod})]]]]}}"
+                                title="d20 + physical rank + mind mod"></button>
+                        </div>
                     </div>
 
                     <div class="sheet-row sheet-skill-row">
@@ -147,9 +156,18 @@
                         <div class="sheet-col-1-8 sheet-skill-name">Guile</div>
                         <div class="sheet-col-1-12 sheet-center sheet-small-label">&nbsp;</div>
                         <div class="sheet-col-1-8 sheet-offset-1-24"><input type="number" name="attr_guile_bonus" value="0" step="1" /></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{strength_mod})]]]]}}" title="d20 + guile rank + strength mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{dexterity_mod})]]]]}}" title="d20 + guile rank + dexterity mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{mind_mod})]]]]}}" title="d20 + guile rank + mind mod"></button></div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{strength_mod})]]]]}}"
+                                title="d20 + guile rank + strength mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{dexterity_mod})]]]]}}"
+                                title="d20 + guile rank + dexterity mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Guile + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{guile_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{guile_bonus})]]+[[(@{mind_mod})]]]]}}"
+                                title="d20 + guile rank + mind mod"></button>
+                        </div>
                     </div>
 
                     <div class="sheet-row sheet-skill-row">
@@ -157,9 +175,18 @@
                         <div class="sheet-col-1-8 sheet-skill-name">Knowledge</div>
                         <div class="sheet-col-1-12 sheet-center sheet-small-label">&nbsp;</div>
                         <div class="sheet-col-1-8 sheet-offset-1-24"><input type="number" name="attr_knowledge_bonus" value="0" step="1" /></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{strength_mod})]]]]}}" title="d20 + knowledge rank + strength mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{dexterity_mod})]]]]}}" title="d20 + knowledge rank + dexterity mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{mind_mod})]]]]}}" title="d20 + knowledge rank + mind mod"></button></div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{strength_mod})]]]]}}"
+                                title="d20 + knowledge rank + strength mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{dexterity_mod})]]]]}}"
+                                title="d20 + knowledge rank + dexterity mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Knowledge + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{knowledge_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{knowledge_bonus})]]+[[(@{mind_mod})]]]]}}"
+                                title="d20 + knowledge rank + mind mod"></button>
+                        </div>
                     </div>
 
                     <div class="sheet-row sheet-skill-row">
@@ -167,9 +194,18 @@
                         <div class="sheet-col-1-8 sheet-skill-name">Communication</div>
                         <div class="sheet-col-1-12 sheet-center sheet-small-label">&nbsp;</div>
                         <div class="sheet-col-1-8 sheet-offset-1-24"><input type="number" name="attr_communication_bonus" value="0" step="1" /></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{strength_mod})]]]]}}" title="d20 + communication rank + strength mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{dexterity_mod})]]]]}}" title="d20 + communication rank + dexterity mod"></button></div>
-                        <div class="sheet-col-1-12 sheet-offset-1-24"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{mind_mod})]]]]}}" title="d20 + communication rank + mind mod"></button></div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + STR}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{strength_mod})]]]]}}"
+                                title="d20 + communication rank + strength mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + DEX}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{dexterity_mod})]]]]}}"
+                                title="d20 + communication rank + dexterity mod"></button>
+                        </div>
+                        <div class="sheet-col-1-12 sheet-offset-1-24">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Communication + MIND}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{communication_bonus})]]+[[(@{mind_mod})]]]]}} {{rolladv=[[d20+[[(@{communication_bonus})]]+[[(@{mind_mod})]]]]}}"
+                                title="d20 + communication rank + mind mod"></button>
+                        </div>
                     </div>
 
                     <h4 class="sheet-center">Bonuses & Saves <span class="sheet-pictos">3</span></h4>
@@ -196,7 +232,10 @@
                     <div class="sheet-row">
                         <div class="sheet-col-3-13 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="number" name="attr_magic_attack_bonus" value="0" step="1"><br/>Attack Rolls</div>
                         <div class="sheet-col-3-13 sheet-small-label sheet-center"><input class="sheet-underlined sheet-center" type="number" name="attr_magic_damage_bonus" value="0" step="1"><br/>Damage Rolls</div>
-                        <div class="sheet-col-6-13 sheet-center"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Fortitude Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}}" title="d20 + Physical Bonus + STR mod">Roll Save</button></div>
+                        <div class="sheet-col-6-13 sheet-center">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Fortitude Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{strength_mod})]]]]}}"
+                                title="d20 + Physical Bonus + STR mod">Roll Save</button>
+                        </div>
                     </div>
 
                     <div class="sheet-row">
@@ -205,8 +244,14 @@
                     </div>
 
                     <div class="sheet-row">
-                        <div class="sheet-col-6-13 sheet-center"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Reflex Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}}" title="d20 + Physical Bonus + DEX mod">Roll Save</button></div>
-                        <div class="sheet-col-6-13 sheet-center"><button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Will Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{mind_mod})]]+[[(@{level})]]]]}} {{rolladv=[[d20+[[(@{mind_mod})]]+[[(@{level})]]]]}}" title="d20 + MIND mod + level">Roll Save</button></div>
+                        <div class="sheet-col-6-13 sheet-center">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Reflex Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}} {{rolladv=[[d20+[[(@{physical_bonus})]]+[[(@{dexterity_mod})]]]]}}"
+                                title="d20 + Physical Bonus + DEX mod">Roll Save</button>
+                        </div>
+                        <div class="sheet-col-6-13 sheet-center">
+                            <button type="roll" value="&{template:m20Default} {{character_name=@{character_name}}} {{title=Will Save}} {{subheader=@{character_name}}} {{rollname=Roll}} {{roll=[[d20+[[(@{mind_mod})]]+[[(@{level})]]]]}} {{rolladv=[[d20+[[(@{mind_mod})]]+[[(@{level})]]]]}}"
+                                title="d20 + MIND mod + level">Roll Save</button>
+                        </div>
                     </div>
                 </div>
 
@@ -395,8 +440,7 @@
                         <div class="sheet-row sheet-padb sheet-spell-macro-output-options">
                             <div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Spellcast macro display options</div>
                             <div class="sheet-col-1-12 sheet-center sheet-small-label">Description<br><input type="checkbox" name="attr_spellshowdesc" value="{{spellshowdesc=1}} {{spelldescription=@{spelldescription}}}" /></div>
-                            <div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw<br/><input type="checkbox" name="attr_spellshowdc" value="{{spellshowdc=1}} {{spellsavedc=@{spell_save_dc}}}"
-                                /></div>
+                            <div class="sheet-col-1-8 sheet-center sheet-small-label">Saving throw<br/><input type="checkbox" name="attr_spellshowdc" value="{{spellshowdc=1}} {{spellsavedc=@{spell_save_dc}}}" /></div>
                             <div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=[[@{spellhealamount} + @{healstatbonus}]]}}" /></div>
                             <div class="sheet-col-1-12 sheet-center sheet-small-label">Damage<br/><input type="checkbox" name="attr_spellshowdamage" value="{{spellshowdamage=1}} {{spelldamage=[[@{damage} + @{damagestatbonus} + @{damagemiscbonus} + (@{magic_damage_bonus}) + 0d0]] @{damagetype}}} @{spellcancrit}"
                                 /></div>
@@ -1272,4 +1316,4 @@
             {{/allprops()}} {{/debug}}
         </div>
     </div>
-</rolltemplate>
+</rolltemplate>
\ No newline at end of file